Commit d126e016 authored by Stefan Roese's avatar Stefan Roese Committed by Tom Rini

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: default avatarStefan Roese <sr@denx.de>
Reviewed-by: default avatarSimon 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: default avatarTom Rini <trini@konsulko.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
parent 2d908fa0
...@@ -17,6 +17,70 @@ config SYS_HUSH_PARSER ...@@ -17,6 +17,70 @@ config SYS_HUSH_PARSER
help help
Backward compatibility. 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" comment "Commands"
menu "Info commands" menu "Info commands"
......
...@@ -56,7 +56,11 @@ static int abortboot_keyed(int bootdelay) ...@@ -56,7 +56,11 @@ static int abortboot_keyed(int bootdelay)
#endif #endif
# ifdef CONFIG_AUTOBOOT_PROMPT # 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 # endif
# ifdef CONFIG_AUTOBOOT_DELAY_STR # ifdef CONFIG_AUTOBOOT_DELAY_STR
......
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_CMD_NET=y
CONFIG_4xx=y CONFIG_4xx=y
CONFIG_TARGET_CPCI4052=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=" "
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_CMD_NET=y
CONFIG_MPC5xxx=y CONFIG_MPC5xxx=y
CONFIG_TARGET_O2DNT2=y CONFIG_TARGET_O2DNT2=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00100000" 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="++++++++++"
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_CMD_NET=y
CONFIG_MPC5xxx=y CONFIG_MPC5xxx=y
CONFIG_TARGET_O2DNT2=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="++++++++++"
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_CMD_NET=y
CONFIG_4xx=y CONFIG_4xx=y
CONFIG_TARGET_PLU405=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=" "
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_CMD_NET=y
CONFIG_4xx=y CONFIG_4xx=y
CONFIG_TARGET_PMC405DE=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=" "
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_CMD_NET=y
CONFIG_4xx=y CONFIG_4xx=y
CONFIG_TARGET_PMC440=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=" "
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_MPC85xx=y CONFIG_MPC85xx=y
CONFIG_TARGET_UCP1020=y CONFIG_TARGET_UCP1020=y
CONFIG_TARGET_UCP1020_SPIFLASH=y CONFIG_TARGET_UCP1020_SPIFLASH=y
CONFIG_CMD_SETEXPR=y CONFIG_AUTOBOOT_KEYED=y
CONFIG_CMD_NET=y CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc>\" to stop\n"
CONFIG_AUTOBOOT_STOP_STR="\x1b"
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_UCP1020=y
CONFIG_CMD_SETEXPR=y CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=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"
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_CMD_NET=y
CONFIG_MPC5xxx=y CONFIG_MPC5xxx=y
CONFIG_TARGET_A4M072=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"
CONFIG_AVR32=y CONFIG_AVR32=y
CONFIG_TARGET_ATNGW100=y
CONFIG_CMD_NET=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=" "
CONFIG_AVR32=y CONFIG_AVR32=y
CONFIG_TARGET_ATNGW100MKII=y
CONFIG_CMD_NET=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=" "
CONFIG_AVR32=y CONFIG_AVR32=y
CONFIG_TARGET_ATSTK1002=y
CONFIG_CMD_NET=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=" "
CONFIG_AVR32=y CONFIG_AVR32=y
CONFIG_TARGET_ATSTK1003=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=" "
CONFIG_AVR32=y CONFIG_AVR32=y
CONFIG_TARGET_ATSTK1004=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=" "
CONFIG_AVR32=y CONFIG_AVR32=y
CONFIG_TARGET_ATSTK1006=y
CONFIG_CMD_NET=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=" "
...@@ -2,3 +2,5 @@ CONFIG_ARM=y ...@@ -2,3 +2,5 @@ CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_CALIMAIN=y CONFIG_TARGET_CALIMAIN=y
CONFIG_CMD_NET=y CONFIG_CMD_NET=y
CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_STOP_STR="\x0b"
...@@ -2,3 +2,7 @@ CONFIG_ARM=y ...@@ -2,3 +2,7 @@ CONFIG_ARM=y
CONFIG_ARCH_AT91=y CONFIG_ARCH_AT91=y
CONFIG_TARGET_CPUAT91=y CONFIG_TARGET_CPUAT91=y
CONFIG_CMD_NET=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=" "
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_AT91=y CONFIG_ARCH_AT91=y
CONFIG_TARGET_CPUAT91=y CONFIG_TARGET_CPUAT91=y
CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT"
CONFIG_CMD_NET=y 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=" "
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_CMD_NET=y
CONFIG_MPC5xxx=y CONFIG_MPC5xxx=y
CONFIG_TARGET_DIGSY_MTC=y CONFIG_TARGET_DIGSY_MTC=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00100000" 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=" "
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_CMD_NET=y
CONFIG_MPC5xxx=y CONFIG_MPC5xxx=y
CONFIG_TARGET_DIGSY_MTC=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=" "
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_CMD_NET=y
CONFIG_MPC5xxx=y CONFIG_MPC5xxx=y
CONFIG_TARGET_DIGSY_MTC=y CONFIG_TARGET_DIGSY_MTC=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00100000,DIGSY_REV5" 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=" "
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_CMD_NET=y
CONFIG_MPC5xxx=y CONFIG_MPC5xxx=y
CONFIG_TARGET_DIGSY_MTC=y CONFIG_TARGET_DIGSY_MTC=y
CONFIG_SYS_EXTRA_OPTIONS="DIGSY_REV5" 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=" "
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_DLVISION_10G=y
CONFIG_CMD_SETEXPR=y CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y CONFIG_CMD_NET=y
CONFIG_4xx=y
CONFIG_TARGET_DLVISION_10G=y
CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_STOP_STR=" "
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_DRACO=y CONFIG_TARGET_DRACO=y
CONFIG_SPL=y
CONFIG_CMD_NET=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"
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_DXR2=y CONFIG_TARGET_DXR2=y
CONFIG_SPL=y
CONFIG_CMD_NET=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"
CONFIG_AVR32=y CONFIG_AVR32=y
CONFIG_TARGET_FAVR_32_EZKIT=y
CONFIG_CMD_NET=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=" "
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_GDPPC440ETX=y
CONFIG_CMD_SETEXPR=y CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y CONFIG_CMD_NET=y
CONFIG_4xx=y
CONFIG_TARGET_GDPPC440ETX=y
CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_STOP_STR=" "
CONFIG_AVR32=y CONFIG_AVR32=y
CONFIG_TARGET_GRASSHOPPER=y
CONFIG_CMD_NET=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=" "
CONFIG_AVR32=y CONFIG_AVR32=y
CONFIG_TARGET_HAMMERHEAD=y
CONFIG_CMD_NET=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=" "
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_HIGHBANK=y CONFIG_ARCH_HIGHBANK=y
CONFIG_CMD_NET=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
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_CMD_NET=y
CONFIG_MPC83xx=y CONFIG_MPC83xx=y
CONFIG_TARGET_HRCON=y CONFIG_TARGET_HRCON=y
CONFIG_CMD_NET=y CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_STOP_STR=" "
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_CMD_NET=y
CONFIG_MPC83xx=y CONFIG_MPC83xx=y
CONFIG_TARGET_IDS8313=y CONFIG_TARGET_IDS8313=y
CONFIG_FIT=y CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y CONFIG_FIT_SIGNATURE=y
CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFFF00000" 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"
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_4xx=y CONFIG_4xx=y
CONFIG_TARGET_INTIP=y CONFIG_TARGET_INTIP=y
CONFIG_SYS_EXTRA_OPTIONS="INTIB" CONFIG_SYS_EXTRA_OPTIONS="INTIB"
CONFIG_CMD_SETEXPR=y CONFIG_AUTOBOOT_KEYED=y
CONFIG_CMD_NET=y CONFIG_AUTOBOOT_STOP_STR=" "
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_IO64=y
CONFIG_CMD_SETEXPR=y CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y CONFIG_CMD_NET=y
CONFIG_4xx=y
CONFIG_TARGET_IO64=y
CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_STOP_STR=" "
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_IO=y
CONFIG_CMD_SETEXPR=y CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y CONFIG_CMD_NET=y
CONFIG_4xx=y
CONFIG_TARGET_IO=y
CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_STOP_STR=" "
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_4xx=y
CONFIG_TARGET_IOCON=y
CONFIG_CMD_SETEXPR=y CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y CONFIG_CMD_NET=y
CONFIG_4xx=y
CONFIG_TARGET_IOCON=y
CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_STOP_STR=" "
CONFIG_PPC=y CONFIG_PPC=y
CONFIG_CMD_NET=y
CONFIG_MPC5xxx=y CONFIG_MPC5xxx=y
CONFIG_TARGET_MOTIONPRO=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"
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_OMAP34XX=y CONFIG_OMAP34XX=y
CONFIG_TARGET_NOKIA_RX51=y CONFIG_TARGET_NOKIA_RX51=y
CONFIG_AUTOBOOT_KEYED=y
...@@ -2,3 +2,5 @@ CONFIG_ARM=y ...@@ -2,3 +2,5 @@ CONFIG_ARM=y
CONFIG_OMAP34XX=y CONFIG_OMAP34XX=y
CONFIG_TARGET_OMAP3_MVBLX=y CONFIG_TARGET_OMAP3_MVBLX=y
CONFIG_CMD_NET=y CONFIG_CMD_NET=y
CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_STOP_STR="S"
...@@ -9,6 +9,10 @@ CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-ld4-ref" ...@@ -9,6 +9,10 @@ CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-ld4-ref"
CONFIG_FIT=y CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_HUSH_PARSER=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_BDI=y
CONFIG_CMD_CONSOLE=y CONFIG_CMD_CONSOLE=y
CONFIG_CMD_BOOTD=y CONFIG_CMD_BOOTD=y
......
...@@ -8,6 +8,10 @@ CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-pro4-ref" ...@@ -8,6 +8,10 @@ CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-pro4-ref"
CONFIG_FIT=y CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_HUSH_PARSER=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_BDI=y
CONFIG_CMD_CONSOLE=y CONFIG_CMD_CONSOLE=y
CONFIG_CMD_BOOTD=y CONFIG_CMD_BOOTD=y
......
...@@ -9,6 +9,10 @@ CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-sld8-ref" ...@@ -9,6 +9,10 @@ CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-sld8-ref"
CONFIG_FIT=y CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y CONFIG_FIT_VERBOSE=y
CONFIG_HUSH_PARSER=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_BDI=y
CONFIG_CMD_CONSOLE=y CONFIG_CMD_CONSOLE=y
CONFIG_CMD_BOOTD=y CONFIG_CMD_BOOTD=y
......
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_PXM2=y CONFIG_TARGET_PXM2=y
CONFIG_SPL=y
CONFIG_CMD_NET=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"
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_RUT=y CONFIG_TARGET_RUT=y
CONFIG_SPL=y
CONFIG_CMD_NET=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"
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_SPEAR600=y CONFIG_TARGET_SPEAR600=y
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_SYS_EXTRA_OPTIONS="spear600"
CONFIG_CMD_NET=y 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 CONFIG_ETH_DESIGNWARE=y
...@@ -2,7 +2,10 @@ CONFIG_ARM=y ...@@ -2,7 +2,10 @@ CONFIG_ARM=y
CONFIG_TARGET_STV0991=y CONFIG_TARGET_STV0991=y
CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_CMD_NET=y
CONFIG_DEFAULT_DEVICE_TREE="stv0991" CONFIG_DEFAULT_DEVICE_TREE="stv0991"
CONFIG_SYS_EXTRA_OPTIONS="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 CONFIG_ETH_DESIGNWARE=y
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_X600=y CONFIG_TARGET_X600=y
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_SPL=y
CONFIG_CMD_NET=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 CONFIG_ETH_DESIGNWARE=y
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_ZMX25=y CONFIG_TARGET_ZMX25=y
CONFIG_CMD_NET=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"
...@@ -141,12 +141,6 @@ ...@@ -141,12 +141,6 @@
#define CONFIG_VERSION_VARIABLE 1 /* include version env variable */ #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 */ #define CONFIG_SYS_RX_ETH_BUFFER 16 /* use 16 rx buffer on 405 emac */
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
......
...@@ -138,15 +138,6 @@ ...@@ -138,15 +138,6 @@
#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ #define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */
#define CONFIG_BOOTDELAY 3 /* autoboot after 3 seconds */ #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_VERSION_VARIABLE 1 /* include version env variable */
#define CONFIG_SYS_RX_ETH_BUFFER 16 /* use 16 rx buffer on 405 emac */ #define CONFIG_SYS_RX_ETH_BUFFER 16 /* use 16 rx buffer on 405 emac */
......
...@@ -110,12 +110,6 @@ ...@@ -110,12 +110,6 @@
#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ #define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */
#define CONFIG_VERSION_VARIABLE 1 /* include version env variable */ #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 * PCI stuff
*/ */
......
...@@ -331,12 +331,6 @@ ...@@ -331,12 +331,6 @@
#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ #define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */
#define CONFIG_VERSION_VARIABLE 1 /* include version env variable */ #define CONFIG_VERSION_VARIABLE 1 /* include version env variable */