From d126e016493dc84a87db4ce87db4c5a94ee29e9a Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Mon, 18 May 2015 14:08:23 +0200 Subject: [PATCH] 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 Reviewed-by: Simon Glass [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 Cc: Masahiro Yamada --- common/Kconfig | 64 ++++++++++++++++++++++++ common/autoboot.c | 6 ++- configs/CPCI4052_defconfig | 5 +- configs/O2DNT2_RAMBOOT_defconfig | 5 +- configs/O2DNT2_defconfig | 5 +- configs/PLU405_defconfig | 5 +- configs/PMC405DE_defconfig | 5 +- configs/PMC440_defconfig | 5 +- configs/UCP1020_SPIFLASH_defconfig | 7 ++- configs/UCP1020_defconfig | 7 ++- configs/a4m072_defconfig | 5 +- configs/atngw100_defconfig | 6 ++- configs/atngw100mkii_defconfig | 6 ++- configs/atstk1002_defconfig | 6 ++- configs/atstk1003_defconfig | 4 ++ configs/atstk1004_defconfig | 4 ++ configs/atstk1006_defconfig | 6 ++- configs/calimain_defconfig | 2 + configs/cpuat91_defconfig | 4 ++ configs/cpuat91_ram_defconfig | 6 ++- configs/digsy_mtc_RAMBOOT_defconfig | 6 ++- configs/digsy_mtc_defconfig | 5 +- configs/digsy_mtc_rev5_RAMBOOT_defconfig | 6 ++- configs/digsy_mtc_rev5_defconfig | 6 ++- configs/dlvision-10g_defconfig | 6 ++- configs/draco_defconfig | 5 +- configs/dxr2_defconfig | 5 +- configs/favr-32-ezkit_defconfig | 6 ++- configs/gdppc440etx_defconfig | 6 ++- configs/grasshopper_defconfig | 6 ++- configs/hammerhead_defconfig | 6 ++- configs/highbank_defconfig | 3 ++ configs/hrcon_defconfig | 4 +- configs/ids8313_defconfig | 5 +- configs/intip_defconfig | 6 ++- configs/io64_defconfig | 6 ++- configs/io_defconfig | 6 ++- configs/iocon_defconfig | 6 ++- configs/motionpro_defconfig | 5 +- configs/nokia_rx51_defconfig | 1 + configs/omap3_mvblx_defconfig | 2 + configs/ph1_ld4_defconfig | 4 ++ configs/ph1_pro4_defconfig | 4 ++ configs/ph1_sld8_defconfig | 4 ++ configs/pxm2_defconfig | 5 +- configs/rut_defconfig | 5 +- configs/spear600_defconfig | 5 +- configs/stv0991_defconfig | 5 +- configs/x600_defconfig | 5 +- configs/zmx25_defconfig | 4 ++ include/configs/CPCI4052.h | 6 --- include/configs/PLU405.h | 9 ---- include/configs/PMC405DE.h | 6 --- include/configs/PMC440.h | 6 --- include/configs/UCP1020.h | 11 ---- include/configs/a4m072.h | 4 -- include/configs/atngw100.h | 10 ---- include/configs/atngw100mkii.h | 10 ---- include/configs/atstk1002.h | 10 ---- include/configs/atstk1003.h | 10 ---- include/configs/atstk1004.h | 10 ---- include/configs/atstk1006.h | 10 ---- include/configs/bf537-stamp.h | 4 -- include/configs/calimain.h | 2 - include/configs/cpuat91.h | 6 --- include/configs/digsy_mtc.h | 4 -- include/configs/dlvision-10g.h | 2 - include/configs/favr-32-ezkit.h | 10 ---- include/configs/gdppc440etx.h | 2 - include/configs/grasshopper.h | 10 ---- include/configs/hammerhead.h | 10 ---- include/configs/highbank.h | 4 +- include/configs/hrcon.h | 2 - include/configs/ids8313.h | 4 -- include/configs/intip.h | 2 - include/configs/io.h | 2 - include/configs/io64.h | 2 - include/configs/iocon.h | 2 - include/configs/ip04.h | 1 - include/configs/motionpro.h | 6 --- include/configs/nokia_rx51.h | 1 - include/configs/o2dnt-common.h | 12 ----- include/configs/omap3_mvblx.h | 2 - include/configs/pm9263.h | 1 - include/configs/siemens-am33x-common.h | 6 --- include/configs/spear-common.h | 4 -- include/configs/stv0991.h | 5 +- include/configs/uniphier.h | 5 -- include/configs/x600.h | 4 -- include/configs/zmx25.h | 4 -- 90 files changed, 267 insertions(+), 265 deletions(-) diff --git a/common/Kconfig b/common/Kconfig index a2167f01f7..6b5d166429 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -17,6 +17,70 @@ config SYS_HUSH_PARSER help Backward compatibility. +menu "Autoboot options" + +config AUTOBOOT_KEYED + bool "Stop autobooting via specific input key / string" + default n + help + This option enables stopping (aborting) of the automatic + boot feature only by issuing a specific input key or + string. If not enabled, any input key will abort the + U-Boot automatic booting process and bring the device + to the U-Boot prompt for user input. + +config AUTOBOOT_PROMPT + string "Autoboot stop prompt" + depends on AUTOBOOT_KEYED + default "Autoboot in %d seconds\\n" + help + This string is displayed before the boot delay selected by + CONFIG_BOOTDELAY starts. If it is not defined there is no + output indicating that autoboot is in progress. + + Note that this define is used as the (only) argument to a + printf() call, so it may contain '%' format specifications, + provided that it also includes, sepearated by commas exactly + like in a printf statement, the required arguments. It is + the responsibility of the user to select only such arguments + that are valid in the given context. + +config AUTOBOOT_DELAY_STR + string "Delay autobooting via specific input key / string" + depends on AUTOBOOT_KEYED + help + This option delays the automatic boot feature by issuing + a specific input key or string. If CONFIG_AUTOBOOT_DELAY_STR + or the environment variable "bootdelaykey" is specified + and this string is received from console input before + autoboot starts booting, U-Boot gives a command prompt. The + U-Boot prompt will time out if CONFIG_BOOT_RETRY_TIME is + used, otherwise it never times out. + +config AUTOBOOT_STOP_STR + string "Stop autobooting via specific input key / string" + depends on AUTOBOOT_KEYED + help + This option enables stopping (aborting) of the automatic + boot feature only by issuing a specific input key or + string. If CONFIG_AUTOBOOT_STOP_STR or the environment + variable "bootstopkey" is specified and this string is + received from console input before autoboot starts booting, + U-Boot gives a command prompt. The U-Boot prompt never + times out, even if CONFIG_BOOT_RETRY_TIME is used. + +config AUTOBOOT_KEYED_CTRLC + bool "Enable Ctrl-C autoboot interruption" + depends on AUTOBOOT_KEYED + default n + help + This option allows for the boot sequence to be interrupted + by ctrl-c, in addition to the "bootdelaykey" and "bootstopkey". + Setting this variable provides an escape sequence from the + limited "password" strings. + +endmenu + comment "Commands" menu "Info commands" diff --git a/common/autoboot.c b/common/autoboot.c index 7c92f3e54d..f72eb1860c 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -56,7 +56,11 @@ static int abortboot_keyed(int bootdelay) #endif # ifdef CONFIG_AUTOBOOT_PROMPT - printf(CONFIG_AUTOBOOT_PROMPT); + /* + * CONFIG_AUTOBOOT_PROMPT includes the %d for all boards. + * To print the bootdelay value upon bootup. + */ + printf(CONFIG_AUTOBOOT_PROMPT, bootdelay); # endif # ifdef CONFIG_AUTOBOOT_DELAY_STR 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 \"\" 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 \"\" 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 \"\" 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 \"\" 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 to stop or 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 \"\" 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 \"\" 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 \"\" 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" diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index ceddd7accc..c20ecbd06d 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -141,12 +141,6 @@ #define CONFIG_VERSION_VARIABLE 1 /* include version env variable */ -#define CONFIG_AUTOBOOT_KEYED 1 -#define CONFIG_AUTOBOOT_PROMPT \ - "Press SPACE to abort autoboot in %d seconds\n", bootdelay -#undef CONFIG_AUTOBOOT_DELAY_STR -#define CONFIG_AUTOBOOT_STOP_STR " " - #define CONFIG_SYS_RX_ETH_BUFFER 16 /* use 16 rx buffer on 405 emac */ /*----------------------------------------------------------------------- diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h index a236e117a0..80f42768f0 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -138,15 +138,6 @@ #define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ #define CONFIG_BOOTDELAY 3 /* autoboot after 3 seconds */ -/* Only interrupt boot if space is pressed */ -/* If a long serial cable is connected but */ -/* other end is dead, garbage will be read */ -#define CONFIG_AUTOBOOT_KEYED 1 -#define CONFIG_AUTOBOOT_PROMPT \ - "Press SPACE to abort autoboot in %d seconds\n", bootdelay -#undef CONFIG_AUTOBOOT_DELAY_STR -#define CONFIG_AUTOBOOT_STOP_STR " " - #define CONFIG_VERSION_VARIABLE 1 /* include version env variable */ #define CONFIG_SYS_RX_ETH_BUFFER 16 /* use 16 rx buffer on 405 emac */ diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h index f7d28e39dd..a64c82a272 100644 --- a/include/configs/PMC405DE.h +++ b/include/configs/PMC405DE.h @@ -110,12 +110,6 @@ #define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ #define CONFIG_VERSION_VARIABLE 1 /* include version env variable */ -#define CONFIG_AUTOBOOT_KEYED 1 -#define CONFIG_AUTOBOOT_PROMPT \ - "Press SPACE to abort autoboot in %d seconds\n", bootdelay -#undef CONFIG_AUTOBOOT_DELAY_STR -#define CONFIG_AUTOBOOT_STOP_STR " " - /* * PCI stuff */ diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index b8d4dc5eb8..31b9050032 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -331,12 +331,6 @@ #define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ #define CONFIG_VERSION_VARIABLE 1 /* include version env variable */ -#define CONFIG_AUTOBOOT_KEYED 1 -#define CONFIG_AUTOBOOT_PROMPT \ - "Press SPACE to abort autoboot in %d seconds\n", bootdelay -#undef CONFIG_AUTOBOOT_DELAY_STR -#define CONFIG_AUTOBOOT_STOP_STR " " - /*----------------------------------------------------------------------- * PCI stuff *----------------------------------------------------------------------*/ diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index ec52d6a768..b9bbe340f3 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -626,17 +626,6 @@ /* default location for tftp and bootm */ #define CONFIG_LOADADDR 1000000 -/* - * Autobooting - */ -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_STOP_STR "\x1b" -#define DEBUG_BOOTKEYS 0 -#undef CONFIG_AUTOBOOT_DELAY_STR -#undef CONFIG_BOOTARGS -#define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds, " \ - "press \"\" to stop\n", bootdelay - #define CONFIG_BOOTARGS /* the boot command will set bootargs */ #define CONFIG_BAUDRATE 115200 diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h index 00589b7e68..b03f163d65 100644 --- a/include/configs/a4m072.h +++ b/include/configs/a4m072.h @@ -123,10 +123,6 @@ #define CONFIG_SYS_AUTOLOAD "n" -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT "autoboot in %d seconds\n", bootdelay -#define CONFIG_AUTOBOOT_DELAY_STR "asdfg" - #undef CONFIG_BOOTARGS #define CONFIG_PREBOOT "run try_update" diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h index 540e86ae47..1202ec2494 100644 --- a/include/configs/atngw100.h +++ b/include/configs/atngw100.h @@ -59,17 +59,7 @@ #define CONFIG_BOOTCOMMAND \ "fsload; bootm" -/* - * Only interrupt autoboot if is pressed. Otherwise, garbage - * data on the serial line may interrupt the boot sequence. - */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT \ - "Press SPACE to abort autoboot in %d seconds\n", bootdelay -#define CONFIG_AUTOBOOT_DELAY_STR "d" -#define CONFIG_AUTOBOOT_STOP_STR " " /* * After booting the board for the first time, new ethernet addresses diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h index 83747336c6..ea1fb588a2 100644 --- a/include/configs/atngw100mkii.h +++ b/include/configs/atngw100mkii.h @@ -82,17 +82,7 @@ #define CONFIG_BOOTCOMMAND \ "fsload 0x10400000 /uImage; bootm" -/* - * Only interrupt autoboot if is pressed. Otherwise, garbage - * data on the serial line may interrupt the boot sequence. - */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT \ - "Press SPACE to abort autoboot in %d seconds\n", bootdelay -#define CONFIG_AUTOBOOT_DELAY_STR "d" -#define CONFIG_AUTOBOOT_STOP_STR " " /* * After booting the board for the first time, new ethernet addresses diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h index a9c064a45d..64b55192e5 100644 --- a/include/configs/atstk1002.h +++ b/include/configs/atstk1002.h @@ -79,17 +79,7 @@ #define CONFIG_BOOTCOMMAND \ "fsload; bootm $(fileaddr)" -/* - * Only interrupt autoboot if is pressed. Otherwise, garbage - * data on the serial line may interrupt the boot sequence. - */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT \ - "Press SPACE to abort autoboot in %d seconds\n", bootdelay -#define CONFIG_AUTOBOOT_DELAY_STR "d" -#define CONFIG_AUTOBOOT_STOP_STR " " /* * After booting the board for the first time, new ethernet addresses diff --git a/include/configs/atstk1003.h b/include/configs/atstk1003.h index b2ad30ec90..4126b66d9d 100644 --- a/include/configs/atstk1003.h +++ b/include/configs/atstk1003.h @@ -79,17 +79,7 @@ #define CONFIG_BOOTCOMMAND \ "mmc rescan; ext2load mmc 0:1 0x10400000 /boot/uImage; bootm" -/* - * Only interrupt autoboot if is pressed. Otherwise, garbage - * data on the serial line may interrupt the boot sequence. - */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT \ - "Press SPACE to abort autoboot in %d seconds\n", bootdelay -#define CONFIG_AUTOBOOT_DELAY_STR "d" -#define CONFIG_AUTOBOOT_STOP_STR " " /* * Command line configuration. diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h index 19f049a519..97a1d3ef14 100644 --- a/include/configs/atstk1004.h +++ b/include/configs/atstk1004.h @@ -79,17 +79,7 @@ #define CONFIG_BOOTCOMMAND \ "mmc rescan; ext2load mmc 0:1 0x10200000 /boot/uImage; bootm" -/* - * Only interrupt autoboot if is pressed. Otherwise, garbage - * data on the serial line may interrupt the boot sequence. - */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT \ - "Press SPACE to abort autoboot in %d seconds\n", bootdelay -#define CONFIG_AUTOBOOT_DELAY_STR "d" -#define CONFIG_AUTOBOOT_STOP_STR " " /* * Command line configuration. diff --git a/include/configs/atstk1006.h b/include/configs/atstk1006.h index 25090a68fa..cbf17dbd5f 100644 --- a/include/configs/atstk1006.h +++ b/include/configs/atstk1006.h @@ -80,17 +80,7 @@ #define CONFIG_BOOTCOMMAND \ "fsload; bootm $(fileaddr)" -/* - * Only interrupt autoboot if is pressed. Otherwise, garbage - * data on the serial line may interrupt the boot sequence. - */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT \ - "Press SPACE to abort autoboot in %d seconds\n", bootdelay -#define CONFIG_AUTOBOOT_DELAY_STR "d" -#define CONFIG_AUTOBOOT_STOP_STR " " /* * After booting the board for the first time, new ethernet addresses diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h index 84ef4ed4c2..b5e59ffe04 100644 --- a/include/configs/bf537-stamp.h +++ b/include/configs/bf537-stamp.h @@ -269,10 +269,6 @@ /* These are for board tests */ #if 0 #define CONFIG_BOOTCOMMAND "bootldr 0x203f0100" -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT \ - "autoboot in %d seconds: press space to stop\n", bootdelay -#define CONFIG_AUTOBOOT_STOP_STR " " #endif diff --git a/include/configs/calimain.h b/include/configs/calimain.h index 5169b41b4f..8353fc95dd 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -221,8 +221,6 @@ #define CONFIG_BOOTDELAY 0 #define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ #define CONFIG_BOOT_RETRY_TIME 60 /* continue boot after 60 s inactivity */ -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_DELAY_STR "\x0d" /* press ENTER to interrupt BOOT */ #define CONFIG_RESET_TO_RETRY /* diff --git a/include/configs/cpuat91.h b/include/configs/cpuat91.h index 8c7d97a18e..77d3ab878c 100644 --- a/include/configs/cpuat91.h +++ b/include/configs/cpuat91.h @@ -195,12 +195,6 @@ #define CONFIG_DEVICE_NULLDEV #define CONFIG_SILENT_CONSOLE -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT \ - "Press SPACE to abort autoboot\n" -#define CONFIG_AUTOBOOT_STOP_STR " " -#define CONFIG_AUTOBOOT_DELAY_STR "d" - #define CONFIG_VERSION_VARIABLE #define MTDIDS_DEFAULT "nor0=physmap-flash.0" diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h index 76ec168c20..06da3c3e76 100644 --- a/include/configs/digsy_mtc.h +++ b/include/configs/digsy_mtc.h @@ -396,10 +396,6 @@ #define CONFIG_CMDLINE_EDITING 1 #define CONFIG_SYS_HUSH_PARSER -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT "autoboot in %d seconds\n", bootdelay -#define CONFIG_AUTOBOOT_DELAY_STR " " - #define CONFIG_LOOPW 1 #define CONFIG_MX_CYCLIC 1 #define CONFIG_ZERO_BOOTDELAY_CHECK diff --git a/include/configs/dlvision-10g.h b/include/configs/dlvision-10g.h index d9bd564880..0f67595903 100644 --- a/include/configs/dlvision-10g.h +++ b/include/configs/dlvision-10g.h @@ -29,8 +29,6 @@ #define CONFIG_SYS_CLK_FREQ 33333333 /* external frequency to pll */ #undef CONFIG_ZERO_BOOTDELAY_CHECK /* ignore keypress on bootdelay==0 */ -#define CONFIG_AUTOBOOT_KEYED /* use key strings to stop autoboot */ -#define CONFIG_AUTOBOOT_STOP_STR " " /* * Configure PLL diff --git a/include/configs/favr-32-ezkit.h b/include/configs/favr-32-ezkit.h index 75bff4ce28..04f4124de8 100644 --- a/include/configs/favr-32-ezkit.h +++ b/include/configs/favr-32-ezkit.h @@ -80,17 +80,7 @@ #define CONFIG_BOOTCOMMAND \ "fsload; bootm $(fileaddr)" -/* - * Only interrupt autoboot if is pressed. Otherwise, garbage - * data on the serial line may interrupt the boot sequence. - */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT \ - "Press SPACE to abort autoboot in %d seconds\n", bootdelay -#define CONFIG_AUTOBOOT_DELAY_STR "d" -#define CONFIG_AUTOBOOT_STOP_STR " " /* * After booting the board for the first time, new ethernet addresses diff --git a/include/configs/gdppc440etx.h b/include/configs/gdppc440etx.h index 12fd75d743..bfaba42643 100644 --- a/include/configs/gdppc440etx.h +++ b/include/configs/gdppc440etx.h @@ -35,8 +35,6 @@ #define CONFIG_SYS_GENERIC_BOARD #undef CONFIG_ZERO_BOOTDELAY_CHECK /* ignore keypress on bootdelay==0 */ -#define CONFIG_AUTOBOOT_KEYED /* use key strings to stop autoboot */ -#define CONFIG_AUTOBOOT_STOP_STR " " /* * Base addresses -- Note these are effective addresses where the diff --git a/include/configs/grasshopper.h b/include/configs/grasshopper.h index 54eb9777d7..99d23892b7 100644 --- a/include/configs/grasshopper.h +++ b/include/configs/grasshopper.h @@ -75,17 +75,7 @@ #define CONFIG_BAUDRATE 115200 -/* - * Only interrupt autoboot if is pressed. Otherwise, garbage - * data on the serial line may interrupt the boot sequence. - */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT "Press SPACE to abort autoboot in %d" \ - " seconds\n", bootdelay -#define CONFIG_AUTOBOOT_DELAY_STR "d" -#define CONFIG_AUTOBOOT_STOP_STR " " /* * After booting the board for the first time, new ethernet addresses diff --git a/include/configs/hammerhead.h b/include/configs/hammerhead.h index 0bc42f12e0..274f2a81b8 100644 --- a/include/configs/hammerhead.h +++ b/include/configs/hammerhead.h @@ -60,17 +60,7 @@ #define CONFIG_BOOTCOMMAND \ "fsload; bootm" -/* - * Only interrupt autoboot if is pressed. Otherwise, garbage - * data on the serial line may interrupt the boot sequence. - */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT \ - "Press SPACE to abort autoboot in %d seconds\n", bootdelay -#define CONFIG_AUTOBOOT_DELAY_STR "d" -#define CONFIG_AUTOBOOT_STOP_STR " " /* * After booting the board for the first time, new ethernet address diff --git a/include/configs/highbank.h b/include/configs/highbank.h index da1c837cc7..08dcdf8986 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -63,9 +63,7 @@ #define CONFIG_BOOT_RETRY_TIME -1 #define CONFIG_RESET_TO_RETRY -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds...\nPress to stop or to delay\n", bootdelay -#define CONFIG_AUTOBOOT_KEYED_CTRLC + /* * Miscellaneous configurable options */ diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index 2916987cf2..bea19853c9 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -490,8 +490,6 @@ int fpga_gpio_get(unsigned int bus, int pin); #define CONFIG_SYS_HZ 1000 /* decrementer freq: 1ms ticks */ #undef CONFIG_ZERO_BOOTDELAY_CHECK /* ignore keypress on bootdelay==0 */ -#define CONFIG_AUTOBOOT_KEYED /* use key strings to stop autoboot */ -#define CONFIG_AUTOBOOT_STOP_STR " " #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 8b4278dfd3..10f840db32 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -25,10 +25,6 @@ #define CONFIG_MISC_INIT_R -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT \ - "\nEnter password - autoboot in %d seconds...\n", CONFIG_BOOTDELAY -#define CONFIG_AUTOBOOT_DELAY_STR "ids" #define CONFIG_BOOT_RETRY_TIME 900 #define CONFIG_BOOT_RETRY_MIN 30 #define CONFIG_BOOTDELAY 1 diff --git a/include/configs/intip.h b/include/configs/intip.h index 928eb5b9db..18d314006f 100644 --- a/include/configs/intip.h +++ b/include/configs/intip.h @@ -51,8 +51,6 @@ #define CFG_ALT_MEMTEST #undef CONFIG_ZERO_BOOTDELAY_CHECK /* ignore keypress on bootdelay==0 */ -#define CONFIG_AUTOBOOT_KEYED /* use key strings to stop autoboot */ -#define CONFIG_AUTOBOOT_STOP_STR " " /* * Base addresses -- Note these are effective addresses where the diff --git a/include/configs/io.h b/include/configs/io.h index d4ae0adfda..810193343f 100644 --- a/include/configs/io.h +++ b/include/configs/io.h @@ -35,8 +35,6 @@ #define PLLMR1_DEFAULT PLLMR1_266_133_66 #undef CONFIG_ZERO_BOOTDELAY_CHECK /* ignore keypress on bootdelay==0 */ -#define CONFIG_AUTOBOOT_KEYED /* use key strings to stop autoboot */ -#define CONFIG_AUTOBOOT_STOP_STR " " /* new uImage format support */ #define CONFIG_FIT diff --git a/include/configs/io64.h b/include/configs/io64.h index 2a9ff376ef..94ccb6bab7 100644 --- a/include/configs/io64.h +++ b/include/configs/io64.h @@ -46,8 +46,6 @@ #define CONFIG_SYS_GENERIC_BOARD #undef CONFIG_ZERO_BOOTDELAY_CHECK /* ignore keypress on bootdelay==0 */ -#define CONFIG_AUTOBOOT_KEYED /* use key strings to stop autoboot */ -#define CONFIG_AUTOBOOT_STOP_STR " " /* new uImage format support */ #define CONFIG_FIT diff --git a/include/configs/iocon.h b/include/configs/iocon.h index 38d473de42..9d9dabf242 100644 --- a/include/configs/iocon.h +++ b/include/configs/iocon.h @@ -34,8 +34,6 @@ #define PLLMR1_DEFAULT PLLMR1_266_133_66 #undef CONFIG_ZERO_BOOTDELAY_CHECK /* ignore keypress on bootdelay==0 */ -#define CONFIG_AUTOBOOT_KEYED /* use key strings to stop autoboot */ -#define CONFIG_AUTOBOOT_STOP_STR " " /* new uImage format support */ #define CONFIG_FIT diff --git a/include/configs/ip04.h b/include/configs/ip04.h index 73bbcb6b69..a6aed5d65f 100644 --- a/include/configs/ip04.h +++ b/include/configs/ip04.h @@ -136,7 +136,6 @@ /* Enable this if bootretry required; currently it's disabled */ #define CONFIG_BOOT_RETRY_TIME -1 #define CONFIG_BOOTCOMMAND "run nandboot" -#define CONFIG_AUTOBOOT_PROMPT "autoboot in %d seconds\n" /* diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index 96a6b89232..cdd5c79dce 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -72,13 +72,7 @@ * Autobooting */ #define CONFIG_BOOTDELAY 2 /* autoboot after 2 seconds */ -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_STOP_STR "\x1b\x1b" -#define DEBUG_BOOTKEYS 0 -#undef CONFIG_AUTOBOOT_DELAY_STR #undef CONFIG_BOOTARGS -#define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds, " \ - "press \"\" to stop\n", bootdelay #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ #define CONFIG_SYS_HUSH_PARSER 1 /* use "hush" command parser */ diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index d1bb1a182a..ed98425899 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -396,7 +396,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); "echo" #define CONFIG_BOOTDELAY 30 -#define CONFIG_AUTOBOOT_KEYED #define CONFIG_MENU #define CONFIG_MENU_SHOW diff --git a/include/configs/o2dnt-common.h b/include/configs/o2dnt-common.h index 18388d150b..3248429631 100644 --- a/include/configs/o2dnt-common.h +++ b/include/configs/o2dnt-common.h @@ -98,18 +98,6 @@ #error "CONFIG_SYS_TEXT_BASE value is invalid" #endif -/* - * Autobooting - * Be selective on what keys can delay or stop the autoboot process - * To stop use: "++++++++++" - */ -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds, " \ - "press password to stop\n", bootdelay -#define CONFIG_AUTOBOOT_STOP_STR "++++++++++" -#undef CONFIG_AUTOBOOT_DELAY_STR -#define DEBUG_BOOTKEYS 0 - #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ #define CONFIG_PREBOOT "run master" diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h index 10d1f77c9d..e88cdaaca9 100644 --- a/include/configs/omap3_mvblx.h +++ b/include/configs/omap3_mvblx.h @@ -144,8 +144,6 @@ #undef CONFIG_ENV_OVERWRITE /* disallow overwriting serial# and ethaddr */ #define CONFIG_BOOTDELAY 0 #define CONFIG_ZERO_BOOTDELAY_CHECK -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_STOP_STR "S" #define CONFIG_EXTRA_ENV_SETTINGS \ "silent=true\0" \ diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index f6aebf4e4a..9bdbf53fd1 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -339,7 +339,6 @@ #define CONFIG_BOOTCOMMAND "run flashboot" #define CONFIG_ROOTPATH "/ronetix/rootfs" -#define CONFIG_AUTOBOOT_PROMPT "autoboot in %d seconds\n", bootdelay #define CONFIG_CON_ROT "fbcon=rotate:3 " #define CONFIG_BOOTARGS "root=/dev/mtdblock4 rootfstype=jffs2 "\ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index f086e730cd..b005c86c32 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -476,12 +476,6 @@ /* Watchdog */ #define CONFIG_HW_WATCHDOG -/* Stop autoboot with ESC ESC key detected */ -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_STOP_STR "\x1b\x1b" -#define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds, " \ - "press \"\" to stop\n", bootdelay - /* Reboot after 60 sec if bootcmd fails */ #define CONFIG_RESET_TO_RETRY #define CONFIG_BOOT_RETRY_TIME 60 diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h index 30a3f509ae..b386c7ca70 100644 --- a/include/configs/spear-common.h +++ b/include/configs/spear-common.h @@ -200,10 +200,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_MISC_INIT_R #define CONFIG_ZERO_BOOTDELAY_CHECK -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_STOP_STR " " -#define CONFIG_AUTOBOOT_PROMPT \ - "Hit SPACE in %d seconds to stop autoboot.\n", bootdelay #define CONFIG_SYS_MEMTEST_START 0x00800000 #define CONFIG_SYS_MEMTEST_END 0x04000000 diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h index 888d29cd0f..d8f51d8997 100644 --- a/include/configs/stv0991.h +++ b/include/configs/stv0991.h @@ -74,10 +74,7 @@ #define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTCOMMAND "go 0x40040000" -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_STOP_STR " " -#define CONFIG_AUTOBOOT_PROMPT \ - "Hit SPACE in %d seconds to stop autoboot.\n", bootdelay + #define CONFIG_OF_SEPARATE #define CONFIG_OF_CONTROL #define CONFIG_OF_LIBFDT diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 8510472d95..5c7a342d73 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -198,11 +198,6 @@ #define CONFIG_BOOTDELAY 3 #define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ -#define CONFIG_AUTOBOOT_KEYED 1 -#define CONFIG_AUTOBOOT_PROMPT \ - "Press SPACE to abort autoboot in %d seconds\n", bootdelay -#define CONFIG_AUTOBOOT_DELAY_STR "d" -#define CONFIG_AUTOBOOT_STOP_STR " " /* * Network Configuration diff --git a/include/configs/x600.h b/include/configs/x600.h index d235da4ad6..a07482cb27 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -151,10 +151,6 @@ #define CONFIG_LOOPW /* enable loopw command */ #define CONFIG_MX_CYCLIC /* enable mdc/mwc commands */ #define CONFIG_ZERO_BOOTDELAY_CHECK -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_STOP_STR " " -#define CONFIG_AUTOBOOT_PROMPT \ - "Hit SPACE in %d seconds to stop autoboot.\n", bootdelay #define CONFIG_SYS_MEMTEST_START 0x00800000 #define CONFIG_SYS_MEMTEST_END 0x04000000 diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h index d57e665822..004af386ce 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -150,10 +150,6 @@ #define CONFIG_PREBOOT "" #define CONFIG_BOOTDELAY 5 -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT "boot in %d s\n", bootdelay -#define CONFIG_AUTOBOOT_DELAY_STR "delaygs" -#define CONFIG_AUTOBOOT_STOP_STR "stopgs" /* * Size of malloc() pool -- 2.30.2