meson: add TIZEN_AMLOGIC_USE_VENDOR_KERNEL config

Add TIZEN_AMLOGIC_USE_VENDOR_KERNEL config.
It's more claar than just using CONFIG_TIZEN.
If someone wants to use mainline kernel, just disable it.

Enable CONFIG_TIZEN_AMLOGIC_USE_VENDOR_KERNEL.
- odroid-{c4,n2}_defconfig
- khadas-{vim3,vim3l}_defconfig
Tizen is using each board's vendor kernel.

Change-Id: I2a11e3e08e58ced7ef286487044a1616ac3ac8f4
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>

diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig
index 3a7dfaa77c9435a2844718bbcc4d973458912a29..9c88a6d9f6decb5d19aa57c22aac36b05d5fb8f1 100644 (file)
--- a/arch/arm/mach-meson/Kconfig
+++ b/arch/arm/mach-meson/Kconfig
@@ -111,4 +111,8 @@ config TIZEN_ODROID_C4
         When boot on Tizen Platform, enable this configuration.
         If you want to use mainline boot, disable this.
 
+config TIZEN_AMLOGIC_USE_VENDOR_KERNEL
+       bool "Use vendor kernel about Amlogic SoCs for Tizen"
+       help
+        Enable this configuration if use Vendor Linux Kernel.
 endif

diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c
index c62323bc8abe045b260ecc8d75e460ec7fb0b718..bf602136f36c22092765065d8f6e8c25b84438ff 100644 (file)
--- a/arch/arm/mach-meson/board-g12a.c
+++ b/arch/arm/mach-meson/board-g12a.c
@@ -35,7 +35,7 @@ int meson_get_boot_device(void)
  */
 void meson_init_reserved_memory(void *fdt)
 {
-#ifndef CONFIG_TIZEN
+#ifndef CONFIG_TIZEN_AMLOGIC_USE_VENDOR_KERNEL
        u64 bl31_size, bl31_start;
        u64 bl32_size, bl32_start;
        u32 reg;

diff --git a/configs/khadas-vim3_defconfig b/configs/khadas-vim3_defconfig
index 530bf11f9b4c4cf606b09cfad1ea45fad35f5b78..767990b7d0d479ea6de176fcfa4c206f7c45fad2 100644 (file)
--- a/configs/khadas-vim3_defconfig
+++ b/configs/khadas-vim3_defconfig
@@ -7,6 +7,7 @@ CONFIG_ENV_SIZE=0x4000
 CONFIG_DM_GPIO=y
 CONFIG_MESON_G12A=y
 CONFIG_TIZEN_KHADAS_VIM3=y
+CONFIG_TIZEN_AMLOGIC_USE_VENDOR_KERNEL=y
 CONFIG_DEBUG_UART_BASE=0xff803000
 CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_IDENT_STRING=" khadas-vim3"

diff --git a/configs/khadas-vim3l_defconfig b/configs/khadas-vim3l_defconfig
index ad7755576211ab836ece63f9416ac3a986dcd11b..a68fc86769f25dee04f76b7cf8c82b49705efade 100644 (file)
--- a/configs/khadas-vim3l_defconfig
+++ b/configs/khadas-vim3l_defconfig
@@ -7,6 +7,7 @@ CONFIG_ENV_SIZE=0x4000
 CONFIG_DM_GPIO=y
 CONFIG_MESON_G12A=y
 CONFIG_TIZEN_KHADAS_VIM3L=y
+CONFIG_TIZEN_AMLOGIC_USE_VENDOR_KERNEL=y
 CONFIG_DEBUG_UART_BASE=0xff803000
 CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_IDENT_STRING=" khadas-vim3l"

diff --git a/configs/odroid-c4_defconfig b/configs/odroid-c4_defconfig
index 3d4d1df90d8f5ebe5210073edbaee03bbc8344da..4582acc75d9e8bcc745b5b0c0989d189168e88c8 100644 (file)
--- a/configs/odroid-c4_defconfig
+++ b/configs/odroid-c4_defconfig
@@ -8,6 +8,7 @@ CONFIG_ENV_SIZE=0x4000
 CONFIG_DM_GPIO=y
 CONFIG_MESON_G12A=y
 CONFIG_TIZEN_ODROID_C4=y
+CONFIG_TIZEN_AMLOGIC_USE_VENDOR_KERNEL=y
 CONFIG_DEBUG_UART_BASE=0xff803000
 CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_IDENT_STRING=" odroid-c4"

diff --git a/configs/odroid-n2_defconfig b/configs/odroid-n2_defconfig
index 4c1c805fc1c3fa87b51c8d50581a229ff4aa6c07..c928d2e111b96ff2675792e601d00f40a3fd5094 100644 (file)
--- a/configs/odroid-n2_defconfig
+++ b/configs/odroid-n2_defconfig
@@ -7,6 +7,7 @@ CONFIG_ENV_SIZE=0x4000
 CONFIG_DM_GPIO=y
 CONFIG_MESON_G12A=y
 CONFIG_TIZEN_ODROID_N2=y
+CONFIG_TIZEN_AMLOGIC_USE_VENDOR_KERNEL=y
 CONFIG_DEBUG_UART_BASE=0xff803000
 CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_IDENT_STRING=" odroid-n2"