From 2aeb22d9ab02ba922ede2883391b314ac9e2baac Mon Sep 17 00:00:00 2001 From: Mario Six Date: Wed, 28 Mar 2018 14:38:16 +0200 Subject: [PATCH] treewide: Migrate CONFIG_LAST_STAGE_INIT to Kconfig Migrate the CONFIG_LAST_STAGE_INIT option to Kconfig. Signed-off-by: Mario Six --- common/Kconfig | 9 +++++++++ configs/UCP1020_SPIFLASH_defconfig | 1 + configs/UCP1020_defconfig | 1 + configs/bayleybay_defconfig | 1 + configs/cherryhill_defconfig | 1 + configs/chromebook_link64_defconfig | 1 + configs/chromebook_link_defconfig | 1 + configs/chromebook_samus_defconfig | 1 + configs/chromebox_panther_defconfig | 1 + configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 + configs/conga-qeval20-qa3-e3845_defconfig | 1 + configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig | 1 + configs/controlcenterd_36BIT_SDCARD_defconfig | 1 + configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig | 1 + configs/controlcenterd_TRAILBLAZER_defconfig | 1 + configs/controlcenterdc_defconfig | 1 + configs/coreboot-x86_defconfig | 1 + configs/cougarcanyon2_defconfig | 1 + configs/crownbay_defconfig | 1 + configs/dfi-bt700-q7x-151_defconfig | 1 + configs/edison_defconfig | 1 + configs/efi-x86_defconfig | 1 + configs/galileo_defconfig | 1 + configs/ge_b450v3_defconfig | 1 + configs/ge_b650v3_defconfig | 1 + configs/ge_b850v3_defconfig | 1 + configs/hrcon_defconfig | 1 + configs/hrcon_dh_defconfig | 1 + configs/kmcoge4_defconfig | 1 + configs/kmcoge5ne_defconfig | 1 + configs/kmeter1_defconfig | 1 + configs/kmlion1_defconfig | 1 + configs/kmopti2_defconfig | 1 + configs/kmsupx5_defconfig | 1 + configs/kmtegr1_defconfig | 1 + configs/kmtepr2_defconfig | 1 + configs/kmvect1_defconfig | 1 + configs/minnowmax_defconfig | 1 + configs/qemu-ppce500_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 + configs/som-db5800-som-6867_defconfig | 1 + configs/strider_con_defconfig | 1 + configs/strider_con_dp_defconfig | 1 + configs/strider_cpu_defconfig | 1 + configs/strider_cpu_dp_defconfig | 1 + configs/suvd3_defconfig | 1 + .../theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig | 1 + configs/theadorable-x86-conga-qa3-e3845_defconfig | 1 + configs/theadorable-x86-dfi-bt700_defconfig | 1 + configs/tuge1_defconfig | 1 + configs/tuxx1_defconfig | 1 + include/configs/UCP1020.h | 4 ---- include/configs/controlcenterd.h | 6 ------ include/configs/controlcenterdc.h | 1 - include/configs/edison.h | 1 - include/configs/ge_bx50v3.h | 2 -- include/configs/hrcon.h | 2 -- include/configs/km/km-powerpc.h | 1 - include/configs/km/kmp204x-common.h | 1 - include/configs/qemu-ppce500.h | 2 -- include/configs/strider.h | 2 -- include/configs/x86-common.h | 1 - scripts/config_whitelist.txt | 1 - 66 files changed, 62 insertions(+), 24 deletions(-) diff --git a/common/Kconfig b/common/Kconfig index f09e77d9ef..5c90ce4629 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -602,6 +602,15 @@ config BOARD_EARLY_INIT_R relocation. With this option, U-Boot calls board_early_init_r() in the post-relocation init sequence. +config LAST_STAGE_INIT + bool "Call board-specific as last setup step" + help + Some boards need to perform initialisation immediately before control + is passed to the command-line interpreter (e.g. for initializations + that depend on later phases in the init sequence). With this option, + U-Boot calls last_stage_init() before the command-line interpreter is + started. + endmenu menu "Security support" diff --git a/configs/UCP1020_SPIFLASH_defconfig b/configs/UCP1020_SPIFLASH_defconfig index 1267c6a248..b49166d414 100644 --- a/configs/UCP1020_SPIFLASH_defconfig +++ b/configs/UCP1020_SPIFLASH_defconfig @@ -9,6 +9,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y # CONFIG_AUTO_COMPLETE is not set CONFIG_AUTOBOOT_KEYED=y diff --git a/configs/UCP1020_defconfig b/configs/UCP1020_defconfig index 0c033722bb..4d88679735 100644 --- a/configs/UCP1020_defconfig +++ b/configs/UCP1020_defconfig @@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PROMPT="B$ " diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig index c84356bd19..fd828cacd3 100644 --- a/configs/bayleybay_defconfig +++ b/configs/bayleybay_defconfig @@ -17,6 +17,7 @@ CONFIG_BOOTSTAGE_REPORT=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_FLASH is not set diff --git a/configs/cherryhill_defconfig b/configs/cherryhill_defconfig index 8ec24a4478..097ce44818 100644 --- a/configs/cherryhill_defconfig +++ b/configs/cherryhill_defconfig @@ -7,6 +7,7 @@ CONFIG_DEBUG_UART=y CONFIG_SMP=y CONFIG_GENERATE_MP_TABLE=y CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_FLASH is not set diff --git a/configs/chromebook_link64_defconfig b/configs/chromebook_link64_defconfig index e84e571f55..476bf44edf 100644 --- a/configs/chromebook_link64_defconfig +++ b/configs/chromebook_link64_defconfig @@ -21,6 +21,7 @@ CONFIG_BOOTSTAGE_REPORT=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_LAST_STAGE_INIT=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_CPU_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig index 2f379cf15b..bf3cd09ecb 100644 --- a/configs/chromebook_link_defconfig +++ b/configs/chromebook_link_defconfig @@ -14,6 +14,7 @@ CONFIG_BOOTSTAGE_REPORT=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_FLASH is not set diff --git a/configs/chromebook_samus_defconfig b/configs/chromebook_samus_defconfig index b7bddf6c51..e7a8fccfed 100644 --- a/configs/chromebook_samus_defconfig +++ b/configs/chromebook_samus_defconfig @@ -14,6 +14,7 @@ CONFIG_BOOTSTAGE_REPORT=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_FLASH is not set diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig index 226f4740a5..b5b3f67977 100644 --- a/configs/chromebox_panther_defconfig +++ b/configs/chromebox_panther_defconfig @@ -11,6 +11,7 @@ CONFIG_BOOTSTAGE_REPORT=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig index 439a7dddc9..b376bb61ab 100644 --- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig @@ -20,6 +20,7 @@ CONFIG_BOOTSTAGE_REPORT=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/sda2 ro quiet" CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_FLASH is not set diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig index afa02773dc..4ac42d6efc 100644 --- a/configs/conga-qeval20-qa3-e3845_defconfig +++ b/configs/conga-qeval20-qa3-e3845_defconfig @@ -18,6 +18,7 @@ CONFIG_BOOTSTAGE_REPORT=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/sda2 ro quiet" CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_FLASH is not set diff --git a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig index 3668f8a9ca..10584047b5 100644 --- a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig +++ b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig @@ -15,6 +15,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_REGINFO=y CONFIG_CMD_EEPROM=y diff --git a/configs/controlcenterd_36BIT_SDCARD_defconfig b/configs/controlcenterd_36BIT_SDCARD_defconfig index 01a64e2bb7..36c41d2131 100644 --- a/configs/controlcenterd_36BIT_SDCARD_defconfig +++ b/configs/controlcenterd_36BIT_SDCARD_defconfig @@ -15,6 +15,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_REGINFO=y CONFIG_CMD_EEPROM=y diff --git a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig index ed45968cce..5868e55f4f 100644 --- a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig +++ b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig @@ -10,6 +10,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set # CONFIG_SYS_LONGHELP is not set diff --git a/configs/controlcenterd_TRAILBLAZER_defconfig b/configs/controlcenterd_TRAILBLAZER_defconfig index 83106bcd32..ce92f75a56 100644 --- a/configs/controlcenterd_TRAILBLAZER_defconfig +++ b/configs/controlcenterd_TRAILBLAZER_defconfig @@ -10,6 +10,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set # CONFIG_SYS_LONGHELP is not set diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig index b58f9dd04f..8fba2b2452 100644 --- a/configs/controlcenterdc_defconfig +++ b/configs/controlcenterdc_defconfig @@ -13,6 +13,7 @@ CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_LAST_STAGE_INIT=y CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_HUSH_PARSER=y diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig index d8e8d17e25..42344a7e70 100644 --- a/configs/coreboot-x86_defconfig +++ b/configs/coreboot-x86_defconfig @@ -8,6 +8,7 @@ CONFIG_BOOTSTAGE_REPORT=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_IDE=y diff --git a/configs/cougarcanyon2_defconfig b/configs/cougarcanyon2_defconfig index 4ec4edae41..82cb45dfb6 100644 --- a/configs/cougarcanyon2_defconfig +++ b/configs/cougarcanyon2_defconfig @@ -7,6 +7,7 @@ CONFIG_TARGET_COUGARCANYON2=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig index 00df2f6e19..4e4f4712a0 100644 --- a/configs/crownbay_defconfig +++ b/configs/crownbay_defconfig @@ -12,6 +12,7 @@ CONFIG_FIT=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_FLASH is not set diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig index fa6ccc493c..94cc5eca2a 100644 --- a/configs/dfi-bt700-q7x-151_defconfig +++ b/configs/dfi-bt700-q7x-151_defconfig @@ -17,6 +17,7 @@ CONFIG_BOOTSTAGE_REPORT=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/sda1 ro quiet" CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_FLASH is not set diff --git a/configs/edison_defconfig b/configs/edison_defconfig index 7e095b9822..54305fca6c 100644 --- a/configs/edison_defconfig +++ b/configs/edison_defconfig @@ -4,6 +4,7 @@ CONFIG_VENDOR_INTEL=y CONFIG_DEFAULT_DEVICE_TREE="edison" CONFIG_TARGET_EDISON=y CONFIG_SMP=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y # CONFIG_CMDLINE_EDITING is not set CONFIG_CMD_CPU=y diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_defconfig index 7d162a8e04..48342214fd 100644 --- a/configs/efi-x86_defconfig +++ b/configs/efi-x86_defconfig @@ -7,6 +7,7 @@ CONFIG_FIT=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_BOOTM is not set CONFIG_CMD_GPIO=y diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index d516d40f10..6789b96c3a 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -10,6 +10,7 @@ CONFIG_FIT=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_FLASH is not set diff --git a/configs/ge_b450v3_defconfig b/configs/ge_b450v3_defconfig index 045380b6de..a2ba498c3a 100644 --- a/configs/ge_b450v3_defconfig +++ b/configs/ge_b450v3_defconfig @@ -10,6 +10,7 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_SUPPORT_RAW_INITRD=y CONFIG_DEFAULT_FDT_FILE="imx6q-b450v3.dtb" CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_FLASH is not set diff --git a/configs/ge_b650v3_defconfig b/configs/ge_b650v3_defconfig index 9d4b8aeebe..d55d7ca561 100644 --- a/configs/ge_b650v3_defconfig +++ b/configs/ge_b650v3_defconfig @@ -10,6 +10,7 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_SUPPORT_RAW_INITRD=y CONFIG_DEFAULT_FDT_FILE="imx6q-b650v3.dtb" CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_FLASH is not set diff --git a/configs/ge_b850v3_defconfig b/configs/ge_b850v3_defconfig index 94785681be..c164a87e5e 100644 --- a/configs/ge_b850v3_defconfig +++ b/configs/ge_b850v3_defconfig @@ -10,6 +10,7 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_SUPPORT_RAW_INITRD=y CONFIG_DEFAULT_FDT_FILE="imx6q-b850v3.dtb" CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_FLASH is not set diff --git a/configs/hrcon_defconfig b/configs/hrcon_defconfig index 5fc75dddeb..f9be147b6d 100644 --- a/configs/hrcon_defconfig +++ b/configs/hrcon_defconfig @@ -13,6 +13,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/hrcon_dh_defconfig b/configs/hrcon_dh_defconfig index c0183e0a7b..93362b1626 100644 --- a/configs/hrcon_dh_defconfig +++ b/configs/hrcon_dh_defconfig @@ -14,6 +14,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_IMLS=y CONFIG_CMD_FPGAD=y diff --git a/configs/kmcoge4_defconfig b/configs/kmcoge4_defconfig index 5015585f84..1d92b2dd99 100644 --- a/configs/kmcoge4_defconfig +++ b/configs/kmcoge4_defconfig @@ -10,6 +10,7 @@ CONFIG_SYS_EXTRA_OPTIONS="KMCOGE4" CONFIG_VERSION_VARIABLE=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit key to stop autoboot in %2ds\n" diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig index 1a35ef119e..1440849250 100644 --- a/configs/kmcoge5ne_defconfig +++ b/configs/kmcoge5ne_defconfig @@ -7,6 +7,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="KMCOGE5NE" CONFIG_VERSION_VARIABLE=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit key to stop autoboot in %2ds\n" diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig index 698f3ce8d4..1d9b982104 100644 --- a/configs/kmeter1_defconfig +++ b/configs/kmeter1_defconfig @@ -7,6 +7,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="KMETER1" CONFIG_VERSION_VARIABLE=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit key to stop autoboot in %2ds\n" diff --git a/configs/kmlion1_defconfig b/configs/kmlion1_defconfig index e802c23c15..995061781b 100644 --- a/configs/kmlion1_defconfig +++ b/configs/kmlion1_defconfig @@ -10,6 +10,7 @@ CONFIG_SYS_EXTRA_OPTIONS="KMLION1" CONFIG_VERSION_VARIABLE=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit key to stop autoboot in %2ds\n" diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig index 92b294548f..cd34d5dd18 100644 --- a/configs/kmopti2_defconfig +++ b/configs/kmopti2_defconfig @@ -7,6 +7,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="KMOPTI2" CONFIG_VERSION_VARIABLE=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit key to stop autoboot in %2ds\n" diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig index b1e2126bfe..eca15363cc 100644 --- a/configs/kmsupx5_defconfig +++ b/configs/kmsupx5_defconfig @@ -7,6 +7,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="KMSUPX5" CONFIG_VERSION_VARIABLE=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit key to stop autoboot in %2ds\n" diff --git a/configs/kmtegr1_defconfig b/configs/kmtegr1_defconfig index 666f977e25..5e5ffc4c5f 100644 --- a/configs/kmtegr1_defconfig +++ b/configs/kmtegr1_defconfig @@ -7,6 +7,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="KMTEGR1" CONFIG_VERSION_VARIABLE=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit key to stop autoboot in %2ds\n" diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig index 7a6d965bbc..322e725e24 100644 --- a/configs/kmtepr2_defconfig +++ b/configs/kmtepr2_defconfig @@ -7,6 +7,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="KMTEPR2" CONFIG_VERSION_VARIABLE=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit key to stop autoboot in %2ds\n" diff --git a/configs/kmvect1_defconfig b/configs/kmvect1_defconfig index b8ceb0053a..4a1b932d5b 100644 --- a/configs/kmvect1_defconfig +++ b/configs/kmvect1_defconfig @@ -7,6 +7,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="KMVECT1" CONFIG_VERSION_VARIABLE=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit key to stop autoboot in %2ds\n" diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig index a198485b78..b109e41fae 100644 --- a/configs/minnowmax_defconfig +++ b/configs/minnowmax_defconfig @@ -20,6 +20,7 @@ CONFIG_BOOTSTAGE_REPORT=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_FLASH is not set diff --git a/configs/qemu-ppce500_defconfig b/configs/qemu-ppce500_defconfig index 6fd5649191..20003f8581 100644 --- a/configs/qemu-ppce500_defconfig +++ b/configs/qemu-ppce500_defconfig @@ -10,6 +10,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=1 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_REGINFO=y CONFIG_CMD_BOOTZ=y diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig index d1ad8025e7..0e66303a31 100644 --- a/configs/qemu-x86_64_defconfig +++ b/configs/qemu-x86_64_defconfig @@ -23,6 +23,7 @@ CONFIG_BOOTSTAGE_REPORT=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_LAST_STAGE_INIT=y 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 a26b40c641..b4cbf159b8 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -13,6 +13,7 @@ CONFIG_BOOTSTAGE_REPORT=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y CONFIG_CMD_BOOTEFI_SELFTEST=y diff --git a/configs/qemu-x86_efi_payload32_defconfig b/configs/qemu-x86_efi_payload32_defconfig index 2f3f6ce4b9..ebf8d16b77 100644 --- a/configs/qemu-x86_efi_payload32_defconfig +++ b/configs/qemu-x86_efi_payload32_defconfig @@ -9,6 +9,7 @@ CONFIG_BOOTSTAGE_REPORT=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_FLASH is not set diff --git a/configs/qemu-x86_efi_payload64_defconfig b/configs/qemu-x86_efi_payload64_defconfig index 8666851a6b..ddf58f9d4b 100644 --- a/configs/qemu-x86_efi_payload64_defconfig +++ b/configs/qemu-x86_efi_payload64_defconfig @@ -9,6 +9,7 @@ CONFIG_BOOTSTAGE_REPORT=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_FLASH is not set diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig index 7189634cdf..4273b04b95 100644 --- a/configs/som-db5800-som-6867_defconfig +++ b/configs/som-db5800-som-6867_defconfig @@ -17,6 +17,7 @@ CONFIG_BOOTSTAGE_REPORT=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_FLASH is not set diff --git a/configs/strider_con_defconfig b/configs/strider_con_defconfig index f024e47163..b86025053e 100644 --- a/configs/strider_con_defconfig +++ b/configs/strider_con_defconfig @@ -14,6 +14,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/strider_con_dp_defconfig b/configs/strider_con_dp_defconfig index 4dfe980128..fc1fa33c19 100644 --- a/configs/strider_con_dp_defconfig +++ b/configs/strider_con_dp_defconfig @@ -14,6 +14,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/strider_cpu_defconfig b/configs/strider_cpu_defconfig index 647eb68bb8..507d6a1223 100644 --- a/configs/strider_cpu_defconfig +++ b/configs/strider_cpu_defconfig @@ -14,6 +14,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/strider_cpu_dp_defconfig b/configs/strider_cpu_dp_defconfig index 9961ec52bc..8646c44bbc 100644 --- a/configs/strider_cpu_dp_defconfig +++ b/configs/strider_cpu_dp_defconfig @@ -14,6 +14,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig index 1ef559dba4..2fa97e273f 100644 --- a/configs/suvd3_defconfig +++ b/configs/suvd3_defconfig @@ -7,6 +7,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="SUVD3" CONFIG_VERSION_VARIABLE=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit key to stop autoboot in %2ds\n" diff --git a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig index 6503af9a62..6d4b9fc261 100644 --- a/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig +++ b/configs/theadorable-x86-conga-qa3-e3845-pcie-x4_defconfig @@ -18,6 +18,7 @@ CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_FLASH is not set diff --git a/configs/theadorable-x86-conga-qa3-e3845_defconfig b/configs/theadorable-x86-conga-qa3-e3845_defconfig index f9ac967136..9d2f5b9bd0 100644 --- a/configs/theadorable-x86-conga-qa3-e3845_defconfig +++ b/configs/theadorable-x86-conga-qa3-e3845_defconfig @@ -17,6 +17,7 @@ CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_FLASH is not set diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig index 52da3b1c8e..fc6debce1f 100644 --- a/configs/theadorable-x86-dfi-bt700_defconfig +++ b/configs/theadorable-x86-dfi-bt700_defconfig @@ -16,6 +16,7 @@ CONFIG_FIT_SIGNATURE=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_FLASH is not set diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig index 6d12d93733..28712f783a 100644 --- a/configs/tuge1_defconfig +++ b/configs/tuge1_defconfig @@ -7,6 +7,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="TUGE1" CONFIG_VERSION_VARIABLE=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit key to stop autoboot in %2ds\n" diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig index 9c5dc1e07a..602e1dd6a8 100644 --- a/configs/tuxx1_defconfig +++ b/configs/tuxx1_defconfig @@ -7,6 +7,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_SYS_EXTRA_OPTIONS="TUXX1" CONFIG_VERSION_VARIABLE=y CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_LAST_STAGE_INIT=y CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit key to stop autoboot in %2ds\n" diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 1992a6a938..c5fbef0567 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -46,8 +46,6 @@ #define CONFIG_SYS_L2_SIZE (256 << 10) -#define CONFIG_LAST_STAGE_INIT - #endif #if defined(CONFIG_TARGET_UCP1020) @@ -81,8 +79,6 @@ #define CONFIG_SYS_L2_SIZE (256 << 10) -#define CONFIG_LAST_STAGE_INIT - #endif #ifdef CONFIG_SDCARD diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 003d06005b..11cd1ef5e6 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -318,12 +318,6 @@ * Board initialisation callbacks */ #define CONFIG_MISC_INIT_R -#define CONFIG_LAST_STAGE_INIT - -#else /* CONFIG_TRAILBLAZER */ - -#define CONFIG_LAST_STAGE_INIT - #endif /* CONFIG_TRAILBLAZER */ /* diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index 14a0b1b0bd..30a9e853ed 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -16,7 +16,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ #define CONFIG_DISPLAY_BOARDINFO_LATE #define CONFIG_BOARD_LATE_INIT -#define CONFIG_LAST_STAGE_INIT /* * TEXT_BASE needs to be below 16MiB, since this area is scrubbed diff --git a/include/configs/edison.h b/include/configs/edison.h index dcfd311f25..3233f6653c 100644 --- a/include/configs/edison.h +++ b/include/configs/edison.h @@ -10,7 +10,6 @@ #include /* ACPI */ -#define CONFIG_LAST_STAGE_INIT /* Boot */ #define CONFIG_BOOTCOMMAND "run bootcmd" diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 8a0ac618e8..6c798d3531 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -48,8 +48,6 @@ #define CONFIG_IMX_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT_MSECS 6000 -#define CONFIG_LAST_STAGE_INIT - #define CONFIG_MXC_UART #define CONFIG_MXC_OCOTP diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index 5a256f0ba2..cbbbd8d983 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -18,8 +18,6 @@ #define CONFIG_MPC8308 1 /* MPC8308 CPU specific */ #define CONFIG_HRCON 1 /* HRCON board specific */ -#define CONFIG_LAST_STAGE_INIT - #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h index 89cb14b2df..72e7dac7b2 100644 --- a/include/configs/km/km-powerpc.h +++ b/include/configs/km/km-powerpc.h @@ -9,7 +9,6 @@ #define __CONFIG_KEYMILE_POWERPC_H /* Do boardspecific init for all boards */ -#define CONFIG_LAST_STAGE_INIT #define CONFIG_JFFS2_CMDLINE diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index 12e91c78b5..1f2e1c1c34 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -190,7 +190,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_MISC_INIT_F #define CONFIG_MISC_INIT_R -#define CONFIG_LAST_STAGE_INIT #define CONFIG_HWCONFIG diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index df18d84087..7b97ad56a5 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -112,8 +112,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void); #define CONFIG_LOADS_ECHO /* echo on for serial download */ -#define CONFIG_LAST_STAGE_INIT - /* * Command line configuration. */ diff --git a/include/configs/strider.h b/include/configs/strider.h index f027faf2cc..97ca3da875 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -18,8 +18,6 @@ #define CONFIG_MPC8308 1 /* MPC8308 CPU specific */ #define CONFIG_STRIDER 1 /* STRIDER board specific */ -#define CONFIG_LAST_STAGE_INIT - #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 8d8c689049..3f559b168a 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -18,7 +18,6 @@ #define CONFIG_SHOW_BOOT_PROGRESS #define CONFIG_PHYSMEM #define CONFIG_DISPLAY_BOARDINFO_LATE -#define CONFIG_LAST_STAGE_INIT #define CONFIG_NR_DRAM_BANKS 8 #define CONFIG_LMB diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 5ba7c71747..a48fd44f21 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1156,7 +1156,6 @@ CONFIG_KW88F6702 CONFIG_L1_INIT_RAM CONFIG_L2_CACHE CONFIG_LAN91C96_USE_32_BIT -CONFIG_LAST_STAGE_INIT CONFIG_LAYERSCAPE_NS_ACCESS CONFIG_LBA48 CONFIG_LBDAF -- 2.39.5