From b5394f575efed383cba4cc8bfda12d2a8e868e03 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Wed, 3 Feb 2021 08:20:23 +0100 Subject: [PATCH] tizen: amlogic: remove obsolete TIZEN_AMLOGIC_USE_VENDOR_KERNEL option After a fix to vendor kernel, the workaround enabled by the TIZEN_AMLOGIC_USE_VENDOR_KERNEL option is no longer needed. Signed-off-by: Marek Szyprowski Change-Id: Ie83030aa131779965ca09fcd8603b27b0d8fc87f --- 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, 10 deletions(-) diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig index 9c88a6d..3a7dfaa 100644 --- a/arch/arm/mach-meson/Kconfig +++ b/arch/arm/mach-meson/Kconfig @@ -111,8 +111,4 @@ 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 bf60213..14127ca 100644 --- a/arch/arm/mach-meson/board-g12a.c +++ b/arch/arm/mach-meson/board-g12a.c @@ -35,7 +35,6 @@ int meson_get_boot_device(void) */ void meson_init_reserved_memory(void *fdt) { -#ifndef CONFIG_TIZEN_AMLOGIC_USE_VENDOR_KERNEL u64 bl31_size, bl31_start; u64 bl32_size, bl32_start; u32 reg; @@ -62,7 +61,6 @@ void meson_init_reserved_memory(void *fdt) /* Add BL32 reserved zone */ if (bl32_start && bl32_size) meson_board_add_reserved_memory(fdt, bl32_start, bl32_size); -#endif #if defined(CONFIG_VIDEO_MESON) meson_vpu_rsv_fb(fdt); diff --git a/configs/khadas-vim3_defconfig b/configs/khadas-vim3_defconfig index 3f999ff..d655c2d 100644 --- a/configs/khadas-vim3_defconfig +++ b/configs/khadas-vim3_defconfig @@ -7,7 +7,6 @@ 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 dbec31b..6213844 100644 --- a/configs/khadas-vim3l_defconfig +++ b/configs/khadas-vim3l_defconfig @@ -7,7 +7,6 @@ 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 78f27de..c0cafb8 100644 --- a/configs/odroid-c4_defconfig +++ b/configs/odroid-c4_defconfig @@ -7,7 +7,6 @@ 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 23dfb00..7fdac3b 100644 --- a/configs/odroid-n2_defconfig +++ b/configs/odroid-n2_defconfig @@ -7,7 +7,6 @@ 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