From 6400c8787245250be7da7901d26c083092d0f47d Mon Sep 17 00:00:00 2001 From: Jaehoon Chung Date: Wed, 9 Dec 2020 18:21:44 +0900 Subject: [PATCH] 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 --- arch/arm/mach-meson/Kconfig | 4 ++++ arch/arm/mach-meson/board-g12a.c | 2 +- configs/khadas-vim3_defconfig | 1 + configs/khadas-vim3l_defconfig | 1 + configs/odroid-c4_defconfig | 1 + configs/odroid-n2_defconfig | 1 + 6 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig index 3a7dfaa..9c88a6d 100644 --- 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 c62323b..bf60213 100644 --- 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 530bf11..767990b 100644 --- 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 ad77555..a68fc86 100644 --- 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 6311287..ef67db0 100644 --- a/configs/odroid-c4_defconfig +++ b/configs/odroid-c4_defconfig @@ -7,6 +7,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 4c1c805..c928d2e 100644 --- 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" -- 2.7.4