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 8b5a50816e4b8f3dba244cd18469eefd0b9ef911..c3b5d3de0905a2c3943f7d12f9e94ef3ff90f618 100644 (file)
--- a/arch/arm/mach-meson/Kconfig
+++ b/arch/arm/mach-meson/Kconfig
@@ -117,8 +117,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 84db9c425b4759a0765bb2b8c748467820a6c0f4..dc4abe1e107469c8cdd3917fcecbcbb774632449 100644 (file)
--- a/arch/arm/mach-meson/board-g12a.c
+++ b/arch/arm/mach-meson/board-g12a.c
@@ -29,7 +29,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;
@@ -56,7 +55,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);