From 70c25b3050b968f7440fece71227aeaf858a4625 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 -- 2 files changed, 6 deletions(-) diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig index 367dbdb..66d15ba 100644 --- a/arch/arm/mach-meson/Kconfig +++ b/arch/arm/mach-meson/Kconfig @@ -119,8 +119,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 ab59cf8..d5a830f 100644 --- a/arch/arm/mach-meson/board-g12a.c +++ b/arch/arm/mach-meson/board-g12a.c @@ -30,7 +30,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; @@ -57,7 +56,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); -- 2.7.4