| Message ID | 1501421008-5737-6-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Accepted |
| Commit | 30b1ecd26533fdd680b66c0ed6767cc4b875fbc6 |
| Delegated to: | Bin Meng |
| Headers | show |
On 30 July 2017 at 07:23, Bin Meng <bmeng.cn@gmail.com> wrote: > CONFIG_BOARD_EARLY_INIT_F, by its mean is provided by board-specific What does 'by its mean' mean? > 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> > --- > > Changes in v2: None > > arch/x86/cpu/coreboot/coreboot.c | 5 ----- > arch/x86/cpu/efi/efi.c | 5 ----- > board/advantech/som-db5800-som-6867/Kconfig | 1 + > board/congatec/conga-qeval20-qa3-e3845/Kconfig | 1 + > board/dfi/dfi-bt700/Kconfig | 1 + > board/google/chromebook_link/link.c | 5 ----- > board/google/chromebook_samus/samus.c | 5 ----- > board/google/chromebox_panther/panther.c | 5 ----- > board/intel/cougarcanyon2/Kconfig | 1 + > board/intel/crownbay/Kconfig | 1 + > board/intel/galileo/galileo.c | 5 ----- > common/Kconfig | 1 - > configs/bayleybay_defconfig | 1 - > configs/coreboot-x86_defconfig | 1 - > configs/edison_defconfig | 1 - > configs/efi-x86_defconfig | 1 - > configs/minnowmax_defconfig | 1 - > configs/qemu-x86_64_defconfig | 1 - > configs/qemu-x86_defconfig | 1 - > configs/qemu-x86_efi_payload32_defconfig | 1 - > configs/qemu-x86_efi_payload64_defconfig | 1 - > 21 files changed, 5 insertions(+), 40 deletions(-) > Reviewed-by: Simon Glass <sjg@chromium.org>
Hi Simon, On Tue, Aug 1, 2017 at 5:11 PM, Simon Glass <sjg@chromium.org> wrote: > On 30 July 2017 at 07:23, Bin Meng <bmeng.cn@gmail.com> wrote: >> CONFIG_BOARD_EARLY_INIT_F, by its mean is provided by board-specific > > What does 'by its mean' mean? Sorry, I mean "literally". Will reword when applying. > >> 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> >> --- >> >> Changes in v2: None >> >> arch/x86/cpu/coreboot/coreboot.c | 5 ----- >> arch/x86/cpu/efi/efi.c | 5 ----- >> board/advantech/som-db5800-som-6867/Kconfig | 1 + >> board/congatec/conga-qeval20-qa3-e3845/Kconfig | 1 + >> board/dfi/dfi-bt700/Kconfig | 1 + >> board/google/chromebook_link/link.c | 5 ----- >> board/google/chromebook_samus/samus.c | 5 ----- >> board/google/chromebox_panther/panther.c | 5 ----- >> board/intel/cougarcanyon2/Kconfig | 1 + >> board/intel/crownbay/Kconfig | 1 + >> board/intel/galileo/galileo.c | 5 ----- >> common/Kconfig | 1 - >> configs/bayleybay_defconfig | 1 - >> configs/coreboot-x86_defconfig | 1 - >> configs/edison_defconfig | 1 - >> configs/efi-x86_defconfig | 1 - >> configs/minnowmax_defconfig | 1 - >> configs/qemu-x86_64_defconfig | 1 - >> configs/qemu-x86_defconfig | 1 - >> configs/qemu-x86_efi_payload32_defconfig | 1 - >> configs/qemu-x86_efi_payload64_defconfig | 1 - >> 21 files changed, 5 insertions(+), 40 deletions(-) >> > > Reviewed-by: Simon Glass <sjg@chromium.org> Regards, Bin
On Tue, Aug 1, 2017 at 5:17 PM, Bin Meng <bmeng.cn@gmail.com> wrote: > Hi Simon, > > On Tue, Aug 1, 2017 at 5:11 PM, Simon Glass <sjg@chromium.org> wrote: >> On 30 July 2017 at 07:23, Bin Meng <bmeng.cn@gmail.com> wrote: >>> CONFIG_BOARD_EARLY_INIT_F, by its mean is provided by board-specific >> >> What does 'by its mean' mean? > > Sorry, I mean "literally". Will reword when applying. Reworded the commit message, and > >> >>> 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> >>> --- >>> >>> Changes in v2: None >>> >>> arch/x86/cpu/coreboot/coreboot.c | 5 ----- >>> arch/x86/cpu/efi/efi.c | 5 ----- >>> board/advantech/som-db5800-som-6867/Kconfig | 1 + >>> board/congatec/conga-qeval20-qa3-e3845/Kconfig | 1 + >>> board/dfi/dfi-bt700/Kconfig | 1 + >>> board/google/chromebook_link/link.c | 5 ----- >>> board/google/chromebook_samus/samus.c | 5 ----- >>> board/google/chromebox_panther/panther.c | 5 ----- >>> board/intel/cougarcanyon2/Kconfig | 1 + >>> board/intel/crownbay/Kconfig | 1 + >>> board/intel/galileo/galileo.c | 5 ----- >>> common/Kconfig | 1 - >>> configs/bayleybay_defconfig | 1 - >>> configs/coreboot-x86_defconfig | 1 - >>> configs/edison_defconfig | 1 - >>> configs/efi-x86_defconfig | 1 - >>> configs/minnowmax_defconfig | 1 - >>> configs/qemu-x86_64_defconfig | 1 - >>> configs/qemu-x86_defconfig | 1 - >>> configs/qemu-x86_efi_payload32_defconfig | 1 - >>> configs/qemu-x86_efi_payload64_defconfig | 1 - >>> 21 files changed, 5 insertions(+), 40 deletions(-) >>> >> >> Reviewed-by: Simon Glass <sjg@chromium.org> > applied to u-boot-x86, thanks!
diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c index 658b900..cb5396c 100644 --- 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 741613f..8c79eb6 100644 --- 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 f6f3748..945aa43 100644 --- 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 24b8f69..f91ffa1 100644 --- 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 fca8b53..59f45ef 100644 --- 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 42615e1..64e7c1a 100644 --- 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 3c3f5d4..356b92a 100644 --- 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 e3baf88..ed60e44 100644 --- 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 95a617b..4e7d021 100644 --- 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 b30701a..05626a9 100644 --- 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 568bd4d..2fe1923 100644 --- 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 8c8d2e4..d005a3b 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -875,7 +875,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 a7767d6..4a31b4e 100644 --- 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 3a08dc4..ed9592c 100644 --- 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 02bc760..ba43b47 100644 --- 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 26db27b..20681b0 100644 --- 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 cc528c0..c4ff647 100644 --- 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 1e472e5..bfd3881 100644 --- 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 cf9ed9f..679a254 100644 --- 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 6b11630..ca5b96a 100644 --- 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 d1964c2..f70bae9 100644 --- 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