diff options
Diffstat (limited to 'include')
40 files changed, 2 insertions, 219 deletions
diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index ceddd7a..c20ecbd 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 a236e11..80f4276 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 f7d28e3..a64c82a 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 b8d4dc5..31b9050 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 ec52d6a..b9bbe34 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 \"<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 00589b7..b03f163 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 540e86a..1202ec2 100644 --- 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 8374733..ea1fb58 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 <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 a9c064a..64b5519 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 <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 b2ad30e..4126b66 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 <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 19f049a..97a1d3e 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 <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 25090a6..cbf17db 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 <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 84ef4ed..b5e59ff 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 5169b41..8353fc9 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 8c7d97a..77d3ab8 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 76ec168..06da3c3 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 d9bd564..0f67595 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 75bff4c..04f4124 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 <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 12fd75d..bfaba42 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 54eb977..99d2389 100644 --- 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 0bc42f1..274f2a8 100644 --- 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 da1c837..08dcdf8 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 <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 2916987..bea1985 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 8b4278d..10f840d 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 928eb5b..18d3140 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 d4ae0ad..8101933 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 2a9ff37..94ccb6b 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 38d473d..9d9dabf 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 73bbcb6..a6aed5d 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 96a6b89..cdd5c79 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 \"<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 d1bb1a1..ed98425 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 18388d1..3248429 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 10d1f77..e88cdaa 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 f6aebf4..9bdbf53 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 f086e73..b005c86 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 \"<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 30a3f50..b386c7c 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 888d29c..d8f51d8 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 8510472..5c7a342 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 d235da4..a07482c 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 d57e665..004af38 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 |