diff options
| author | Stefan Roese <sr@denx.de> | 2015-05-18 14:08:23 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-06-08 17:32:16 -0400 |
| commit | d126e016493dc84a87db4ce87db4c5a94ee29e9a (patch) | |
| tree | f9eb404ba50886cccd39f18ea28a27464e4ff95b /configs | |
| parent | 2d908fa084a5b5e10a3726e80b42d2ce5100d079 (diff) | |
| download | u-boot-d126e016493dc84a87db4ce87db4c5a94ee29e9a.tar.gz u-boot-d126e016493dc84a87db4ce87db4c5a94ee29e9a.tar.xz u-boot-d126e016493dc84a87db4ce87db4c5a94ee29e9a.zip | |
autoboot.c: Move config options to Kconfig
This patch moves the following config options to Kconfig:
CONFIG_AUTOBOOT_KEYED
CONFIG_AUTOBOOT_PROMPT
CONFIG_AUTOBOOT_DELAY_STR
CONFIG_AUTOBOOT_STOP_STR
AUTOBOOT_KEYED_CTRLC
Signed-off-by: Stefan Roese <sr@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
[trini: Drop ip04 and pm9263 configs/ additions, those boards previously
set CONFIG_AUTOBOOT_PROMPT but never used it, re-run savedefconfig over
all boards that did change. Make digsy_mtc_* string include seconds to
match others and not warn. ]
Signed-off-by: Tom Rini <trini@konsulko.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'configs')
48 files changed, 196 insertions, 45 deletions
diff --git a/configs/CPCI4052_defconfig b/configs/CPCI4052_defconfig index 1eff08299e..93ab5b0ac0 100644 --- a/configs/CPCI4052_defconfig +++ b/configs/CPCI4052_defconfig @@ -1,4 +1,7 @@ CONFIG_PPC=y +CONFIG_CMD_NET=y CONFIG_4xx=y CONFIG_TARGET_CPCI4052=y -CONFIG_CMD_NET=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" +CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/O2DNT2_RAMBOOT_defconfig b/configs/O2DNT2_RAMBOOT_defconfig index f9d340ab72..0e47ffed8e 100644 --- a/configs/O2DNT2_RAMBOOT_defconfig +++ b/configs/O2DNT2_RAMBOOT_defconfig @@ -1,5 +1,8 @@ CONFIG_PPC=y +CONFIG_CMD_NET=y CONFIG_MPC5xxx=y CONFIG_TARGET_O2DNT2=y CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00100000" -CONFIG_CMD_NET=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press password to stop\n" +CONFIG_AUTOBOOT_STOP_STR="++++++++++" diff --git a/configs/O2DNT2_defconfig b/configs/O2DNT2_defconfig index ce952e8b0f..3501761450 100644 --- a/configs/O2DNT2_defconfig +++ b/configs/O2DNT2_defconfig @@ -1,4 +1,7 @@ CONFIG_PPC=y +CONFIG_CMD_NET=y CONFIG_MPC5xxx=y CONFIG_TARGET_O2DNT2=y -CONFIG_CMD_NET=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press password to stop\n" +CONFIG_AUTOBOOT_STOP_STR="++++++++++" diff --git a/configs/PLU405_defconfig b/configs/PLU405_defconfig index 459b6908d4..f7da9801f0 100644 --- a/configs/PLU405_defconfig +++ b/configs/PLU405_defconfig @@ -1,4 +1,7 @@ CONFIG_PPC=y +CONFIG_CMD_NET=y CONFIG_4xx=y CONFIG_TARGET_PLU405=y -CONFIG_CMD_NET=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" +CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/PMC405DE_defconfig b/configs/PMC405DE_defconfig index e7e157f8ef..aec6b51470 100644 --- a/configs/PMC405DE_defconfig +++ b/configs/PMC405DE_defconfig @@ -1,4 +1,7 @@ CONFIG_PPC=y +CONFIG_CMD_NET=y CONFIG_4xx=y CONFIG_TARGET_PMC405DE=y -CONFIG_CMD_NET=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" +CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/PMC440_defconfig b/configs/PMC440_defconfig index 779087d817..44c81b3f66 100644 --- a/configs/PMC440_defconfig +++ b/configs/PMC440_defconfig @@ -1,4 +1,7 @@ CONFIG_PPC=y +CONFIG_CMD_NET=y CONFIG_4xx=y CONFIG_TARGET_PMC440=y -CONFIG_CMD_NET=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" +CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/UCP1020_SPIFLASH_defconfig b/configs/UCP1020_SPIFLASH_defconfig index d6ea20e52e..18691aa57b 100644 --- a/configs/UCP1020_SPIFLASH_defconfig +++ b/configs/UCP1020_SPIFLASH_defconfig @@ -1,6 +1,9 @@ CONFIG_PPC=y +CONFIG_CMD_SETEXPR=y +CONFIG_CMD_NET=y CONFIG_MPC85xx=y CONFIG_TARGET_UCP1020=y CONFIG_TARGET_UCP1020_SPIFLASH=y -CONFIG_CMD_SETEXPR=y -CONFIG_CMD_NET=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc>\" to stop\n" +CONFIG_AUTOBOOT_STOP_STR="\x1b" diff --git a/configs/UCP1020_defconfig b/configs/UCP1020_defconfig index 50cb7deca1..f9f45aea0e 100644 --- a/configs/UCP1020_defconfig +++ b/configs/UCP1020_defconfig @@ -1,5 +1,8 @@ CONFIG_PPC=y -CONFIG_MPC85xx=y -CONFIG_TARGET_UCP1020=y CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_MPC85xx=y +CONFIG_TARGET_UCP1020=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc>\" to stop\n" +CONFIG_AUTOBOOT_STOP_STR="\x1b" diff --git a/configs/a4m072_defconfig b/configs/a4m072_defconfig index a91c89b57d..c979493f82 100644 --- a/configs/a4m072_defconfig +++ b/configs/a4m072_defconfig @@ -1,4 +1,7 @@ CONFIG_PPC=y +CONFIG_CMD_NET=y CONFIG_MPC5xxx=y CONFIG_TARGET_A4M072=y -CONFIG_CMD_NET=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="autoboot in %d seconds\n" +CONFIG_AUTOBOOT_DELAY_STR="asdfg" diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig index b00ae3a098..03ce63b9fa 100644 --- a/configs/atngw100_defconfig +++ b/configs/atngw100_defconfig @@ -1,3 +1,7 @@ CONFIG_AVR32=y -CONFIG_TARGET_ATNGW100=y CONFIG_CMD_NET=y +CONFIG_TARGET_ATNGW100=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" +CONFIG_AUTOBOOT_DELAY_STR="d" +CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/atngw100mkii_defconfig b/configs/atngw100mkii_defconfig index 6caf691d00..2d1845f98a 100644 --- a/configs/atngw100mkii_defconfig +++ b/configs/atngw100mkii_defconfig @@ -1,3 +1,7 @@ CONFIG_AVR32=y -CONFIG_TARGET_ATNGW100MKII=y CONFIG_CMD_NET=y +CONFIG_TARGET_ATNGW100MKII=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" +CONFIG_AUTOBOOT_DELAY_STR="d" +CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/atstk1002_defconfig b/configs/atstk1002_defconfig index e407dc56a1..f74060e482 100644 --- a/configs/atstk1002_defconfig +++ b/configs/atstk1002_defconfig @@ -1,3 +1,7 @@ CONFIG_AVR32=y -CONFIG_TARGET_ATSTK1002=y CONFIG_CMD_NET=y +CONFIG_TARGET_ATSTK1002=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" +CONFIG_AUTOBOOT_DELAY_STR="d" +CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/atstk1003_defconfig b/configs/atstk1003_defconfig index b704532dbf..bd6c93afbc 100644 --- a/configs/atstk1003_defconfig +++ b/configs/atstk1003_defconfig @@ -1,2 +1,6 @@ CONFIG_AVR32=y CONFIG_TARGET_ATSTK1003=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" +CONFIG_AUTOBOOT_DELAY_STR="d" +CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/atstk1004_defconfig b/configs/atstk1004_defconfig index 76502549c1..4d12160294 100644 --- a/configs/atstk1004_defconfig +++ b/configs/atstk1004_defconfig @@ -1,2 +1,6 @@ CONFIG_AVR32=y CONFIG_TARGET_ATSTK1004=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" +CONFIG_AUTOBOOT_DELAY_STR="d" +CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/atstk1006_defconfig b/configs/atstk1006_defconfig index 31482fcee2..6d1d045c0d 100644 --- a/configs/atstk1006_defconfig +++ b/configs/atstk1006_defconfig @@ -1,3 +1,7 @@ CONFIG_AVR32=y -CONFIG_TARGET_ATSTK1006=y CONFIG_CMD_NET=y +CONFIG_TARGET_ATSTK1006=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" +CONFIG_AUTOBOOT_DELAY_STR="d" +CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/calimain_defconfig b/configs/calimain_defconfig index a601b0381d..b1c5fa933c 100644 --- a/configs/calimain_defconfig +++ b/configs/calimain_defconfig @@ -2,3 +2,5 @@ CONFIG_ARM=y CONFIG_ARCH_DAVINCI=y CONFIG_TARGET_CALIMAIN=y CONFIG_CMD_NET=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_STOP_STR="\x0b" diff --git a/configs/cpuat91_defconfig b/configs/cpuat91_defconfig index 7a87f4ae11..676e1a59d2 100644 --- a/configs/cpuat91_defconfig +++ b/configs/cpuat91_defconfig @@ -2,3 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_AT91=y CONFIG_TARGET_CPUAT91=y CONFIG_CMD_NET=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" +CONFIG_AUTOBOOT_DELAY_STR="d" +CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/cpuat91_ram_defconfig b/configs/cpuat91_ram_defconfig index 7b92ed6826..95e88c4f6c 100644 --- a/configs/cpuat91_ram_defconfig +++ b/configs/cpuat91_ram_defconfig @@ -1,5 +1,9 @@ CONFIG_ARM=y CONFIG_ARCH_AT91=y CONFIG_TARGET_CPUAT91=y -CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT" CONFIG_CMD_NET=y +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT" +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" +CONFIG_AUTOBOOT_DELAY_STR="d" +CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/digsy_mtc_RAMBOOT_defconfig b/configs/digsy_mtc_RAMBOOT_defconfig index daaf1dcf4a..311ac8e58c 100644 --- a/configs/digsy_mtc_RAMBOOT_defconfig +++ b/configs/digsy_mtc_RAMBOOT_defconfig @@ -1,5 +1,9 @@ CONFIG_PPC=y +CONFIG_CMD_NET=y CONFIG_MPC5xxx=y CONFIG_TARGET_DIGSY_MTC=y CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00100000" -CONFIG_CMD_NET=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" +CONFIG_AUTOBOOT_DELAY_STR="d" +CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/digsy_mtc_defconfig b/configs/digsy_mtc_defconfig index c1706d1bd1..f4f0a6d2b5 100644 --- a/configs/digsy_mtc_defconfig +++ b/configs/digsy_mtc_defconfig @@ -1,4 +1,7 @@ CONFIG_PPC=y +CONFIG_CMD_NET=y CONFIG_MPC5xxx=y CONFIG_TARGET_DIGSY_MTC=y -CONFIG_CMD_NET=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="autoboot in %d seconds\n" +CONFIG_AUTOBOOT_DELAY_STR=" " diff --git a/configs/digsy_mtc_rev5_RAMBOOT_defconfig b/configs/digsy_mtc_rev5_RAMBOOT_defconfig index 6a4869dc03..554f907ef9 100644 --- a/configs/digsy_mtc_rev5_RAMBOOT_defconfig +++ b/configs/digsy_mtc_rev5_RAMBOOT_defconfig @@ -1,5 +1,9 @@ CONFIG_PPC=y +CONFIG_CMD_NET=y CONFIG_MPC5xxx=y CONFIG_TARGET_DIGSY_MTC=y CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00100000,DIGSY_REV5" -CONFIG_CMD_NET=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" +CONFIG_AUTOBOOT_DELAY_STR="d" +CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/digsy_mtc_rev5_defconfig b/configs/digsy_mtc_rev5_defconfig index 9370fdd30e..83b8ac2adb 100644 --- a/configs/digsy_mtc_rev5_defconfig +++ b/configs/digsy_mtc_rev5_defconfig @@ -1,5 +1,9 @@ CONFIG_PPC=y +CONFIG_CMD_NET=y CONFIG_MPC5xxx=y CONFIG_TARGET_DIGSY_MTC=y CONFIG_SYS_EXTRA_OPTIONS="DIGSY_REV5" -CONFIG_CMD_NET=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" +CONFIG_AUTOBOOT_DELAY_STR="d" +CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/dlvision-10g_defconfig b/configs/dlvision-10g_defconfig index b067c8697d..3687111c16 100644 --- a/configs/dlvision-10g_defconfig +++ b/configs/dlvision-10g_defconfig @@ -1,5 +1,7 @@ CONFIG_PPC=y -CONFIG_4xx=y -CONFIG_TARGET_DLVISION_10G=y CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_4xx=y +CONFIG_TARGET_DLVISION_10G=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/draco_defconfig b/configs/draco_defconfig index 4c514a39ef..80cb44bf53 100644 --- a/configs/draco_defconfig +++ b/configs/draco_defconfig @@ -1,4 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_DRACO=y -CONFIG_SPL=y CONFIG_CMD_NET=y +CONFIG_SPL=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n" +CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" diff --git a/configs/dxr2_defconfig b/configs/dxr2_defconfig index c2a14b794c..1041031870 100644 --- a/configs/dxr2_defconfig +++ b/configs/dxr2_defconfig @@ -1,4 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_DXR2=y -CONFIG_SPL=y CONFIG_CMD_NET=y +CONFIG_SPL=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n" +CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" diff --git a/configs/favr-32-ezkit_defconfig b/configs/favr-32-ezkit_defconfig index fabb50c249..33305309b5 100644 --- a/configs/favr-32-ezkit_defconfig +++ b/configs/favr-32-ezkit_defconfig @@ -1,3 +1,7 @@ CONFIG_AVR32=y -CONFIG_TARGET_FAVR_32_EZKIT=y CONFIG_CMD_NET=y +CONFIG_TARGET_FAVR_32_EZKIT=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" +CONFIG_AUTOBOOT_DELAY_STR="d" +CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/gdppc440etx_defconfig b/configs/gdppc440etx_defconfig index c6c7161c26..9fe229e40f 100644 --- a/configs/gdppc440etx_defconfig +++ b/configs/gdppc440etx_defconfig @@ -1,5 +1,7 @@ CONFIG_PPC=y -CONFIG_4xx=y -CONFIG_TARGET_GDPPC440ETX=y CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_4xx=y +CONFIG_TARGET_GDPPC440ETX=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/grasshopper_defconfig b/configs/grasshopper_defconfig index 451ce9f12c..85b5f4318c 100644 --- a/configs/grasshopper_defconfig +++ b/configs/grasshopper_defconfig @@ -1,3 +1,7 @@ CONFIG_AVR32=y -CONFIG_TARGET_GRASSHOPPER=y CONFIG_CMD_NET=y +CONFIG_TARGET_GRASSHOPPER=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" +CONFIG_AUTOBOOT_DELAY_STR="d" +CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/hammerhead_defconfig b/configs/hammerhead_defconfig index 1130d92988..278c76a4fe 100644 --- a/configs/hammerhead_defconfig +++ b/configs/hammerhead_defconfig @@ -1,3 +1,7 @@ CONFIG_AVR32=y -CONFIG_TARGET_HAMMERHEAD=y CONFIG_CMD_NET=y +CONFIG_TARGET_HAMMERHEAD=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds" +CONFIG_AUTOBOOT_DELAY_STR="d" +CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/highbank_defconfig b/configs/highbank_defconfig index e1875dbb67..ed3b7e4961 100644 --- a/configs/highbank_defconfig +++ b/configs/highbank_defconfig @@ -1,3 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_HIGHBANK=y CONFIG_CMD_NET=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds...\nPress <s> to stop or <d> to delay\n" +CONFIG_AUTOBOOT_KEYED_CTRLC=y diff --git a/configs/hrcon_defconfig b/configs/hrcon_defconfig index 4f2a55dae7..77072436ce 100644 --- a/configs/hrcon_defconfig +++ b/configs/hrcon_defconfig @@ -1,4 +1,6 @@ CONFIG_PPC=y +CONFIG_CMD_NET=y CONFIG_MPC83xx=y CONFIG_TARGET_HRCON=y -CONFIG_CMD_NET=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig index 21977c876b..cb795fc6e2 100644 --- a/configs/ids8313_defconfig +++ b/configs/ids8313_defconfig @@ -1,7 +1,10 @@ CONFIG_PPC=y +CONFIG_CMD_NET=y CONFIG_MPC83xx=y CONFIG_TARGET_IDS8313=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFFF00000" -CONFIG_CMD_NET=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Enter password - autoboot in %d seconds...\n" +CONFIG_AUTOBOOT_DELAY_STR="ids" diff --git a/configs/intip_defconfig b/configs/intip_defconfig index 476616cd97..82ed775e18 100644 --- a/configs/intip_defconfig +++ b/configs/intip_defconfig @@ -1,6 +1,8 @@ CONFIG_PPC=y +CONFIG_CMD_SETEXPR=y +CONFIG_CMD_NET=y CONFIG_4xx=y CONFIG_TARGET_INTIP=y CONFIG_SYS_EXTRA_OPTIONS="INTIB" -CONFIG_CMD_SETEXPR=y -CONFIG_CMD_NET=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/io64_defconfig b/configs/io64_defconfig index 7f1825adab..3276cc409c 100644 --- a/configs/io64_defconfig +++ b/configs/io64_defconfig @@ -1,5 +1,7 @@ CONFIG_PPC=y -CONFIG_4xx=y -CONFIG_TARGET_IO64=y CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_4xx=y +CONFIG_TARGET_IO64=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/io_defconfig b/configs/io_defconfig index 7713232336..ad3a651daf 100644 --- a/configs/io_defconfig +++ b/configs/io_defconfig @@ -1,5 +1,7 @@ CONFIG_PPC=y -CONFIG_4xx=y -CONFIG_TARGET_IO=y CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_4xx=y +CONFIG_TARGET_IO=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/iocon_defconfig b/configs/iocon_defconfig index 95758cf868..f966dead76 100644 --- a/configs/iocon_defconfig +++ b/configs/iocon_defconfig @@ -1,5 +1,7 @@ CONFIG_PPC=y -CONFIG_4xx=y -CONFIG_TARGET_IOCON=y CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_4xx=y +CONFIG_TARGET_IOCON=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/motionpro_defconfig b/configs/motionpro_defconfig index 8bc367b7fe..eaa222eb42 100644 --- a/configs/motionpro_defconfig +++ b/configs/motionpro_defconfig @@ -1,4 +1,7 @@ CONFIG_PPC=y +CONFIG_CMD_NET=y CONFIG_MPC5xxx=y CONFIG_TARGET_MOTIONPRO=y -CONFIG_CMD_NET=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n" +CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index e03f586880..3aff2e6d04 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -1,3 +1,4 @@ CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_NOKIA_RX51=y +CONFIG_AUTOBOOT_KEYED=y diff --git a/configs/omap3_mvblx_defconfig b/configs/omap3_mvblx_defconfig index ec4924b82a..fd3902dfaf 100644 --- a/configs/omap3_mvblx_defconfig +++ b/configs/omap3_mvblx_defconfig @@ -2,3 +2,5 @@ CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_MVBLX=y CONFIG_CMD_NET=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_STOP_STR="S" diff --git a/configs/ph1_ld4_defconfig b/configs/ph1_ld4_defconfig index 82ce8c79b7..723989c0fb 100644 --- a/configs/ph1_ld4_defconfig +++ b/configs/ph1_ld4_defconfig @@ -9,6 +9,10 @@ CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-ld4-ref" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_HUSH_PARSER=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" +CONFIG_AUTOBOOT_DELAY_STR="d" +CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_BDI=y CONFIG_CMD_CONSOLE=y CONFIG_CMD_BOOTD=y diff --git a/configs/ph1_pro4_defconfig b/configs/ph1_pro4_defconfig index 671d9cc46d..a2e2d4f4d7 100644 --- a/configs/ph1_pro4_defconfig +++ b/configs/ph1_pro4_defconfig @@ -8,6 +8,10 @@ CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-pro4-ref" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_HUSH_PARSER=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" +CONFIG_AUTOBOOT_DELAY_STR="d" +CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_BDI=y CONFIG_CMD_CONSOLE=y CONFIG_CMD_BOOTD=y diff --git a/configs/ph1_sld8_defconfig b/configs/ph1_sld8_defconfig index 3e763dc5ab..dc59dcbaa8 100644 --- a/configs/ph1_sld8_defconfig +++ b/configs/ph1_sld8_defconfig @@ -9,6 +9,10 @@ CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-sld8-ref" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_HUSH_PARSER=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" +CONFIG_AUTOBOOT_DELAY_STR="d" +CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_BDI=y CONFIG_CMD_CONSOLE=y CONFIG_CMD_BOOTD=y diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig index e65dff597d..10f2fe9067 100644 --- a/configs/pxm2_defconfig +++ b/configs/pxm2_defconfig @@ -1,4 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_PXM2=y -CONFIG_SPL=y CONFIG_CMD_NET=y +CONFIG_SPL=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n" +CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" diff --git a/configs/rut_defconfig b/configs/rut_defconfig index 45ed12c745..93ab51494b 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -1,4 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_RUT=y -CONFIG_SPL=y CONFIG_CMD_NET=y +CONFIG_SPL=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n" +CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" diff --git a/configs/spear600_defconfig b/configs/spear600_defconfig index 2790ffce9e..2d27e7a662 100644 --- a/configs/spear600_defconfig +++ b/configs/spear600_defconfig @@ -1,6 +1,9 @@ CONFIG_ARM=y CONFIG_TARGET_SPEAR600=y CONFIG_NETDEVICES=y -CONFIG_SYS_EXTRA_OPTIONS="spear600" CONFIG_CMD_NET=y +CONFIG_SYS_EXTRA_OPTIONS="spear600" +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n" +CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_ETH_DESIGNWARE=y diff --git a/configs/stv0991_defconfig b/configs/stv0991_defconfig index 6c27666ad7..f8ec5dbaa0 100644 --- a/configs/stv0991_defconfig +++ b/configs/stv0991_defconfig @@ -2,7 +2,10 @@ CONFIG_ARM=y CONFIG_TARGET_STV0991=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_NETDEVICES=y +CONFIG_CMD_NET=y CONFIG_DEFAULT_DEVICE_TREE="stv0991" CONFIG_SYS_EXTRA_OPTIONS="stv0991" -CONFIG_CMD_NET=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n" +CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_ETH_DESIGNWARE=y diff --git a/configs/x600_defconfig b/configs/x600_defconfig index 3122a2b276..8e22a184c5 100644 --- a/configs/x600_defconfig +++ b/configs/x600_defconfig @@ -1,6 +1,9 @@ CONFIG_ARM=y CONFIG_TARGET_X600=y CONFIG_NETDEVICES=y -CONFIG_SPL=y CONFIG_CMD_NET=y +CONFIG_SPL=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n" +CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_ETH_DESIGNWARE=y diff --git a/configs/zmx25_defconfig b/configs/zmx25_defconfig index 84c789aa20..259d4a93e5 100644 --- a/configs/zmx25_defconfig +++ b/configs/zmx25_defconfig @@ -1,3 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_ZMX25=y CONFIG_CMD_NET=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="boot in %d s\n" +CONFIG_AUTOBOOT_DELAY_STR="delaygs" +CONFIG_AUTOBOOT_STOP_STR="stopgs" |