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>

diff --git a/common/Kconfig b/common/Kconfig
index a2167f01f739dcdc3bdd0f1e9b4f7e15d6272796..6b5d166429accfabab724338f3c7a9de57ee0402 100644 (file)
--- 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 7c92f3e54d1331e02efdef7870c02574e7218fc8..f72eb1860c1e9dcae4b36bde9353e26c116b2bfd 100644 (file)
--- 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 1eff08299ea19f7169ab66249632e5b41b7e051c..93ab5b0ac004ec059c6e355b060ecdb1a37f497e 100644 (file)
--- 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 f9d340ab72402fbf10024b7ac0561bc7bff57693..0e47ffed8e71bbe7cdae53f627b19a7df90d90d5 100644 (file)
--- 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 ce952e8b0f7d48f6f76fcbf847bd26df9643beb3..3501761450329952eb6ad140c85b78ccd8d6e871 100644 (file)
--- 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 459b6908d471bd135634fdd27e6979df41058c64..f7da9801f0b5905af7208b85be3536f1f37a7236 100644 (file)
--- 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 e7e157f8ef43bc868c8b1bab1432ca8d0cf82776..aec6b51470af4bbb65564ca520c15801a584d9fe 100644 (file)
--- 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 779087d81700acb98cad561d2ffc490677bf9eb0..44c81b3f66cf950539fb8084503c2071b2581759 100644 (file)
--- 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 d6ea20e52e4892293e75532668ffe03c366bc5ae..18691aa57b1832ac901f9a0b3c0d556b9dc2d37b 100644 (file)
--- 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 50cb7deca145ed3edc1fe5908aa1ce5f4a234e9b..f9f45aea0ea19a365514038545ffcd1c70df1ff5 100644 (file)
--- 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 a91c89b57dff7ddd3dddc29b2f3c7cee5b607d73..c979493f82e285a09bb5257a5f4ea66bfdd289e1 100644 (file)
--- 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 b00ae3a098b04e11553c8c984fd64506373cf1b0..03ce63b9fad628cbfd99672a89218c18baa7f1b0 100644 (file)
--- 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 6caf691d001798c3bf1926b1125dd422bf1939ea..2d1845f98a2171bb5552b3e717d602332982b0fa 100644 (file)
--- 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 e407dc56a1d41888350abf6b65e10caff3e592e6..f74060e482bd1962574f84917f26f29ee0f460b8 100644 (file)
--- 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 b704532dbf236779a4a682a09253561fbb443ffc..bd6c93afbc03c80b8472ad6180dbe8ea653fba95 100644 (file)
--- 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 76502549c1061ef74d6ea4500983399ac4c35fda..4d121602947145ce02fab9acbbbb973677843aee 100644 (file)
--- 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 31482fcee2c8695ed5c7c1b04c1f54423fcab1ea..6d1d045c0d7356ee79bc3b3ba1957f8284731972 100644 (file)
--- 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 a601b0381de990960c118c653871aca27b2091e5..b1c5fa933c0c3019d595d188223a5b679a27e769 100644 (file)
--- 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 7a87f4ae1142ad7ada765a621c70a43e6d8f60ed..676e1a59d210dc288e149b5e067bde6718ca920c 100644 (file)
--- 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 7b92ed68261191b0cecfa8b6e11e2edd79344900..95e88c4f6cb6a1aba96bd1685418cc2f4fe600d3 100644 (file)
--- 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 daaf1dcf4a1b82b39ba6df27d06dfddbb5ef9e25..311ac8e58c5c4c4131d717f102422cda82928e35 100644 (file)
--- 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 c1706d1bd1d94ab966e9b72c373537aba0f803fe..f4f0a6d2b50315699868c39988d4df8d819dc0e9 100644 (file)
--- 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 6a4869dc0364d06e4ccfbe2032ddd1c8814442b6..554f907ef963013827205b141d829347742ad45a 100644 (file)
--- 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 9370fdd30e4776b285a2013f081a09a89b4cd189..83b8ac2adbc5e07150fe5ed90d898e1e234d8c63 100644 (file)
--- 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 b067c8697d95c246482546fd7c0b5bbd95329ec8..3687111c16a8f9030186650b704ab98b58aba9cf 100644 (file)
--- 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 4c514a39efaad613d0c52cbd8dcb0f1cd7fc55b3..80cb44bf531fc0f099287d97b8c3c8720b581c4c 100644 (file)
--- 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 c2a14b794c16a9a798b4d0cd8f5b6942eef82a0c..104103187099f3c6db9e7aa3212e8310a482b467 100644 (file)
--- 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 fabb50c24984177e71e6a392d339567e31d52212..33305309b5e53f2e310dc50b829615456c4dad26 100644 (file)
--- 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 c6c7161c26e03142da6cc7098d4ec34d98b698bc..9fe229e40f95097f4b45063b207bb33b6d396c96 100644 (file)
--- 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 451ce9f12c0a798ab1e90f7215e31e213b2204e1..85b5f4318c490c41a26c6a85e5a1b60576a4323f 100644 (file)
--- 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 1130d92988a64b6dfb5b0194fdec8ad05a76d13c..278c76a4febfb114d583b3426c23b7eaf472eb1f 100644 (file)
--- 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 e1875dbb674a289b63475ff074036c6e09bf431e..ed3b7e4961c32b1b3b3d9a7b0150873e08191c4d 100644 (file)
--- 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 4f2a55dae7af0d67c9e6366f7f7857c5db7f59f5..77072436ce679296b700679541ac5dd101041d86 100644 (file)
--- 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 21977c876b77e9cb86e08a78cae602e985c262b2..cb795fc6e2577098eeeaa6bef6294a03bc3d3a8b 100644 (file)
--- 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 476616cd97e05614a0db8b2012253da8031da9fc..82ed775e18ee356efa376359a3545733c1afed1f 100644 (file)
--- 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 7f1825adabf5b840bdb500d199a634ffa3d35637..3276cc409c0483e2973b6eb0bd4819340974366d 100644 (file)
--- 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 77132323364aa427bc80f24ded086129912767f1..ad3a651daf64c463d13a3d8e0aa66cb00b63a68e 100644 (file)
--- 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 95758cf868e16c582605ddcb6b7eb9ce00e992a3..f966dead7653850a3d842fc541fd54a4c1ef233d 100644 (file)
--- 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 8bc367b7fef2a78d5146d5894d359e1fb823ccee..eaa222eb42585f91afb5edf148103e90b05ab0f6 100644 (file)
--- 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 e03f586880829b5018c6237af72acc5680d7584e..3aff2e6d04c31d1e58420c6bb76bca7c49af4cce 100644 (file)
--- 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 ec4924b82aae0d88990c7fbacab38e0daaf83352..fd3902dfaf7f14d6a1c443b8a145117f7353915a 100644 (file)
--- 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 82ce8c79b7d6f359e1be8189a17ad2354a209518..723989c0fb7d1172f91ea7cd40af370a8a8b995a 100644 (file)
--- 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 671d9cc46df9ee50217785f262b6e804f2729031..a2e2d4f4d75896c1a4ceb6c541c7a20313c232bd 100644 (file)
--- 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 3e763dc5abcbba09f5f1955e5c92d1e622e3934a..dc59dcbaa8fc899a2a695a8ddfeb7c09229efb6e 100644 (file)
--- 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 e65dff597d0b0c40f76a6c1fb98063bdbad24495..10f2fe9067289122f6a00e7e5b23382d64446071 100644 (file)
--- 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 45ed12c745b54be587c36efdfa31d2b4ef48a38b..93ab51494b79afbd40ca9b61c06c788717fd8b2c 100644 (file)
--- 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 2790ffce9e0eed83a605c11979b8238e2a1ec4b7..2d27e7a662458436c41280dbb1887d3680becb76 100644 (file)
--- 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 6c27666ad70f87deef56ed413f3a19f00a9ec930..f8ec5dbaa06cd522037696769edd2a001c39671a 100644 (file)
--- 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 3122a2b27653adeba85f72e9140e2d04e83c6ffc..8e22a184c52b469983c8d425f8b6ad494ced569c 100644 (file)
--- 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 84c789aa205cde3264f1ba250bd97aa3d35fd9ea..259d4a93e55f3df9ee53438b5911c52902f4ca4f 100644 (file)
--- 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 ceddd7accc85540d4fa2d2a5f34df4e6526a4802..c20ecbd06deffabbea56ff9b771127c9144ac61e 100644 (file)
--- 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 a236e117a03bc2209c3967c8f30ef87bf6aeb5e0..80f42768f05a0c7ce7013b8a083c8bdfbb480105 100644 (file)
--- 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 f7d28e39ddc8a230dd465920329056fd5ec135a5..a64c82a27291d44ad27cdbc3ca6f8343bc91b5aa 100644 (file)
--- 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 b8d4dc5eb8c00d930349bb1a52d8a187ee3dbae8..31b90500324f925e38c463a883fbb78c0dca8be9 100644 (file)
--- 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 ec52d6a7684f9f10982cfb2b66163628bf3ad9c0..b9bbe340f34da894b7e42113c1117587b81e5f1d 100644 (file)
--- 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 \"<Esc>\" 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 00589b7e682b222309156da0488dd707e1046ead..b03f163d65ab89c1ec6b5e359096ad62bbba27f3 100644 (file)
--- 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 540e86ae478b76903997ca044341c59aca3b0b5d..1202ec2494a0ad90ea45d6a081335b03a480595f 100644 (file)
--- a/include/configs/atngw100.h
+++ b/include/configs/atngw100.h
@@ -59,17 +59,7 @@
 #define CONFIG_BOOTCOMMAND                                             \
        "fsload; bootm"
 
