From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Wed, 3 Feb 2021 07:20:23 +0000 (+0100)
Subject: tizen: amlogic: remove obsolete TIZEN_AMLOGIC_USE_VENDOR_KERNEL option
X-Git-Tag: submit/tizen/20211123.233157~26
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3c013e79535c7c652da34972c8fb20cb433320a4;p=platform%2Fkernel%2Fu-boot.git

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 <m.szyprowski@samsung.com>
Change-Id: Ie83030aa131779965ca09fcd8603b27b0d8fc87f
---

diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig
index 0a6544f2fb..eacd2eaf72 100644
--- a/arch/arm/mach-meson/Kconfig
+++ b/arch/arm/mach-meson/Kconfig
@@ -112,8 +112,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 dc57b9b020..2e59eee8f7 100644
--- a/arch/arm/mach-meson/board-g12a.c
+++ b/arch/arm/mach-meson/board-g12a.c
@@ -36,7 +36,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;
@@ -63,7 +62,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 9ce57e9d4b..f6fe69878e 100644
--- a/configs/khadas-vim3_defconfig
+++ b/configs/khadas-vim3_defconfig
@@ -8,7 +8,6 @@ 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 8ca812e27f..72735e4518 100644
--- a/configs/khadas-vim3l_defconfig
+++ b/configs/khadas-vim3l_defconfig
@@ -8,7 +8,6 @@ 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 96064cebdc..19c738a906 100644
--- a/configs/odroid-c4_defconfig
+++ b/configs/odroid-c4_defconfig
@@ -8,7 +8,6 @@ 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 6c54f0a703..851d1d7d04 100644
--- a/configs/odroid-n2_defconfig
+++ b/configs/odroid-n2_defconfig
@@ -8,7 +8,6 @@ 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"