x86: kconfig: Let board select BOARD_EARLY_INIT_F

CONFIG_BOARD_EARLY_INIT_F literally indicates board-specific codes
and should be not 'default y' for all x86 boards.

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

diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c
index 658b900f0b89b14ed5e08ed71bc0dea134ea315a..cb5396c6804786c62d59eea8b8296c2cb622255b 100644 (file)
--- a/arch/x86/cpu/coreboot/coreboot.c
+++ b/arch/x86/cpu/coreboot/coreboot.c
@@ -29,11 +29,6 @@ int arch_cpu_init(void)
        return x86_cpu_init_f();
 }
 
-int board_early_init_f(void)
-{
-       return 0;
-}
-
 int checkcpu(void)
 {
        return 0;

diff --git a/arch/x86/cpu/efi/efi.c b/arch/x86/cpu/efi/efi.c
index 741613f6155256b0f2810d45f2cba04252260ec6..8c79eb61456984a981dbf6260bd090798ef9063a 100644 (file)
--- a/arch/x86/cpu/efi/efi.c
+++ b/arch/x86/cpu/efi/efi.c
@@ -13,11 +13,6 @@ int arch_cpu_init(void)
        return 0;
 }
 
-int board_early_init_f(void)
-{
-       return 0;
-}
-
 int checkcpu(void)
 {
        return 0;

diff --git a/board/advantech/som-db5800-som-6867/Kconfig b/board/advantech/som-db5800-som-6867/Kconfig
index f6f3748fc3587004c2ed7b697d9c350bc0278778..945aa43bd28fff515781b7c22493fc33126ef339 100644 (file)
--- a/board/advantech/som-db5800-som-6867/Kconfig
+++ b/board/advantech/som-db5800-som-6867/Kconfig
@@ -21,6 +21,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select X86_RESET_VECTOR if !EFI_STUB
        select INTEL_BAYTRAIL
        select BOARD_ROMSIZE_KB_8192
+       select BOARD_EARLY_INIT_F
 
 config PCIE_ECAM_BASE
        default 0xe0000000

diff --git a/board/congatec/conga-qeval20-qa3-e3845/Kconfig b/board/congatec/conga-qeval20-qa3-e3845/Kconfig
index 24b8f695ac4a4e42ffb60e7cad1ed54c6c2c3811..f91ffa1325495a641cc4b05442247c1aaa82233e 100644 (file)
--- a/board/congatec/conga-qeval20-qa3-e3845/Kconfig
+++ b/board/congatec/conga-qeval20-qa3-e3845/Kconfig
@@ -21,6 +21,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select X86_RESET_VECTOR if !EFI_STUB
        select INTEL_BAYTRAIL
        select BOARD_ROMSIZE_KB_8192
+       select BOARD_EARLY_INIT_F
        select BOARD_LATE_INIT
 
 config PCIE_ECAM_BASE

diff --git a/board/dfi/dfi-bt700/Kconfig b/board/dfi/dfi-bt700/Kconfig
index fca8b53d0268d63b741cc26b4e38dedad6c76bc5..59f45efcf795f79a6e05979c8b01b9115fc41caf 100644 (file)
--- a/board/dfi/dfi-bt700/Kconfig
+++ b/board/dfi/dfi-bt700/Kconfig
@@ -21,6 +21,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select X86_RESET_VECTOR if !EFI_STUB
        select INTEL_BAYTRAIL
        select BOARD_ROMSIZE_KB_8192
+       select BOARD_EARLY_INIT_F
        select BOARD_LATE_INIT
 
 config PCIE_ECAM_BASE

diff --git a/board/google/chromebook_link/link.c b/board/google/chromebook_link/link.c
index 42615e1e23143f95695541e78faff9808519e53e..64e7c1a08d8b01109cd13df18f4c63cc4d457df6 100644 (file)
--- a/board/google/chromebook_link/link.c
+++ b/board/google/chromebook_link/link.c
@@ -16,8 +16,3 @@ int arch_early_init_r(void)
 {
        return 0;
 }
-
-int board_early_init_f(void)
-{
-       return 0;
-}

diff --git a/board/google/chromebook_samus/samus.c b/board/google/chromebook_samus/samus.c
index 3c3f5d48337cbefaf137e971ef796d865e8bd07a..356b92a45469c3e5b4e47f49c6941efaf423fbfe 100644 (file)
--- a/board/google/chromebook_samus/samus.c
+++ b/board/google/chromebook_samus/samus.c
@@ -11,8 +11,3 @@ int arch_early_init_r(void)
 {
        return cpu_run_reference_code();
 }
-
-int board_early_init_f(void)
-{
-       return 0;
-}

diff --git a/board/google/chromebox_panther/panther.c b/board/google/chromebox_panther/panther.c
index e3baf88783316c2d7c4adf5fb300185d7ebe6292..ed60e442641fdec1bf345f525f01c52a4e2497be 100644 (file)
--- a/board/google/chromebox_panther/panther.c
+++ b/board/google/chromebox_panther/panther.c
@@ -11,8 +11,3 @@ int arch_early_init_r(void)
 {
        return 0;
 }
-
-int board_early_init_f(void)
-{
-       return 0;
-}

diff --git a/board/intel/cougarcanyon2/Kconfig b/board/intel/cougarcanyon2/Kconfig
index 95a617b7256c3817d7a9f6ae041cdf6639e05201..4e7d02161fcc5a9f04f7de915d305d3d19c1596a 100644 (file)
--- a/board/intel/cougarcanyon2/Kconfig
+++ b/board/intel/cougarcanyon2/Kconfig
@@ -21,5 +21,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select NORTHBRIDGE_INTEL_IVYBRIDGE
        select HAVE_FSP
        select BOARD_ROMSIZE_KB_2048
+       select BOARD_EARLY_INIT_F
 
 endif

diff --git a/board/intel/crownbay/Kconfig b/board/intel/crownbay/Kconfig
index b30701afc8048eb5a808ab48e74376a126b449f0..05626a9e9214eb6e88f4e979f52d0cccf66da3a9 100644 (file)
--- a/board/intel/crownbay/Kconfig
+++ b/board/intel/crownbay/Kconfig
@@ -20,5 +20,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select X86_RESET_VECTOR
        select INTEL_QUEENSBAY
        select BOARD_ROMSIZE_KB_1024
+       select BOARD_EARLY_INIT_F
 
 endif

diff --git a/board/intel/galileo/galileo.c b/board/intel/galileo/galileo.c
index 568bd4db490e0f538c92a6fea4bd1cee5c63b127..2fe1923a9fc39e9373379e3448b2a13fce65ad09 100644 (file)
--- a/board/intel/galileo/galileo.c
+++ b/board/intel/galileo/galileo.c
@@ -9,11 +9,6 @@
 #include <asm/arch/device.h>
 #include <asm/arch/quark.h>
 
-int board_early_init_f(void)
-{
-       return 0;
-}
-
 /*
  * Intel Galileo gen2 board uses GPIO Resume Well bank pin0 as the PERST# pin.
  *

diff --git a/common/Kconfig b/common/Kconfig
index 746dd84f05bec638127639f6da19dd80a1ee4760..1645ae9989658b56fa1514c534ced7f78bc1f8c4 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -888,7 +888,6 @@ config ARCH_MISC_INIT
 
 config BOARD_EARLY_INIT_F
        bool "Call board-specific init before relocation"
-       default y if X86
        help
          Some boards need to perform initialisation as soon as possible
          after boot. With this option, U-Boot calls board_early_init_f()

diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig
index a7767d65dd2e14afbc8afc351cd36f692dca1902..4a31b4e16528f2f827ab45a7c6b5694e4e76612f 100644 (file)
--- a/configs/bayleybay_defconfig
+++ b/configs/bayleybay_defconfig
@@ -17,7 +17,6 @@ CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_ARCH_EARLY_INIT_R is not set
 CONFIG_ARCH_MISC_INIT=y
-# CONFIG_BOARD_EARLY_INIT_F is not set
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
index 3a08dc439c8ec1399e87d24accf40fff20c64439..ed9592cd2e809ecec0e0782464e8f4e7384fae3b 100644 (file)
--- a/configs/coreboot-x86_defconfig
+++ b/configs/coreboot-x86_defconfig
@@ -6,7 +6,6 @@ CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_ENV_IS_NOWHERE=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
-# CONFIG_BOARD_EARLY_INIT_F is not set
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_IDE=y

diff --git a/configs/edison_defconfig b/configs/edison_defconfig
index 02bc76091f64bf152a311d3dc6f19af124539930..ba43b47b877f364261dd2921e603270a01b2156f 100644 (file)
--- a/configs/edison_defconfig
+++ b/configs/edison_defconfig
@@ -4,7 +4,6 @@ CONFIG_DEFAULT_DEVICE_TREE="edison"
 CONFIG_TARGET_EDISON=y
 CONFIG_SMP=y
 # CONFIG_ARCH_EARLY_INIT_R is not set
-# CONFIG_BOARD_EARLY_INIT_F is not set
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_defconfig
index 26db27bb0a465e8b780ec57c5c4d269a7367eec3..20681b0be4d9221dd0475d9bcd2b10eeb019d416 100644 (file)
--- a/configs/efi-x86_defconfig
+++ b/configs/efi-x86_defconfig
@@ -8,7 +8,6 @@ CONFIG_ENV_IS_NOWHERE=y
 CONFIG_CONSOLE_MUX=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_ARCH_EARLY_INIT_R is not set
-# CONFIG_BOARD_EARLY_INIT_F is not set
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_BOOTM is not set
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig
index cc528c0bd42dc3581054006ff0a5aa709f1d0b75..c4ff647c2dd3b1ef9df76861c1baa46d809bf79a 100644 (file)
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -18,7 +18,6 @@ CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_ARCH_MISC_INIT=y
-# CONFIG_BOARD_EARLY_INIT_F is not set
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig
index 1e472e5dca2865fbff3f33decb0963f281417af6..bfd3881dfb1397c4b750b4b92fe5e7bccbcf845b 100644 (file)
--- a/configs/qemu-x86_64_defconfig
+++ b/configs/qemu-x86_64_defconfig
@@ -21,7 +21,6 @@ CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_ENV_IS_NOWHERE=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
-# CONFIG_BOARD_EARLY_INIT_F is not set
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_CPU_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y

diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
index cf9ed9ffc25bd94daca4bb99d14596fae1884e73..679a2541a3a9228a7ba7be99275d10cd89b99798 100644 (file)
--- a/configs/qemu-x86_defconfig
+++ b/configs/qemu-x86_defconfig
@@ -10,7 +10,6 @@ CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_ENV_IS_NOWHERE=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
-# CONFIG_BOARD_EARLY_INIT_F is not set
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/qemu-x86_efi_payload32_defconfig b/configs/qemu-x86_efi_payload32_defconfig
index 6b116305dbc76bb926bfac08199fe5700ede076d..ca5b96a3a67ae2eb85cc169dc749e7aff53aba78 100644 (file)
--- a/configs/qemu-x86_efi_payload32_defconfig
+++ b/configs/qemu-x86_efi_payload32_defconfig
@@ -7,7 +7,6 @@ CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_ENV_IS_NOWHERE=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
-# CONFIG_BOARD_EARLY_INIT_F is not set
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/qemu-x86_efi_payload64_defconfig b/configs/qemu-x86_efi_payload64_defconfig
index d1964c24152414edf589ee943051171c27ffdeb5..f70bae9eb93bee2b159c10fa05a508799705d497 100644 (file)
--- a/configs/qemu-x86_efi_payload64_defconfig
+++ b/configs/qemu-x86_efi_payload64_defconfig
@@ -7,7 +7,6 @@ CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_ENV_IS_NOWHERE=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
-# CONFIG_BOARD_EARLY_INIT_F is not set
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_CPU=y
 # CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set