x86: baytrail: Drop EFI-specific test logics

Now that we have generic EFI payload support, drop EFI-specific test
logics in BayTrail Kconfig and codes, and all BayTrail boards too.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/cpu/baytrail/Kconfig b/arch/x86/cpu/baytrail/Kconfig
index 022a9f2e51cb7a46f8a16b0c2bb319c9c09bb8a7..d2c3473d6abffab4c38ef0ded99ea514e9280465 100644 (file)
--- a/arch/x86/cpu/baytrail/Kconfig
+++ b/arch/x86/cpu/baytrail/Kconfig
@@ -4,10 +4,10 @@
 
 config INTEL_BAYTRAIL
        bool
-       select HAVE_FSP if !EFI
-       select ARCH_MISC_INIT if !EFI
+       select HAVE_FSP
+       select ARCH_MISC_INIT
        select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED
-       imply HAVE_INTEL_ME if !EFI
+       imply HAVE_INTEL_ME
        imply ENABLE_MRC_CACHE
        imply AHCI_PCI
        imply ICH_SPI

diff --git a/arch/x86/cpu/baytrail/valleyview.c b/arch/x86/cpu/baytrail/valleyview.c
index 3194f8c6533b5272356be0f17ffe767061e60121..b7d481ac56c1d64fbfe5288d855917bcf66b8927 100644 (file)
--- a/arch/x86/cpu/baytrail/valleyview.c
+++ b/arch/x86/cpu/baytrail/valleyview.c
@@ -17,7 +17,6 @@
 #define BYT_TRIG_LVL           BIT(24)
 #define BYT_TRIG_POS           BIT(25)
 
-#ifndef CONFIG_EFI_APP
 int arch_cpu_init(void)
 {
        post_code(POST_CPU_INIT);
@@ -57,8 +56,6 @@ int arch_misc_init(void)
        return 0;
 }
 
-#endif
-
 void reset_cpu(ulong addr)
 {
        /* cold reset */

diff --git a/board/advantech/som-db5800-som-6867/Kconfig b/board/advantech/som-db5800-som-6867/Kconfig
index fac562ad4fa5ff8a06829a1159bd49c3c57fd306..35d58fcd01914364c8d4f7ed22c1775f901612fa 100644 (file)
--- a/board/advantech/som-db5800-som-6867/Kconfig
+++ b/board/advantech/som-db5800-som-6867/Kconfig
@@ -13,12 +13,11 @@ config SYS_CONFIG_NAME
        default "som-db5800-som-6867"
 
 config SYS_TEXT_BASE
-       default 0xfff00000 if !EFI_STUB
-       default 0x01110000 if EFI_STUB
+       default 0xfff00000
 
 config BOARD_SPECIFIC_OPTIONS # dummy
        def_bool y
-       select X86_RESET_VECTOR if !EFI_STUB
+       select X86_RESET_VECTOR
        select INTEL_BAYTRAIL
        select BOARD_ROMSIZE_KB_8192
        select BOARD_EARLY_INIT_F

diff --git a/board/congatec/conga-qeval20-qa3-e3845/Kconfig b/board/congatec/conga-qeval20-qa3-e3845/Kconfig
index 9e44413c2ceca0c06f5a2e91f28a82fa13fef547..64692509fd785a560163ae4585f400659efaff32 100644 (file)
--- a/board/congatec/conga-qeval20-qa3-e3845/Kconfig
+++ b/board/congatec/conga-qeval20-qa3-e3845/Kconfig
@@ -12,12 +12,11 @@ config SYS_CONFIG_NAME
        default "theadorable-x86-conga-qa3-e3845" if TARGET_THEADORABLE_X86_CONGA_QA3_E3845
 
 config SYS_TEXT_BASE
-       default 0xfff00000 if !EFI_STUB
-       default 0x01110000 if EFI_STUB
+       default 0xfff00000
 
 config BOARD_SPECIFIC_OPTIONS # dummy
        def_bool y
-       select X86_RESET_VECTOR if !EFI_STUB
+       select X86_RESET_VECTOR
        select INTEL_BAYTRAIL
        select BOARD_ROMSIZE_KB_8192
        select BOARD_EARLY_INIT_F

diff --git a/board/dfi/dfi-bt700/Kconfig b/board/dfi/dfi-bt700/Kconfig
index f92f50a44816fd5d31ce5e9dbee7195272fab641..50c7b2a2f4218866858a7a59e06b9db8ce6284b9 100644 (file)
--- a/board/dfi/dfi-bt700/Kconfig
+++ b/board/dfi/dfi-bt700/Kconfig
@@ -12,12 +12,11 @@ config SYS_CONFIG_NAME
        default "theadorable-x86-dfi-bt700" if TARGET_THEADORABLE_X86_DFI_BT700
 
 config SYS_TEXT_BASE
-       default 0xfff00000 if !EFI_STUB
-       default 0x01110000 if EFI_STUB
+       default 0xfff00000
 
 config BOARD_SPECIFIC_OPTIONS # dummy
        def_bool y
-       select X86_RESET_VECTOR if !EFI_STUB
+       select X86_RESET_VECTOR
        select INTEL_BAYTRAIL
        select BOARD_ROMSIZE_KB_8192
        select BOARD_EARLY_INIT_F

diff --git a/board/intel/minnowmax/Kconfig b/board/intel/minnowmax/Kconfig
index a8668e4efc3de62ad3337ba92ed56e7a39df2a17..543468cab54343b0e5f53d4b635c3d018ba0bc10 100644 (file)
--- a/board/intel/minnowmax/Kconfig
+++ b/board/intel/minnowmax/Kconfig
@@ -13,12 +13,11 @@ config SYS_CONFIG_NAME
        default "minnowmax"
 
 config SYS_TEXT_BASE
-       default 0xfff00000 if !EFI_STUB
-       default 0x01110000 if EFI_STUB
+       default 0xfff00000
 
 config BOARD_SPECIFIC_OPTIONS # dummy
        def_bool y
-       select X86_RESET_VECTOR if !EFI_STUB
+       select X86_RESET_VECTOR
        select INTEL_BAYTRAIL
        select BOARD_ROMSIZE_KB_8192
        select SPI_FLASH_STMICRO