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>master
parent
2d908fa084
commit
d126e01649
@ -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=" " |
||||
|
@ -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="++++++++++" |
||||
|
@ -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="++++++++++" |
||||
|
@ -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=" " |
||||
|
@ -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=" " |
||||
|
@ -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=" " |
||||
|
@ -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" |
||||
|
@ -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" |
||||
|
@ -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" |
||||
|
@ -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=" " |
||||
|
@ -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=" " |
||||
|
@ -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=" " |
||||
|
@ -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=" " |
||||
|
@ -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=" " |
||||
|
@ -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=" " |
||||
|
@ -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=" " |
||||
|
@ -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=" " |
||||
|
@ -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=" " |
||||
|
@ -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=" " |
||||
|
@ -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=" " |
||||
|
@ -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=" " |
||||
|
@ -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" |
||||
|
@ -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" |
||||
|
@ -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=" " |
||||
|
@ -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=" " |
||||
|
@ -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=" " |
||||
|
@ -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=" " |
||||
|
@ -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 |
||||
|
@ -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=" " |
||||
|
@ -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" |
||||
|
@ -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=" " |
||||
|
@ -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=" " |
||||
|
@ -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=" " |
||||
|
@ -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=" " |
||||
|
@ -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" |
||||
|
@ -1,3 +1,4 @@ |
||||
CONFIG_ARM=y |
||||
CONFIG_OMAP34XX=y |
||||
CONFIG_TARGET_NOKIA_RX51=y |
||||
CONFIG_AUTOBOOT_KEYED=y |
||||
|
@ -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" |
||||
|
@ -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" |
||||
|
@ -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 |
||||
|
@ -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 |
||||
|
@ -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" |
||||
|
Loading…
Reference in new issue