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 9c88a6d9f6decb5d19aa57c22aac36b05d5fb8f1..3a7dfaa77c9435a2844718bbcc4d973458912a29 100644 (file)
--- 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 bf602136f36c22092765065d8f6e8c25b84438ff..14127ca737c1c29d7b379eee78acc2e94c45d1f5 100644 (file)
--- 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 3f999ff1b3b3b48d012174c5fce8f47bd6ce958e..d655c2d0cd01841d09eb823077c6c17ee5acea60 100644 (file)
--- 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 dbec31b5868107af3c9f3ea1ab2c645078cafc2e..62138448a6c76663b75987b46a91ba06952d8521 100644 (file)
--- 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 78f27def7aad6fae30be335f1e0d78ea8887dc30..c0cafb82c9afa6405a35367342f3adc06705a58c 100644 (file)
--- 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 23dfb00fae381302250a30226032c722ea78502e..7fdac3bb80e36a25f75eab7ed04b5b8f81e6a500 100644 (file)
--- 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"