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 eacd2eaf72b66645b6d347f75062913d82b30f69..0a6544f2fb1d8a31d213fcef5e1c643070a81a58 100644 (file)
--- a/arch/arm/mach-meson/Kconfig
+++ b/arch/arm/mach-meson/Kconfig
@@ -112,4 +112,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 cbf5a79f4b70bcbb50a73412eb43cfefc0d2bc06..dc57b9b0209fc2fb36dc271c82939d3711f97bb5 100644 (file)
--- a/arch/arm/mach-meson/board-g12a.c
+++ b/arch/arm/mach-meson/board-g12a.c
@@ -36,7 +36,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 ee3a8c1ad00d412c315fea863a3266f1ae25e53c..a698620e8f08225bf3531564b3c3739e16b09c7a 100644 (file)
--- a/configs/khadas-vim3_defconfig
+++ b/configs/khadas-vim3_defconfig
@@ -8,6 +8,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="meson-g12b-a311d-khadas-vim3"
 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 fee75138884fe4a78fed37ea9a36a44ebbcafed4..6e5c45f15467454eeb51b7288883cbf2d0aeead2 100644 (file)
--- a/configs/khadas-vim3l_defconfig
+++ b/configs/khadas-vim3l_defconfig
@@ -8,6 +8,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="meson-sm1-khadas-vim3l"
 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 b1fe72af858970b5312158c55c7cb953f93c69d8..e9fa74f621445d9b40d54c8fdc480d127ac6de64 100644 (file)
--- a/configs/odroid-c4_defconfig
+++ b/configs/odroid-c4_defconfig
@@ -8,6 +8,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="meson-sm1-odroid-c4"
 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/hc4"

diff --git a/configs/odroid-n2_defconfig b/configs/odroid-n2_defconfig
index f5a55b9dbbe676eccde53601e40ad947b401f2eb..f138325933f1388488000184c533071324f84e27 100644 (file)
--- a/configs/odroid-n2_defconfig
+++ b/configs/odroid-n2_defconfig
@@ -8,6 +8,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="meson-g12b-odroid-n2"
 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/n2-plus"