-/*
- * Only interrupt autoboot if <space> 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 83747336c658063eb8094ba96b7c3b78fec2d3ec..ea1fb588a2e899073d2bd0b68bb190fd1469dd1d 100644 (file)
--- 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 <space> 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 a9c064a45dfbb0e40aa9ca84182a45337f13fbe0..64b55192e5a64d207bb6789f2e7270b56a1d6199 100644 (file)
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -79,17 +79,7 @@
 #define CONFIG_BOOTCOMMAND                                             \
        "fsload; bootm $(fileaddr)"
 
-/*
- * Only interrupt autoboot if <space> 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 b2ad30ec90d23bef36e4d08733ccfe28d4fb5123..4126b66d9d00da163aa020234429e2cb6da93610 100644 (file)
--- 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 <space> 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 19f049a5190e9f0bf2c882dd0de767855066036b..97a1d3ef14813089e7e2a9982388292bf5aebcc1 100644 (file)
--- 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 <space> 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 25090a68fa719fe34b9e7d018d89798f443c03b6..cbf17dbd5f3efdd181f07f1f469487e409cf00d8 100644 (file)
--- a/include/configs/atstk1006.h
+++ b/include/configs/atstk1006.h
@@ -80,17 +80,7 @@
 #define CONFIG_BOOTCOMMAND                                             \
        "fsload; bootm $(fileaddr)"
 
-/*
- * Only interrupt autoboot if <space> 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 84ef4ed4c2878d8b7f07e89bd23511009055203d..b5e59ffe04d91fa5791837cc3522c183394d1c90 100644 (file)
--- 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 5169b41b4f2af6c000cefa696125f6ce06a5ea7f..8353fc95dddbf2d5563caba25492c9e0def69fb9 100644 (file)
--- 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 8c7d97a18e35ce06601029ba6427f24765ec38dc..77d3ab878ccacadce501c3ba355ae552a7b7b900 100644 (file)
--- 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 76ec168c202ee2c0203b6c852fffec731f8e85cc..06da3c3e768992ede6db485b9be021c7dc5d0838 100644 (file)
--- 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 d9bd564880ef3c9f68a593d6ecbfda920e6946a4..0f67595903d14f5bd156476ce0fe423e9f961bb9 100644 (file)
--- 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 75bff4ce288af391f6590be8c323dfc71c186996..04f4124de8559c3d7ed89b29b8b07fb71045fd7f 100644 (file)
--- 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 <space> 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 12fd75d743e8d127ade4a95c25f87da33a350b54..bfaba42643e63da2306ae1bde8f59b361de82033 100644 (file)
--- 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 54eb9777d778e7d85695154547248a1a920779f6..99d23892b7ba7e60942b98724f3d0491a2c6627a 100644 (file)
--- a/include/configs/grasshopper.h
+++ b/include/configs/grasshopper.h
@@ -75,17 +75,7 @@
 
 #define CONFIG_BAUDRATE                        115200
 
-/*
- * Only interrupt autoboot if <space> 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 0bc42f12e0ada1c63bc7256fb8fd70cb80a86657..274f2a81b8b89df5259f30120ea025fe590d0a28 100644 (file)
--- a/include/configs/hammerhead.h
+++ b/include/configs/hammerhead.h
@@ -60,17 +60,7 @@
 #define CONFIG_BOOTCOMMAND                                             \
        "fsload; bootm"
 
-/*
- * Only interrupt autoboot if <space> 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 da1c837cc7a6efdd28b1f75355b2c6697ac95de9..08dcdf8986393cfb98854bce335228e78419bb0a 100644 (file)
--- 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 <s> to stop or <d> 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 2916987cf2a51fa74014e8bdfee03fc4522f2e42..bea19853c98b2955dcc9a084d61cba09aa6195de 100644 (file)
--- 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 8b4278dfd36bb04aef379d4ef2d8f4e558705d8e..10f840db32fa39a8ba46b0e8c278afcd5a4f5c94 100644 (file)
--- 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 928eb5b9dbd06c2a0ddd678fd9c1edf35fb2696c..18d314006fbd5c380dd199c77c235185a54224c6 100644 (file)
--- 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 d4ae0adfdac97ece64da3f6780f7db5443c5ea24..810193343f56681bb5ff00c29fbd30ce31cdec79 100644 (file)
--- 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 2a9ff376ef16bf883f1adfeba96a067b93bb61a8..94ccb6bab706aeae8ce0592c8d7997cfa35deaf0 100644 (file)
--- 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 38d473de4298503ba5fe53d7a36a5ffefaa2b618..9d9dabf24246553198b10ea336a1f89d75df82b5 100644 (file)
--- 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 73bbcb6b69cf5921cecb2603d2fae5faeba899bb..a6aed5d65f21cbcc2f80d992c03b3bcb15b4e977 100644 (file)
--- 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 96a6b892323c220b99bb1a390df541ad1165c230..cdd5c79dce620a3d60dc5b018f14588fc2e3617c 100644 (file)
--- 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 \"<Esc><Esc>\" 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 d1bb1a182a1948d48b0840320a1943106ef7a066..ed9842589939efc67d279748c49933f4ca01bf4e 100644 (file)
--- 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 18388d150b65ee51a94c47d996abcc0ed110fa8a..3248429631629b529c75b2cf3eaee05d3900997d 100644 (file)
--- 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 10d1f77c9dff49bb05fd67b1eba468a11e6673d7..e88cdaaca933ba49935a0379cb8087616dbd941c 100644 (file)
--- 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 f6aebf4e4a7a4c1e17cc304663dd03a022cd2c76..9bdbf53fd1708874a67e563d50c594d518cc0b6b 100644 (file)
--- 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 f086e730cd50a5ea2b9712040aebc0bcdd24a0c7..b005c86c32bfab5cf77aca47589ebb45263046e6 100644 (file)
--- 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 \"<Esc><Esc>\" 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 30a3f509aef66b6d899e24dfa624c3815e0ab2a9..b386c7ca706a73fbfb021189ac95a3f6a587d1e4 100644 (file)
--- 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 888d29cd0f1fbf6171d45857bcd7893cab4408de..d8f51d8997afdfe3494d4f5a9970453f10373b2a 100644 (file)
--- 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 8510472d95e74a6d7dbed7fbda031b67f301945e..5c7a342d73d65ee494aa267dbbc154338385c1a4 100644 (file)
--- 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 d235da4ad69bf7711fce2675cc3a75159311872b..a07482cb278536c4f3aad56769c92001af3d8e26 100644 (file)
--- 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 d57e665822635a5ae45ad9011777ac3d67674aaf..004af386ce162b6b4c7ede42cce1b00cdd33c5df 100644 (file)
--- 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