summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorHeiko Schocher <hs@denx.de>2016-06-07 08:31:14 +0200
committerTom Rini <trini@konsulko.com>2016-06-09 13:53:05 -0400
commitbb597c0eeb7ee2f6e983577d993c76a30dd3c2b4 (patch)
tree7f5c1ebb627cae3a7d7013eaeb68b1fa73e39d82 /include/configs
parent3191d8408053674c1b9bb79a82e3973add48830c (diff)
common: bootdelay: move CONFIG_BOOTDELAY into a Kconfig option
move CONFIG_BOOTDELAY into a Kconfig option. Used for this purpose the moveconfig.py tool in tools. Signed-off-by: Heiko Schocher <hs@denx.de> Reviewed-by: Tom Rini <trini@konsulko.com> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/B4860QDS.h1
-rw-r--r--include/configs/BSC9131RDB.h1
-rw-r--r--include/configs/BSC9132QDS.h1
-rw-r--r--include/configs/C29XPCIE.h1
-rw-r--r--include/configs/CPCI2DP.h1
-rw-r--r--include/configs/CPCI4052.h1
-rw-r--r--include/configs/M5208EVBE.h1
-rw-r--r--include/configs/M52277EVB.h1
-rw-r--r--include/configs/M5235EVB.h1
-rw-r--r--include/configs/M5253DEMO.h1
-rw-r--r--include/configs/M5253EVBE.h1
-rw-r--r--include/configs/M5272C3.h1
-rw-r--r--include/configs/M5275EVB.h1
-rw-r--r--include/configs/M5282EVB.h1
-rw-r--r--include/configs/M53017EVB.h1
-rw-r--r--include/configs/M5329EVB.h1
-rw-r--r--include/configs/M5373EVB.h1
-rw-r--r--include/configs/M54418TWR.h1
-rw-r--r--include/configs/M54451EVB.h1
-rw-r--r--include/configs/M54455EVB.h1
-rw-r--r--include/configs/M5475EVB.h1
-rw-r--r--include/configs/M5485EVB.h1
-rw-r--r--include/configs/MIP405.h1
-rw-r--r--include/configs/MPC8308RDB.h1
-rw-r--r--include/configs/MPC8313ERDB.h1
-rw-r--r--include/configs/MPC8315ERDB.h1
-rw-r--r--include/configs/MPC8323ERDB.h1
-rw-r--r--include/configs/MPC832XEMDS.h1
-rw-r--r--include/configs/MPC8349EMDS.h1
-rw-r--r--include/configs/MPC8349ITX.h1
-rw-r--r--include/configs/MPC837XEMDS.h1
-rw-r--r--include/configs/MPC837XERDB.h1
-rw-r--r--include/configs/MPC8536DS.h1
-rw-r--r--include/configs/MPC8540ADS.h1
-rw-r--r--include/configs/MPC8541CDS.h1
-rw-r--r--include/configs/MPC8544DS.h1
-rw-r--r--include/configs/MPC8548CDS.h1
-rw-r--r--include/configs/MPC8555CDS.h1
-rw-r--r--include/configs/MPC8560ADS.h1
-rw-r--r--include/configs/MPC8568MDS.h1
-rw-r--r--include/configs/MPC8569MDS.h1
-rw-r--r--include/configs/MPC8572DS.h1
-rw-r--r--include/configs/MPC8610HPCD.h1
-rw-r--r--include/configs/MPC8641HPCN.h1
-rw-r--r--include/configs/MigoR.h1
-rw-r--r--include/configs/P1010RDB.h1
-rw-r--r--include/configs/P1022DS.h1
-rw-r--r--include/configs/P1023RDB.h1
-rw-r--r--include/configs/P2041RDB.h1
-rw-r--r--include/configs/PATI.h5
-rw-r--r--include/configs/PIP405.h1
-rw-r--r--include/configs/PLU405.h1
-rw-r--r--include/configs/PMC405DE.h1
-rw-r--r--include/configs/PMC440.h1
-rw-r--r--include/configs/T102xQDS.h1
-rw-r--r--include/configs/T102xRDB.h1
-rw-r--r--include/configs/T1040QDS.h1
-rw-r--r--include/configs/T104xRDB.h1
-rw-r--r--include/configs/T208xQDS.h1
-rw-r--r--include/configs/T208xRDB.h1
-rw-r--r--include/configs/T4240QDS.h1
-rw-r--r--include/configs/T4240RDB.h1
-rw-r--r--include/configs/TQM5200.h1
-rw-r--r--include/configs/TQM823L.h1
-rw-r--r--include/configs/TQM823M.h1
-rw-r--r--include/configs/TQM834x.h1
-rw-r--r--include/configs/TQM850L.h1
-rw-r--r--include/configs/TQM850M.h1
-rw-r--r--include/configs/TQM855L.h1
-rw-r--r--include/configs/TQM855M.h1
-rw-r--r--include/configs/TQM860L.h1
-rw-r--r--include/configs/TQM860M.h1
-rw-r--r--include/configs/TQM862L.h1
-rw-r--r--include/configs/TQM862M.h1
-rw-r--r--include/configs/TQM866M.h1
-rw-r--r--include/configs/TQM885D.h1
-rw-r--r--include/configs/UCP1020.h3
-rw-r--r--include/configs/VCMA9.h1
-rw-r--r--include/configs/VOM405.h1
-rw-r--r--include/configs/a3m071.h1
-rw-r--r--include/configs/a4m072.h1
-rw-r--r--include/configs/ac14xx.h1
-rw-r--r--include/configs/adp-ag101p.h1
-rw-r--r--include/configs/am335x_sl50.h1
-rw-r--r--include/configs/am3517_crane.h1
-rw-r--r--include/configs/am3517_evm.h1
-rw-r--r--include/configs/amcc-common.h1
-rw-r--r--include/configs/amcore.h1
-rw-r--r--include/configs/ap121.h1
-rw-r--r--include/configs/ap143.h1
-rw-r--r--include/configs/ap325rxa.h1
-rw-r--r--include/configs/ap_sh4a_4a.h1
-rw-r--r--include/configs/apf27.h1
-rw-r--r--include/configs/apx4devkit.h1
-rw-r--r--include/configs/arcangel4.h1
-rw-r--r--include/configs/aria.h1
-rw-r--r--include/configs/armadillo-800eva.h1
-rw-r--r--include/configs/astro_mcf5373l.h13
-rw-r--r--include/configs/at91-sama5_common.h1
-rw-r--r--include/configs/at91rm9200ek.h1
-rw-r--r--include/configs/at91sam9260ek.h1
-rw-r--r--include/configs/at91sam9261ek.h1
-rw-r--r--include/configs/at91sam9263ek.h1
-rw-r--r--include/configs/at91sam9m10g45ek.h1
-rw-r--r--include/configs/at91sam9n12ek.h1
-rw-r--r--include/configs/at91sam9rlek.h1
-rw-r--r--include/configs/at91sam9x5ek.h1
-rw-r--r--include/configs/atngw100.h1
-rw-r--r--include/configs/atngw100mkii.h1
-rw-r--r--include/configs/atstk1002.h1
-rw-r--r--include/configs/axs101.h1
-rw-r--r--include/configs/bct-brettl2.h1
-rw-r--r--include/configs/bf525-ucr2.h1
-rw-r--r--include/configs/bf537-minotaur.h6
-rw-r--r--include/configs/bf537-srv1.h9
-rw-r--r--include/configs/bfin_adi_common.h2
-rw-r--r--include/configs/bg0900.h1
-rw-r--r--include/configs/blackstamp.h1
-rw-r--r--include/configs/blackvme.h1
-rw-r--r--include/configs/br4.h1
-rw-r--r--include/configs/calimain.h1
-rw-r--r--include/configs/canmb.h1
-rw-r--r--include/configs/cm5200.h1
-rw-r--r--include/configs/cm_t35.h1
-rw-r--r--include/configs/cm_t3517.h1
-rw-r--r--include/configs/cm_t54.h2
-rw-r--r--include/configs/cobra5272.h1
-rw-r--r--include/configs/colibri_pxa270.h1
-rw-r--r--include/configs/colibri_vf.h1
-rw-r--r--include/configs/controlcenterd.h2
-rw-r--r--include/configs/corenet_ds.h1
-rw-r--r--include/configs/corvus.h1
-rw-r--r--include/configs/cyrus.h1
-rw-r--r--include/configs/da850evm.h1
-rw-r--r--include/configs/dbau1x00.h1
-rw-r--r--include/configs/devkit3250.h1
-rw-r--r--include/configs/digsy_mtc.h1
-rw-r--r--include/configs/draco.h2
-rw-r--r--include/configs/ea20.h1
-rw-r--r--include/configs/eb_cpu5282.h1
-rw-r--r--include/configs/eco5pk.h1
-rw-r--r--include/configs/ecovec.h1
-rw-r--r--include/configs/edb93xx.h1
-rw-r--r--include/configs/edminiv2.h1
-rw-r--r--include/configs/espt.h1
-rw-r--r--include/configs/ethernut5.h1
-rw-r--r--include/configs/flea3.h1
-rw-r--r--include/configs/ge_bx50v3.h1
-rw-r--r--include/configs/gr_cpci_ax2000.h1
-rw-r--r--include/configs/gr_ep2s60.h1
-rw-r--r--include/configs/gr_xc3s_1500.h1
-rw-r--r--include/configs/grasshopper.h1
-rw-r--r--include/configs/grsim.h1
-rw-r--r--include/configs/grsim_leon2.h1
-rw-r--r--include/configs/h2200.h1
-rw-r--r--include/configs/hrcon.h1
-rw-r--r--include/configs/ids8313.h1
-rw-r--r--include/configs/imx27lite-common.h1
-rw-r--r--include/configs/imx31_phycore.h1
-rw-r--r--include/configs/inka4x0.h1
-rw-r--r--include/configs/integratorap.h1
-rw-r--r--include/configs/integratorcp.h1
-rw-r--r--include/configs/ipam390.h1
-rw-r--r--include/configs/ipek01.h1
-rw-r--r--include/configs/jupiter.h1
-rw-r--r--include/configs/km/keymile-common.h1
-rw-r--r--include/configs/kwb.h1
-rw-r--r--include/configs/kzm9g.h1
-rw-r--r--include/configs/legoev3.h1
-rw-r--r--include/configs/ls1012a_common.h1
-rw-r--r--include/configs/ls1021aqds.h1
-rw-r--r--include/configs/ls1021atwr.h1
-rw-r--r--include/configs/ls1043a_common.h1
-rw-r--r--include/configs/ls2080a_common.h1
-rw-r--r--include/configs/lwmon5.h1
-rw-r--r--include/configs/m28evk.h1
-rw-r--r--include/configs/m53evk.h1
-rw-r--r--include/configs/ma5d4evk.h1
-rw-r--r--include/configs/manroland/common.h1
-rw-r--r--include/configs/mcx.h1
-rw-r--r--include/configs/mecp5123.h1
-rw-r--r--include/configs/meesc.h1
-rw-r--r--include/configs/microblaze-generic.h1
-rw-r--r--include/configs/motionpro.h1
-rw-r--r--include/configs/mpc5121ads.h1
-rw-r--r--include/configs/mpc8308_p1m.h1
-rw-r--r--include/configs/ms7722se.h1
-rw-r--r--include/configs/ms7750se.h1
-rw-r--r--include/configs/mt_ventoux.h1
-rw-r--r--include/configs/munices.h1
-rw-r--r--include/configs/mv-common.h1
-rw-r--r--include/configs/mx23_olinuxino.h1
-rw-r--r--include/configs/mx23evk.h1
-rw-r--r--include/configs/mx25pdk.h1
-rw-r--r--include/configs/mx28evk.h1
-rw-r--r--include/configs/mx31ads.h1
-rw-r--r--include/configs/mx31pdk.h1
-rw-r--r--include/configs/mx35pdk.h1
-rw-r--r--include/configs/mx51evk.h1
-rw-r--r--include/configs/mx53ard.h1
-rw-r--r--include/configs/mx53evk.h1
-rw-r--r--include/configs/mx53loco.h1
-rw-r--r--include/configs/mx53smd.h1
-rw-r--r--include/configs/mx6_common.h1
-rw-r--r--include/configs/mx7_common.h1
-rw-r--r--include/configs/nokia_rx51.h1
-rw-r--r--include/configs/o2dnt-common.h1
-rw-r--r--include/configs/omap3_cairo.h2
-rw-r--r--include/configs/omap3_evm.h1
-rw-r--r--include/configs/omap3_evm_quick_mmc.h1
-rw-r--r--include/configs/omap3_evm_quick_nand.h1
-rw-r--r--include/configs/omapl138_lcdk.h1
-rw-r--r--include/configs/p1_p2_rdb_pc.h1
-rw-r--r--include/configs/p1_twr.h1
-rw-r--r--include/configs/pb1x00.h1
-rw-r--r--include/configs/pcm030.h1
-rw-r--r--include/configs/pcm052.h1
-rw-r--r--include/configs/pdm360ng.h1
-rw-r--r--include/configs/pic32mzdask.h1
-rw-r--r--include/configs/picosam9g45.h1
-rw-r--r--include/configs/pm9261.h1
-rw-r--r--include/configs/pm9263.h1
-rw-r--r--include/configs/pm9g45.h1
-rw-r--r--include/configs/pr1.h1
-rw-r--r--include/configs/pxm2.h2
-rw-r--r--include/configs/qemu-mips.h1
-rw-r--r--include/configs/qemu-mips64.h1
-rw-r--r--include/configs/qemu-ppce500.h1
-rw-r--r--include/configs/r0p7734.h1
-rw-r--r--include/configs/r2dplus.h1
-rw-r--r--include/configs/r7780mp.h1
-rw-r--r--include/configs/rastaban.h2
-rw-r--r--include/configs/rcar-gen2-common.h1
-rw-r--r--include/configs/redwood.h1
-rw-r--r--include/configs/rpi.h1
-rw-r--r--include/configs/rsk7264.h1
-rw-r--r--include/configs/rsk7269.h1
-rw-r--r--include/configs/rut.h2
-rw-r--r--include/configs/sansa_fuze_plus.h1
-rw-r--r--include/configs/sbc8349.h1
-rw-r--r--include/configs/sbc8548.h1
-rw-r--r--include/configs/sbc8641d.h1
-rw-r--r--include/configs/sc_sps_1.h1
-rw-r--r--include/configs/sh7752evb.h1
-rw-r--r--include/configs/sh7753evb.h1
-rw-r--r--include/configs/sh7757lcr.h1
-rw-r--r--include/configs/sh7763rdp.h1
-rw-r--r--include/configs/sh7785lcr.h1
-rw-r--r--include/configs/smartweb.h1
-rw-r--r--include/configs/smdk2410.h1
-rw-r--r--include/configs/smdkc100.h1
-rw-r--r--include/configs/snapper9260.h1
-rw-r--r--include/configs/socfpga_arria5_socdk.h1
-rw-r--r--include/configs/socfpga_cyclone5_socdk.h1
-rw-r--r--include/configs/socfpga_de0_nano_soc.h1
-rw-r--r--include/configs/socfpga_mcvevk.h1
-rw-r--r--include/configs/socfpga_sockit.h1
-rw-r--r--include/configs/socfpga_socrates.h1
-rw-r--r--include/configs/socfpga_sr1500.h1
-rw-r--r--include/configs/socfpga_vining_fpga.h1
-rw-r--r--include/configs/socrates.h1
-rw-r--r--include/configs/spear-common.h6
-rw-r--r--include/configs/stm32f429-discovery.h1
-rw-r--r--include/configs/stm32f746-disco.h1
-rw-r--r--include/configs/strider.h1
-rw-r--r--include/configs/stv0991.h1
-rw-r--r--include/configs/tao3530.h1
-rw-r--r--include/configs/taurus.h1
-rw-r--r--include/configs/tb100.h1
-rw-r--r--include/configs/thuban.h2
-rw-r--r--include/configs/thunderx_88xx.h1
-rw-r--r--include/configs/ti814x_evm.h1
-rw-r--r--include/configs/ti816x_evm.h1
-rw-r--r--include/configs/tplink_wdr4300.h1
-rw-r--r--include/configs/tricorder.h1
-rw-r--r--include/configs/ts4800.h1
-rw-r--r--include/configs/tseries.h1
-rw-r--r--include/configs/twister.h1
-rw-r--r--include/configs/uniphier.h1
-rw-r--r--include/configs/usb_a9263.h1
-rw-r--r--include/configs/v38b.h1
-rw-r--r--include/configs/vct.h1
-rw-r--r--include/configs/ve8313.h1
-rw-r--r--include/configs/vexpress_aemv8a.h3
-rw-r--r--include/configs/vexpress_common.h1
-rw-r--r--include/configs/vf610twr.h1
-rw-r--r--include/configs/vme8349.h1
-rw-r--r--include/configs/warp7.h1
-rw-r--r--include/configs/woodburn_common.h1
-rw-r--r--include/configs/work_92105.h1
-rw-r--r--include/configs/x600.h1
-rw-r--r--include/configs/x86-common.h1
-rw-r--r--include/configs/xfi3.h1
-rw-r--r--include/configs/xilinx-ppc.h1
-rw-r--r--include/configs/xilinx_zynqmp.h1
-rw-r--r--include/configs/xpedite1000.h1
-rw-r--r--include/configs/xpedite517x.h1
-rw-r--r--include/configs/xpedite520x.h1
-rw-r--r--include/configs/xpedite537x.h1
-rw-r--r--include/configs/xpedite550x.h1
-rw-r--r--include/configs/zipitz2.h1
-rw-r--r--include/configs/zmx25.h1
-rw-r--r--include/configs/zynq-common.h1
303 files changed, 0 insertions, 350 deletions
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index 5249751830..2c3c4ac093 100644
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -802,7 +802,6 @@ unsigned long get_board_ddr_clk(void);
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 1000000
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h
index b092933757..0a9d8a64af 100644
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -394,7 +394,6 @@ extern unsigned long get_sdram_size(void);
#define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server */
#define CONFIG_BAUDRATE 115200
-#define CONFIG_BOOTDELAY 10 /* -1 disable auto-boot */
#define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index aaddfca2cd..756beec61b 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -632,7 +632,6 @@ combinations. this should be removed later
#define CONFIG_UBOOTPATH "u-boot.bin"
#define CONFIG_BAUDRATE 115200
-#define CONFIG_BOOTDELAY 10 /* -1 disable auto-boot */
#ifdef CONFIG_SDCARD
#define CONFIG_DEF_HWCONFIG "hwconfig=usb1:dr_mode=host,phy_type=ulpi\0"
diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h
index 1e5b501ab1..69a9798540 100644
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -517,7 +517,6 @@
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 1000000
-#define CONFIG_BOOTDELAY -1 /* -1 disables auto-boot */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h
index b60da5e166..c5c3a845e4 100644
--- a/include/configs/CPCI2DP.h
+++ b/include/configs/CPCI2DP.h
@@ -27,7 +27,6 @@
#define CONFIG_SYS_CLK_FREQ 33330000 /* external frequency to pll */
#define CONFIG_BAUDRATE 9600
-#define CONFIG_BOOTDELAY 3 /* autoboot after 3 seconds */
#undef CONFIG_BOOTARGS
#undef CONFIG_BOOTCOMMAND
diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h
index b66b3ff7ef..db953b9b4a 100644
--- a/include/configs/CPCI4052.h
+++ b/include/configs/CPCI4052.h
@@ -31,7 +31,6 @@
#define CONFIG_SYS_CLK_FREQ 33330000 /* external frequency to pll */
#define CONFIG_BAUDRATE 9600
-#define CONFIG_BOOTDELAY 3 /* autoboot after 3 seconds */
#undef CONFIG_BOOTARGS
#undef CONFIG_BOOTCOMMAND
diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index 2b2e4e7a5a..b426c18b3b 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -59,7 +59,6 @@
#define CONFIG_SYS_FSL_I2C_OFFSET 0x58000
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
-#define CONFIG_BOOTDELAY 1 /* autoboot after 5 seconds */
#define CONFIG_UDP_CHECKSUM
#ifdef CONFIG_MCFFEC
diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index 85b1c1544e..1e052b1b4b 100644
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -82,7 +82,6 @@
""
#endif
-#define CONFIG_BOOTDELAY 3 /* autoboot after 3 seconds */
/* LCD */
#ifdef CONFIG_CMD_BMP
#define CONFIG_LCD
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index bacd8e0f32..006222881a 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -76,7 +76,6 @@
#define CONFIG_SYS_I2C_PINMUX_SET (GPIO_PAR_FECI2C_SCL_I2CSCL | GPIO_PAR_FECI2C_SDA_I2CSDA)
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#define CONFIG_BOOTDELAY 1 /* autoboot after 5 seconds */
#define CONFIG_BOOTFILE "u-boot.bin"
#ifdef CONFIG_MCFFEC
# define CONFIG_IPADDR 192.162.1.2
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index 7c06fcea39..6c90700ccf 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -17,7 +17,6 @@
#undef CONFIG_WATCHDOG /* disable watchdog */
-#define CONFIG_BOOTDELAY 5
/* Configuration for environment
* Environment is embedded in u-boot in the second sector of the flash
diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h
index d14f979cdd..faad9703b7 100644
--- a/include/configs/M5253EVBE.h
+++ b/include/configs/M5253EVBE.h
@@ -18,7 +18,6 @@
#undef CONFIG_WATCHDOG /* disable watchdog */
-#define CONFIG_BOOTDELAY 5
/* Configuration for environment
* Environment is embedded in u-boot in the second sector of the flash
diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index 0753dc3afa..a8589049fd 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -57,7 +57,6 @@
* Command line configuration.
*/
-#define CONFIG_BOOTDELAY 5
#define CONFIG_MCFFEC
#ifdef CONFIG_MCFFEC
# define CONFIG_MII 1
diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index 1709cccf89..1bdacbcdf8 100644
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -104,7 +104,6 @@
#define CONFIG_SYS_LOAD_ADDR 0x800000
-#define CONFIG_BOOTDELAY 5
#define CONFIG_BOOTCOMMAND "bootm ffe40000"
#define CONFIG_SYS_MEMTEST_START 0x400
#define CONFIG_SYS_MEMTEST_END 0x380000
diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index 8131ea0ee1..62f25e9023 100644
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -70,7 +70,6 @@
# endif /* CONFIG_SYS_DISCOVER_PHY */
#endif
-#define CONFIG_BOOTDELAY 5
#ifdef CONFIG_MCFFEC
# define CONFIG_IPADDR 192.162.1.2
# define CONFIG_NETMASK 255.255.255.0
diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 81e28f0924..03c18da52e 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -79,7 +79,6 @@
#define CONFIG_SYS_FSL_I2C_OFFSET 0x58000
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
-#define CONFIG_BOOTDELAY 1 /* autoboot after 5 seconds */
#define CONFIG_UDP_CHECKSUM
#ifdef CONFIG_MCFFEC
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 661063ce5d..fabbaf084d 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -73,7 +73,6 @@
#define CONFIG_SYS_FSL_I2C_OFFSET 0x58000
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
-#define CONFIG_BOOTDELAY 1 /* autoboot after 5 seconds */
#define CONFIG_UDP_CHECKSUM
#ifdef CONFIG_MCFFEC
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index f0cf715ee2..8fb16bc294 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -73,7 +73,6 @@
#define CONFIG_SYS_FSL_I2C_OFFSET 0x58000
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
-#define CONFIG_BOOTDELAY 1 /* autoboot after 5 seconds */
#define CONFIG_UDP_CHECKSUM
#ifdef CONFIG_MCFFEC
diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index e10c3e1929..63b0a1e0ed 100644
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -75,7 +75,6 @@
#define CONFIG_SYS_FEC0_PHYADDR 0
#define CONFIG_SYS_FEC1_PHYADDR 1
-#define CONFIG_BOOTDELAY 2 /* autoboot after 5 seconds */
#ifdef CONFIG_SYS_NAND_BOOT
#define CONFIG_BOOTARGS "root=/dev/mtdblock2 rw rootfstype=jffs2 " \
diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index 00bdbd1824..599ffc7990 100644
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -56,7 +56,6 @@
# define CONFIG_SYS_FEC0_MIIBASE CONFIG_SYS_FEC0_IOBASE
# define MCFFEC_TOUT_LOOP 50000
-# define CONFIG_BOOTDELAY 1 /* autoboot after 5 seconds */
# define CONFIG_BOOTARGS "root=/dev/mtdblock1 rw rootfstype=jffs2 ip=none mtdparts=physmap-flash.0:2M(kernel)ro,-(jffs2)"
# define CONFIG_ETHPRIME "FEC0"
# define CONFIG_IPADDR 192.162.1.2
diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index f32dd3660a..8301c4670f 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -61,7 +61,6 @@
# define MCFFEC_TOUT_LOOP 50000
# define CONFIG_HAS_ETH1
-# define CONFIG_BOOTDELAY 1 /* autoboot after 5 seconds */
# define CONFIG_BOOTARGS "root=/dev/mtdblock1 rw rootfstype=jffs2 ip=none mtdparts=physmap-flash.0:5M(kernel)ro,-(jffs2)"
# define CONFIG_ETHPRIME "FEC0"
# define CONFIG_IPADDR 192.162.1.2
diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index 5fa9683e2c..ccebc30e16 100644
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -116,7 +116,6 @@
#define CONFIG_SYS_PCI_CFG_SIZE 0x01000000
#endif
-#define CONFIG_BOOTDELAY 1 /* autoboot after 5 seconds */
#define CONFIG_UDP_CHECKSUM
#ifdef CONFIG_MCFFEC
diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index 9a23e22bfa..7e9f978f6b 100644
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -111,7 +111,6 @@
#define CONFIG_SYS_PCI_CFG_SIZE 0x01000000
#endif
-#define CONFIG_BOOTDELAY 1 /* autoboot after 5 seconds */
#define CONFIG_UDP_CHECKSUM
#define CONFIG_HOSTNAME M548xEVB
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index 75a26edb25..79027e214c 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -97,7 +97,6 @@
* Environment definitions
**************************************************************/
#define CONFIG_BAUDRATE 9600 /* STD Baudrate */
-#define CONFIG_BOOTDELAY 5
/* autoboot (do NOT change this set environment variable "bootdelay" to -1 instead) */
/* #define CONFIG_BOOT_RETRY_TIME -10 /XXX* feature is available but not enabled */
#define CONFIG_ZERO_BOOTDELAY_CHECK /* check console even if bootdelay = 0 */
diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h
index e3e3b4414d..578325cd05 100644
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -514,7 +514,6 @@
#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */
-#define CONFIG_BOOTDELAY 5 /* -1 disables auto-boot */
#define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index fda894e119..5613a4a0cd 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -649,7 +649,6 @@
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 800000
-#define CONFIG_BOOTDELAY 6 /* -1 disables auto-boot */
#define CONFIG_BAUDRATE 115200
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index 41b40cb2d1..7ce5f59937 100644
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -602,7 +602,6 @@
#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */
-#define CONFIG_BOOTDELAY 6 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index 5c40e5b3ea..13f954d00e 100644
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -492,7 +492,6 @@
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 800000
-#define CONFIG_BOOTDELAY 6 /* -1 disables auto-boot */
#define CONFIG_BAUDRATE 115200
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 4a1cebb5d6..fd482606ad 100644
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -569,7 +569,6 @@
#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */
-#define CONFIG_BOOTDELAY 6 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 3518b3fd3b..288b126d02 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -734,7 +734,6 @@
#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */
-#define CONFIG_BOOTDELAY 6 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index 8161903f80..2721255254 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -731,7 +731,6 @@ boards, we say we have two, but don't display a message if we find only one. */
#define CONFIG_FDTFILE "mpc8349emitxgp.dtb"
#endif
-#define CONFIG_BOOTDELAY 6
#define CONFIG_BOOTARGS \
"root=/dev/nfs rw" \
diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index 28ed9c03b9..921d5f399d 100644
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -659,7 +659,6 @@ extern int board_pci_host_broken(void);
#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */
-#define CONFIG_BOOTDELAY 6 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index fa131e23fb..bb06e89b4e 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -679,7 +679,6 @@
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 800000
-#define CONFIG_BOOTDELAY 6 /* -1 disables auto-boot */
#define CONFIG_BAUDRATE 115200
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 03f17f9c35..7c19ff84bc 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -706,7 +706,6 @@
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 1000000
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index 38bd38c8f9..fae4b0c5c5 100644
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -392,7 +392,6 @@
#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index d827d2ab0b..0c2afb5065 100644
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -414,7 +414,6 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_LOADADDR 200000 /*default location for tftp and bootm*/
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs*/
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index f3036c1dc2..b9d97c1006 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -441,7 +441,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_LOADADDR 1000000 /*default location for tftp and bootm*/
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs*/
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 5de8b19828..e73be48d51 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -540,7 +540,6 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_LOADADDR 1000000 /*default location for tftp and bootm*/
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs*/
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index c68e1d83d1..fcd55c7743 100644
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -409,7 +409,6 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_LOADADDR 200000 /*default location for tftp and bootm*/
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs*/
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index fb76dd1aea..4ed06c9ad4 100644
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -434,7 +434,6 @@
#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index 09e32ebcd7..39459ded28 100644
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -433,7 +433,6 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_LOADADDR 200000 /*default location for tftp and bootm*/
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs*/
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index 923159b904..192cc2ccf1 100644
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -528,7 +528,6 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_LOADADDR 200000 /*default location for tftp and bootm*/
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs*/
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index bb7f38e34a..2e6989f816 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -646,7 +646,6 @@
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 1000000
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index f6d45a9e40..81594932d7 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -500,7 +500,6 @@
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 1000000
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 9b2623c726..f90f7f24a4 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -666,7 +666,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 1000000
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index f4c9312843..80d8fcdd98 100644
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@@ -16,7 +16,6 @@
#define CONFIG_CMD_SDRAM
#define CONFIG_BAUDRATE 115200
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTARGS "console=ttySC0,115200 root=1f01"
#define CONFIG_VERSION_VARIABLE
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 4d0855567a..5384584c18 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -850,7 +850,6 @@ extern unsigned long get_sdram_size(void);
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 1000000
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 7457dfcd48..bdf0323bfc 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -715,7 +715,6 @@
#define CONFIG_LOADADDR 1000000
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h
index a10310ec27..07a594d15d 100644
--- a/include/configs/P1023RDB.h
+++ b/include/configs/P1023RDB.h
@@ -308,7 +308,6 @@ extern unsigned long get_clock_freq(void);
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 1000000
-#define CONFIG_BOOTDELAY -1 /* -1 disables auto-boot */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index b3fb38c63a..24e5431845 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -676,7 +676,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 1000000
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/PATI.h b/include/configs/PATI.h
index 9f3c037237..e96fbc5aac 100644
--- a/include/configs/PATI.h
+++ b/include/configs/PATI.h
@@ -44,11 +44,6 @@
#define CONFIG_CMD_EEPROM
#define CONFIG_CMD_IRQ
-#if 0
-#define CONFIG_BOOTDELAY -1 /* autoboot disabled */
-#else
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
-#endif
#define CONFIG_BOOTCOMMAND "" /* autoboot command */
#define CONFIG_BOOTARGS "" /* */
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 4506d86eee..e7c7a990f4 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -89,7 +89,6 @@
**************************************************************/
#define CONFIG_BAUDRATE 9600 /* STD Baudrate */
-#define CONFIG_BOOTDELAY 5
/* autoboot (do NOT change this set environment variable "bootdelay" to -1 instead) */
/* #define CONFIG_BOOT_RETRY_TIME -10 /XXX* feature is available but not enabled */
#define CONFIG_ZERO_BOOTDELAY_CHECK /* check console even if bootdelay = 0 */
diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h
index 71a03756d4..558f3e2ba6 100644
--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.h
@@ -118,7 +118,6 @@
#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */
-#define CONFIG_BOOTDELAY 3 /* autoboot after 3 seconds */
#define CONFIG_VERSION_VARIABLE 1 /* include version env variable */
diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h
index a622578bd2..5f17d76744 100644
--- a/include/configs/PMC405DE.h
+++ b/include/configs/PMC405DE.h
@@ -21,7 +21,6 @@
#define CONFIG_SYS_CLK_FREQ 33330000 /* external frequency to pll */
#define CONFIG_BAUDRATE 115200
-#define CONFIG_BOOTDELAY 3 /* autoboot after 3 seconds */
#undef CONFIG_BOOTARGS
#undef CONFIG_BOOTCOMMAND
diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index 005fa2a5c1..868ca84f99 100644
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -229,7 +229,6 @@
"cp.b 200000 fff90000 70000\0" \
""
-#define CONFIG_BOOTDELAY 3 /* autoboot after 3 seconds */
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index ef2ede49b9..b151963502 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -867,7 +867,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server */
#define CONFIG_LOADADDR 1000000 /* default location for tftp, bootm */
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#define CONFIG_BAUDRATE 115200
#define __USB_PHY_TYPE utmi
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 778c64b3f0..06d1d0fc49 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -867,7 +867,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
#define CONFIG_LOADADDR 1000000 /* default location for tftp, bootm */
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#define CONFIG_BAUDRATE 115200
#define __USB_PHY_TYPE utmi
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index be4ae712b5..9f5063c333 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -749,7 +749,6 @@ unsigned long get_board_ddr_clk(void);
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 1000000
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index ed3493b684..a8f4f742e6 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -832,7 +832,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 1000000
-#define CONFIG_BOOTDELAY 10 /*-1 disables auto-boot*/
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index f48697c033..1f07a83a1a 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -821,7 +821,6 @@ unsigned long get_board_ddr_clk(void);
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 1000000
#define CONFIG_BAUDRATE 115200
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#define __USB_PHY_TYPE utmi
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index b6be46e004..0ded41e0dd 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -773,7 +773,6 @@ unsigned long get_board_ddr_clk(void);
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 1000000
#define CONFIG_BAUDRATE 115200
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#define __USB_PHY_TYPE utmi
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h
index 276428f4df..f075dfb5f0 100644
--- a/include/configs/T4240QDS.h
+++ b/include/configs/T4240QDS.h
@@ -545,7 +545,6 @@ unsigned long get_board_ddr_clk(void);
(!(readb(QIXIS_BASE + QIXIS_BRDCFG5) & QIXIS_MUX_SDHC_WIDTH8))
#endif
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#define __USB_PHY_TYPE utmi
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index ab838a8036..9ba69a1d12 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -738,7 +738,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_SHA_HW_ACCEL
#endif
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#define __USB_PHY_TYPE utmi
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 42ebcf04d1..0e4067a3a9 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -199,7 +199,6 @@
/*
* Autobooting
*/
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "echo;" \
"echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h
index 395805ca04..c557ba1778 100644
--- a/include/configs/TQM823L.h
+++ b/include/configs/TQM823L.h
@@ -37,7 +37,6 @@
#define CONFIG_BOOTCOUNT_LIMIT
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_BOARD_TYPES 1 /* support board types */
diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h
index ec366370ee..814740b71d 100644
--- a/include/configs/TQM823M.h
+++ b/include/configs/TQM823M.h
@@ -35,7 +35,6 @@
#define CONFIG_BOOTCOUNT_LIMIT
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_BOARD_TYPES 1 /* support board types */
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 2aac682a2c..90e8dd9dd9 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -481,7 +481,6 @@
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 400000
-#define CONFIG_BOOTDELAY 6 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h
index 00c0cc3291..58fd8a4d71 100644
--- a/include/configs/TQM850L.h
+++ b/include/configs/TQM850L.h
@@ -30,7 +30,6 @@
#define CONFIG_BOOTCOUNT_LIMIT
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_BOARD_TYPES 1 /* support board types */
diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h
index ca2602492e..3a4f94c83a 100644
--- a/include/configs/TQM850M.h
+++ b/include/configs/TQM850M.h
@@ -30,7 +30,6 @@
#define CONFIG_BOOTCOUNT_LIMIT
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_BOARD_TYPES 1 /* support board types */
diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h
index 39cf02e4c4..134076c73a 100644
--- a/include/configs/TQM855L.h
+++ b/include/configs/TQM855L.h
@@ -30,7 +30,6 @@
#define CONFIG_BOOTCOUNT_LIMIT
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_BOARD_TYPES 1 /* support board types */
diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h
index 30bfb8afdd..ad6f8f4bb3 100644
--- a/include/configs/TQM855M.h
+++ b/include/configs/TQM855M.h
@@ -30,7 +30,6 @@
#define CONFIG_BOOTCOUNT_LIMIT
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_BOARD_TYPES 1 /* support board types */
diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h
index abe49b9c92..b935f31100 100644
--- a/include/configs/TQM860L.h
+++ b/include/configs/TQM860L.h
@@ -30,7 +30,6 @@
#define CONFIG_BOOTCOUNT_LIMIT
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_BOARD_TYPES 1 /* support board types */
diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h
index 48252c4f98..79248de015 100644
--- a/include/configs/TQM860M.h
+++ b/include/configs/TQM860M.h
@@ -30,7 +30,6 @@
#define CONFIG_BOOTCOUNT_LIMIT
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_BOARD_TYPES 1 /* support board types */
diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h
index a73395a270..d360644c02 100644
--- a/include/configs/TQM862L.h
+++ b/include/configs/TQM862L.h
@@ -33,7 +33,6 @@
#define CONFIG_BOOTCOUNT_LIMIT
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_BOARD_TYPES 1 /* support board types */
diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h
index 3db6fa1740..5c6013b41f 100644
--- a/include/configs/TQM862M.h
+++ b/include/configs/TQM862M.h
@@ -33,7 +33,6 @@
#define CONFIG_BOOTCOUNT_LIMIT
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_BOARD_TYPES 1 /* support board types */
diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h
index 76c8f7a499..c098f72c67 100644
--- a/include/configs/TQM866M.h
+++ b/include/configs/TQM866M.h
@@ -44,7 +44,6 @@
#define CONFIG_BOOTCOUNT_LIMIT
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_BOARD_TYPES 1 /* support board types */
diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h
index 88b97ab319..9d8a607b6f 100644
--- a/include/configs/TQM885D.h
+++ b/include/configs/TQM885D.h
@@ -40,7 +40,6 @@
#define CONFIG_BOOTCOUNT_LIMIT
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_BOARD_TYPES 1 /* support board types */
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index 4ae61ca9cd..0c9e79f4a5 100644
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -590,7 +590,6 @@
#if defined(CONFIG_DONGLE)
-#define CONFIG_BOOTDELAY 1 /* autoboot after 1 seconds */
#define CONFIG_EXTRA_ENV_SETTINGS \
"bootcmd=run prog_spi_mbrbootcramfs\0" \
"bootfile=uImage\0" \
@@ -720,7 +719,6 @@
#if defined(CONFIG_UCP1020T1)
-#define CONFIG_BOOTDELAY 2 /* autoboot after 2 sec, -1 disables auto-boot */
#define CONFIG_EXTRA_ENV_SETTINGS \
"bootcmd=run releasefpga; run norbootworking || run norbootrecovery\0" \
"bootfile=uImage\0" \
@@ -810,7 +808,6 @@
#else /* For Arcturus Modules */
-#define CONFIG_BOOTDELAY 2 /* autoboot after 2 sec, -1 disables auto-boot */
#define CONFIG_EXTRA_ENV_SETTINGS \
"bootcmd=run norkernel\0" \
"bootfile=uImage\0" \
diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index 4e349d5caa..968e1dfd64 100644
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -115,7 +115,6 @@
#define CONFIG_BAUDRATE 9600
-#define CONFIG_BOOTDELAY 5
#define CONFIG_BOOT_RETRY_TIME -1
#define CONFIG_RESET_TO_RETRY
#define CONFIG_ZERO_BOOTDELAY_CHECK
diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h
index d401d3eedb..dde98f6e75 100644
--- a/include/configs/VOM405.h
+++ b/include/configs/VOM405.h
@@ -27,7 +27,6 @@
#define CONFIG_SYS_CLK_FREQ 33330000 /* external frequency to pll */
#define CONFIG_BAUDRATE 9600
-#define CONFIG_BOOTDELAY 3 /* autoboot after 3 seconds */
#undef CONFIG_BOOTARGS
#undef CONFIG_BOOTCOMMAND
diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h
index e0c92d0497..7ec404d548 100644
--- a/include/configs/a3m071.h
+++ b/include/configs/a3m071.h
@@ -321,7 +321,6 @@
* Environment Configuration
*/
-#define CONFIG_BOOTDELAY 3 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS
#define CONFIG_ZERO_BOOTDELAY_CHECK
diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h
index ee1bff858f..4e240c6b89 100644
--- a/include/configs/a4m072.h
+++ b/include/configs/a4m072.h
@@ -107,7 +107,6 @@
/*
* Autobooting
*/
-#define CONFIG_BOOTDELAY 2 /* autoboot after 2 seconds */
#define CONFIG_SYS_AUTOLOAD "n"
diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h
index f0b5b3e188..699ac41d77 100644
--- a/include/configs/ac14xx.h
+++ b/include/configs/ac14xx.h
@@ -462,7 +462,6 @@
/* default load addr for tftp and bootm */
#define CONFIG_LOADADDR 400000
-#define CONFIG_BOOTDELAY 2 /* -1 disables auto-boot */
/* the builtin environment and standard greeting */
#define CONFIG_PREBOOT "echo;" \
diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h
index 7b9470c801..c4e0a21b8d 100644
--- a/include/configs/adp-ag101p.h
+++ b/include/configs/adp-ag101p.h
@@ -97,7 +97,6 @@
*/
#define CONFIG_FTMAC100
-#define CONFIG_BOOTDELAY 3
/*
* SD (MMC) controller
diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h
index e9e971e511..8454872554 100644
--- a/include/configs/am335x_sl50.h
+++ b/include/configs/am335x_sl50.h
@@ -10,7 +10,6 @@
#define __CONFIG_AM335X_EVM_H
#include <configs/ti_am335x_common.h>
-#undef CONFIG_BOOTDELAY
#ifndef CONFIG_SPL_BUILD
# define CONFIG_TIMESTAMP
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index 822e1c8edc..a65d1a884b 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -156,7 +156,6 @@
#define CONFIG_JFFS2_PART_SIZE 0xf980000 /* sz of jffs2 part */
/* Environment information */
-#define CONFIG_BOOTDELAY 10
#define CONFIG_BOOTFILE "uImage"
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index 6f83870868..4d88aac637 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -200,7 +200,6 @@
#endif /* CONFIG_NAND */
/* Environment information */
-#define CONFIG_BOOTDELAY 10
#define CONFIG_BOOTFILE "uImage"
diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h
index 9fa4d16243..2666ca6f69 100644
--- a/include/configs/amcc-common.h
+++ b/include/configs/amcc-common.h
@@ -60,7 +60,6 @@
/*
* Miscellaneous configurable options
*/
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#if defined(CONFIG_CMD_KGDB)
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#else
diff --git a/include/configs/amcore.h b/include/configs/amcore.h
index e819185f77..5667680230 100644
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -18,7 +18,6 @@
#define CONFIG_BAUDRATE 115200
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
-#define CONFIG_BOOTDELAY 1
#define CONFIG_BOOTCOMMAND "bootm ffc20000"
#undef CONFIG_CMD_AES
diff --git a/include/configs/ap121.h b/include/configs/ap121.h
index b01031c8bb..bf5746fcb8 100644
--- a/include/configs/ap121.h
+++ b/include/configs/ap121.h
@@ -34,7 +34,6 @@
#define CONFIG_SYS_BAUDRATE_TABLE \
{9600, 19200, 38400, 57600, 115200}
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock2 " \
"rootfstype=squashfs"
diff --git a/include/configs/ap143.h b/include/configs/ap143.h
index 0fa73a79a5..5d7e49e4a1 100644
--- a/include/configs/ap143.h
+++ b/include/configs/ap143.h
@@ -38,7 +38,6 @@
#define CONFIG_SYS_BAUDRATE_TABLE \
{9600, 19200, 38400, 57600, 115200}
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock2 " \
"rootfstype=squashfs"
diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h
index ae58ec8d2a..7dd24612f1 100644
--- a/include/configs/ap325rxa.h
+++ b/include/configs/ap325rxa.h
@@ -19,7 +19,6 @@
#define CONFIG_DOS_PARTITION
#define CONFIG_BAUDRATE 38400
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTARGS "console=ttySC2,38400"
#define CONFIG_VERSION_VARIABLE
diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h
index be8feed124..37f2d3093a 100644
--- a/include/configs/ap_sh4a_4a.h
+++ b/include/configs/ap_sh4a_4a.h
@@ -22,7 +22,6 @@
#define CONFIG_CMD_ENV
#define CONFIG_BAUDRATE 115200
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTARGS "console=ttySC4,115200"
#define CONFIG_VERSION_VARIABLE
diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index 2291647c64..f44f71cebe 100644
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -148,7 +148,6 @@
#define CONFIG_SETUP_MEMORY_TAGS /* send memory definition to kernel */
#define CONFIG_INITRD_TAG /* send initrd params */
-#define CONFIG_BOOTDELAY 5
#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_BOOTFILE __stringify(CONFIG_BOARD_NAME) "-linux.bin"
#define CONFIG_BOOTARGS "console=" __stringify(ACFG_CONSOLE_DEV) "," \
diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h
index bb29f3f5bc..50eaf609b5 100644
--- a/include/configs/apx4devkit.h
+++ b/include/configs/apx4devkit.h
@@ -93,7 +93,6 @@
#endif
/* Boot Linux */
-#define CONFIG_BOOTDELAY 1
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_BOOTCOMMAND "run bootcmd_nand"
#define CONFIG_LOADADDR 0x41000000
diff --git a/include/configs/arcangel4.h b/include/configs/arcangel4.h
index 8a860eef6a..d6081048fe 100644
--- a/include/configs/arcangel4.h
+++ b/include/configs/arcangel4.h
@@ -54,7 +54,6 @@
/*
* Environment configuration
*/
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_BOOTARGS "console=ttyARC0,115200n8"
#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR
diff --git a/include/configs/aria.h b/include/configs/aria.h
index 2d32da1f94..cb506589d9 100644
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -510,7 +510,6 @@
#define CONFIG_LOADADDR 400000 /* default load addr */
-#define CONFIG_BOOTDELAY 5 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index 681b4e743e..522b287104 100644
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -22,7 +22,6 @@
#define BOARD_LATE_INIT
#define CONFIG_BAUDRATE 115200
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTARGS ""
#define CONFIG_VERSION_VARIABLE
diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index b08276f32d..e8dca0b2cc 100644
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -149,19 +149,6 @@
/* AUTOBOOT settings - booting images automatically by u-boot after power on */
/*
- * used for autoboot, delay in seconds u-boot will wait before starting
- * defined (auto-)boot command, setting to -1 disables delay, setting to
- * 0 will too prevent access to u-boot command interface: u-boot then has
- * to be reflashed
- * beware - watchdog is not serviced during autoboot delay time!
- */
-#ifdef CONFIG_MONITOR_IS_IN_RAM
-#define CONFIG_BOOTDELAY 1
-#else
-#define CONFIG_BOOTDELAY 1
-#endif
-
-/*
* The following settings will be contained in the environment block ; if you
* want to use a neutral environment all those settings can be manually set in
* u-boot: 'set' command
diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
index dc955b2452..9257c5f029 100644
--- a/include/configs/at91-sama5_common.h
+++ b/include/configs/at91-sama5_common.h
@@ -34,7 +34,6 @@
/* general purpose I/O */
#define CONFIG_AT91_GPIO
-#define CONFIG_BOOTDELAY 3
/*
* BOOTP options
diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h
index 2979b25abc..c92ad85238 100644
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -171,7 +171,6 @@
/*
* Boot option
*/
-#define CONFIG_BOOTDELAY 3
/* default load address */
#define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE + SZ_16M
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index 9db8d12868..c6d3295f34 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -61,7 +61,6 @@
#define CONFIG_RED_LED AT91_PIN_PA9 /* this is the power led */
#define CONFIG_GREEN_LED AT91_PIN_PA6 /* this is the user led */
-#define CONFIG_BOOTDELAY 3
/*
* BOOTP options
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index b369624a2c..9c9461bc98 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -69,7 +69,6 @@
#define CONFIG_GREEN_LED AT91_PIN_PA13 /* this is the user1 led */
#define CONFIG_YELLOW_LED AT91_PIN_PA14 /* this is the user2 led */
-#define CONFIG_BOOTDELAY 3
/*
* BOOTP options
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index f248049e54..e7bfd49450 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -76,7 +76,6 @@
#define CONFIG_GREEN_LED AT91_PIN_PB8 /* the user1 led */
#define CONFIG_YELLOW_LED AT91_PIN_PC29 /* the user2 led */
-#define CONFIG_BOOTDELAY 3
/*
* BOOTP options
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index 18eb01dc8c..290b039e11 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -59,7 +59,6 @@
#define CONFIG_RED_LED AT91_PIN_PD31 /* this is the user1 led */
#define CONFIG_GREEN_LED AT91_PIN_PD0 /* this is the user2 led */
-#define CONFIG_BOOTDELAY 3
/*
* BOOTP options
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index 2f8c377413..297938b93e 100644
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -51,7 +51,6 @@
#define CONFIG_ATMEL_LCD_RGB565
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-#define CONFIG_BOOTDELAY 3
/*
* BOOTP options
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index d178d9d44b..a383de64bc 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -65,7 +65,6 @@
#define CONFIG_GREEN_LED AT91_PIN_PD15 /* this is the user1 led */
#define CONFIG_YELLOW_LED AT91_PIN_PD16 /* this is the user2 led */
-#define CONFIG_BOOTDELAY 3
/*
* Command line configuration.
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index 251094e60b..743fc397d1 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -47,7 +47,6 @@
#define CONFIG_ATMEL_LCD_RGB565
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-#define CONFIG_BOOTDELAY 3
/*
* BOOTP options
diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h
index e6f6125dd2..a0f451b1a0 100644
--- a/include/configs/atngw100.h
+++ b/include/configs/atngw100.h
@@ -62,7 +62,6 @@
#define CONFIG_BOOTCOMMAND \
"fsload; bootm"
-#define CONFIG_BOOTDELAY 1
/*
* After booting the board for the first time, new ethernet addresses
diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h
index dfa2d93a90..4d9282a7bf 100644
--- a/include/configs/atngw100mkii.h
+++ b/include/configs/atngw100mkii.h
@@ -81,7 +81,6 @@
#define CONFIG_BOOTCOMMAND \
"fsload 0x10400000 /uImage; bootm"
-#define CONFIG_BOOTDELAY 1
/*
* After booting the board for the first time, new ethernet addresses
diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index 9a647d8446..9ddfff2b2c 100644
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -79,7 +79,6 @@
#define CONFIG_BOOTCOMMAND \
"fsload; bootm $(fileaddr)"
-#define CONFIG_BOOTDELAY 1
/*
* After booting the board for the first time, new ethernet addresses
diff --git a/include/configs/axs101.h b/include/configs/axs101.h
index 05d2d45b25..c0b68e2277 100644
--- a/include/configs/axs101.h
+++ b/include/configs/axs101.h
@@ -119,7 +119,6 @@
/*
* Environment configuration
*/
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_BOOTARGS "console=ttyS3,115200n8"
#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR
diff --git a/include/configs/bct-brettl2.h b/include/configs/bct-brettl2.h
index e95deac737..de60bb1035 100644
--- a/include/configs/bct-brettl2.h
+++ b/include/configs/bct-brettl2.h
@@ -117,7 +117,6 @@
/*
* Misc Settings
*/
-#define CONFIG_BOOTDELAY 1
#define CONFIG_LOADADDR 0x800000
#define CONFIG_MISC_INIT_R
#define CONFIG_UART_CONSOLE 0
diff --git a/include/configs/bf525-ucr2.h b/include/configs/bf525-ucr2.h
index 66339ca971..f7a45e9fdd 100644
--- a/include/configs/bf525-ucr2.h
+++ b/include/configs/bf525-ucr2.h
@@ -85,7 +85,6 @@
#define CONFIG_BFIN_SERIAL
#define CONFIG_BOOTARGS "root=/dev/mtdblock0 rw"
#define CONFIG_BOOTCOMMAND "run sfboot"
-#define CONFIG_BOOTDELAY 5
#define CONFIG_EXTRA_ENV_SETTINGS \
"sfboot=sf probe 1;" \
"sf read 0x1000000 0x20000 0x300000;" \
diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h
index 43a90328fe..2c7972043a 100644
--- a/include/configs/bf537-minotaur.h
+++ b/include/configs/bf537-minotaur.h
@@ -129,12 +129,6 @@
#define CONFIG_BOOT_RETRY_TIME -1
#define CONFIG_LOADS_ECHO 1
-#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_UART)
-# define CONFIG_BOOTDELAY -1
-#else
-# define CONFIG_BOOTDELAY 5
-#endif
-
#define CONFIG_CMD_BOOTLDR
#define CONFIG_CMD_DATE
diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h
index 70553662e7..6ad5682a19 100644
--- a/include/configs/bf537-srv1.h
+++ b/include/configs/bf537-srv1.h
@@ -129,15 +129,6 @@
#define CONFIG_BOOT_RETRY_TIME -1
#define CONFIG_LOADS_ECHO 1
-#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_UART)
-# define CONFIG_BOOTDELAY -1
-#else
-# define CONFIG_BOOTDELAY 5
-#endif
-
-#ifdef CONFIG_BFIN_MAC
-#endif
-
#define CONFIG_CMD_BOOTLDR
#define CONFIG_CMD_DATE
diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h
index 88d2ae997e..13076072e4 100644
--- a/include/configs/bfin_adi_common.h
+++ b/include/configs/bfin_adi_common.h
@@ -99,9 +99,7 @@
*/
#ifndef CONFIG_BOOTDELAY
# if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_UART)
-# define CONFIG_BOOTDELAY -1
# else
-# define CONFIG_BOOTDELAY 5
# endif
#endif
#ifndef CONFIG_BOOTCOMMAND
diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h
index 6a5bc126b0..e13f736a8f 100644
--- a/include/configs/bg0900.h
+++ b/include/configs/bg0900.h
@@ -55,7 +55,6 @@
#endif
/* Boot Linux */
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_BOOTARGS "console=ttyAMA0,115200"
#define CONFIG_BOOTCOMMAND "bootm"
diff --git a/include/configs/blackstamp.h b/include/configs/blackstamp.h
index 6eb83a05a7..dc596fae3e 100644
--- a/include/configs/blackstamp.h
+++ b/include/configs/blackstamp.h
@@ -106,7 +106,6 @@
#define CONFIG_CMD_CPLBINFO
#define CONFIG_CMD_DATE
-#define CONFIG_BOOTDELAY 5
#define CONFIG_BOOTCOMMAND "run ramboot"
#define CONFIG_BOOTARGS \
"root=/dev/mtdblock0 rw " \
diff --git a/include/configs/blackvme.h b/include/configs/blackvme.h
index ba90830a1e..d3dc216c5f 100644
--- a/include/configs/blackvme.h
+++ b/include/configs/blackvme.h
@@ -155,7 +155,6 @@
* Default: boot from SPI flash.
* "sfboot" is a composite command defined in extra settings
*/
-#define CONFIG_BOOTDELAY 5
#define CONFIG_BOOTCOMMAND "run sfboot"
/*
diff --git a/include/configs/br4.h b/include/configs/br4.h
index 402f352fc5..16e4a1d4e2 100644
--- a/include/configs/br4.h
+++ b/include/configs/br4.h
@@ -119,7 +119,6 @@
#define CONFIG_RTC_BFIN
#define CONFIG_UART_CONSOLE 0
#define CONFIG_BOOTCOMMAND "run nandboot"
-#define CONFIG_BOOTDELAY 2
#define CONFIG_LOADADDR 0x2000000
/*
diff --git a/include/configs/calimain.h b/include/configs/calimain.h
index 506ad882c8..3b10360b5e 100644
--- a/include/configs/calimain.h
+++ b/include/configs/calimain.h
@@ -214,7 +214,6 @@
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_BOOTARGS ""
#define CONFIG_BOOTCOMMAND "run checkupdate; run checkbutton;"
-#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_RESET_TO_RETRY
diff --git a/include/configs/canmb.h b/include/configs/canmb.h
index 31fe5f6b81..b41666064c 100644
--- a/include/configs/canmb.h
+++ b/include/configs/canmb.h
@@ -65,7 +65,6 @@
/*
* Autobooting
*/
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "echo;" \
"echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h
index 99182f4de3..0dd5e996b6 100644
--- a/include/configs/cm5200.h
+++ b/include/configs/cm5200.h
@@ -64,7 +64,6 @@
/*
* Autobooting
*/
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "echo;" \
"echo Type \"run net_nfs_fdt\" to mount root filesystem over NFS;" \
"echo"
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index 0fb853002c..de1999d431 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -145,7 +145,6 @@
/* devices */
/* Environment information */
-#define CONFIG_BOOTDELAY 3
#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h
index 7c087c6f5d..87e41bfaba 100644
--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@@ -152,7 +152,6 @@
/* devices */
/* Environment information */
-#define CONFIG_BOOTDELAY 3
#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h
index ff63d7a775..68851ee90f 100644
--- a/include/configs/cm_t54.h
+++ b/include/configs/cm_t54.h
@@ -108,9 +108,7 @@
#undef CONFIG_SYS_AUTOLOAD
#undef CONFIG_EXTRA_ENV_SETTINGS
#undef CONFIG_BOOTCOMMAND
-#undef CONFIG_BOOTDELAY
-#define CONFIG_BOOTDELAY 3
#define CONFIG_SYS_AUTOLOAD "no"
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index 509c8b42fb..4396698b7f 100644
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -149,7 +149,6 @@
/*AUTOBOOT settings - booting images automatically by u-boot after power on*/
-#define CONFIG_BOOTDELAY 5 /* used for autoboot, delay in
seconds u-boot will wait before starting defined (auto-)boot command, setting
to -1 disables delay, setting to 0 will too prevent access to u-boot command
interface: u-boot then has to reflashed */
diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index 5dffc9e186..ba8d93ce1f 100644
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -37,7 +37,6 @@
"bootm 0xc0000;"
#define CONFIG_BOOTARGS "console=tty0 console=ttyS0,115200"
#define CONFIG_TIMESTAMP
-#define CONFIG_BOOTDELAY 2 /* Autoboot delay */
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_LZMA /* LZMA compression support */
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 50f7c21ac2..58925952dd 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -89,7 +89,6 @@
#define CONFIG_NETMASK 255.255.255.0
#define CONFIG_SERVERIP 192.168.10.1
-#define CONFIG_BOOTDELAY 1
#define CONFIG_BOARD_LATE_INIT
#define CONFIG_LOADADDR 0x80008000
diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index c60c644393..30c283185b 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -417,7 +417,6 @@
#ifdef CONFIG_TRAILBLAZER
-#define CONFIG_BOOTDELAY 0 /* -1 disables auto-boot */
#define CONFIG_BAUDRATE 115200
#define CONFIG_EXTRA_ENV_SETTINGS \
@@ -432,7 +431,6 @@
#define CONFIG_LOADADDR 1000000
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index a06bfe05ad..4a770b0546 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -682,7 +682,6 @@
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 1000000
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index 8b3c7153f0..686760d0a5 100644
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -54,7 +54,6 @@
#define CONFIG_RED_LED AT91_PIN_PD31 /* this is the user1 led */
#define CONFIG_GREEN_LED AT91_PIN_PD0 /* this is the user2 led */
-#define CONFIG_BOOTDELAY 3
/*
* BOOTP options
diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h
index 660646eb91..708d5f730d 100644
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -505,7 +505,6 @@
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 1000000
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index af220febf4..3e4bba5587 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -278,7 +278,6 @@
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_BOOTARGS \
"mem=32M console=ttyS2,115200n8 root=/dev/mtdblock2 rw noinitrd ip=dhcp"
-#define CONFIG_BOOTDELAY 3
#define CONFIG_EXTRA_ENV_SETTINGS "hwconfig=dsp:wake=yes"
/*
diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index 68ff02509b..dbd2bb3b09 100644
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -37,7 +37,6 @@
#endif
#endif
-#define CONFIG_BOOTDELAY 2 /* autoboot after 2 seconds */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 913b9481f2..73f53d4a2b 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -179,7 +179,6 @@
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_ZERO_BOOTDELAY_CHECK
-#define CONFIG_BOOTDELAY 1
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_BOOTARGS "console=ttyS0,115200n8"
diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index 18804d43fd..1145e37639 100644
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -117,7 +117,6 @@
/*
* Autobooting
*/
-#define CONFIG_BOOTDELAY 1
#undef CONFIG_BOOTARGS
diff --git a/include/configs/draco.h b/include/configs/draco.h
index 8aee25b96a..5d866c4868 100644
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -82,7 +82,6 @@
#ifndef CONFIG_RESTORE_FLASH
/* set to negative value for no autoboot */
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTCOMMAND \
"if dfubutton; then " \
@@ -94,7 +93,6 @@
"reset;"
#else
-#define CONFIG_BOOTDELAY 0
#define CONFIG_BOOTCOMMAND \
"setenv autoload no; " \
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index d4f3cfa8e9..3f8578fd58 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -137,7 +137,6 @@
#define LINUX_BOOT_PARAM_ADDR (PHYS_SDRAM_1 + 0x100)
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_BOOTDELAY 3
/*
* U-Boot commands
diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index 521e3cf335..6d469a383c 100644
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -69,7 +69,6 @@
#define CONFIG_MCFTMR
-#define CONFIG_BOOTDELAY 5
#define CONFIG_SYS_LONGHELP 1
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
diff --git a/include/configs/eco5pk.h b/include/configs/eco5pk.h
index bb5d7e581e..c7b0a389c9 100644
--- a/include/configs/eco5pk.h
+++ b/include/configs/eco5pk.h
@@ -31,7 +31,6 @@
#define MACH_TYPE_ECO5_PK 4017
#define CONFIG_MACH_TYPE MACH_TYPE_ECO5_PK
-#define CONFIG_BOOTDELAY 10
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h
index 2ac7757b0c..706ad1d2a3 100644
--- a/include/configs/ecovec.h
+++ b/include/configs/ecovec.h
@@ -37,7 +37,6 @@
#define CONFIG_DOS_PARTITION
#define CONFIG_BAUDRATE 115200
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTARGS "console=ttySC0,115200"
#define CONFIG_VERSION_VARIABLE
diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h
index 174cdf3302..f3f7549688 100644
--- a/include/configs/edb93xx.h
+++ b/include/configs/edb93xx.h
@@ -26,7 +26,6 @@
#endif
/* Initial environment and monitor configuration options. */
-#define CONFIG_BOOTDELAY 2
#define CONFIG_CMDLINE_TAG 1
#define CONFIG_INITRD_TAG 1
#define CONFIG_SETUP_MEMORY_TAGS 1
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index 99d16b06c0..f9d4683fcb 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -115,7 +115,6 @@
#define CONFIG_SYS_FLASH_BASE 0xfff80000
/* auto boot */
-#define CONFIG_BOOTDELAY 3 /* default enable autoboot */
/*
* For booting Linux, the board info and command line data
diff --git a/include/configs/espt.h b/include/configs/espt.h
index 3d67376498..86e726c63c 100644
--- a/include/configs/espt.h
+++ b/include/configs/espt.h
@@ -20,7 +20,6 @@
#define CONFIG_CMD_SDRAM
#define CONFIG_CMD_ENV
-#define CONFIG_BOOTDELAY -1
#define CONFIG_BOOTARGS "console=ttySC0,115200 root=1f01"
#define CONFIG_ENV_OVERWRITE 1
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index 94fee54ccd..bd32cdbf73 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -205,7 +205,6 @@
#define CONFIG_RBTREE
/* Boot command */
-#define CONFIG_BOOTDELAY 3
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG
diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index 7400870b21..824aca45b6 100644
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -81,7 +81,6 @@
#define CONFIG_NET_RETRY_COUNT 100
-#define CONFIG_BOOTDELAY 3
#define CONFIG_LOADADDR 0x80800000 /* loadaddr env var */
diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index 1304879876..42771b51d4 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -36,7 +36,6 @@
#define CONFIG_SUPPORT_EMMC_BOOT
-#define CONFIG_BOOTDELAY 1
#include "mx6_common.h"
#include <linux/sizes.h>
diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h
index e6b7953c92..8b573545cd 100644
--- a/include/configs/gr_cpci_ax2000.h
+++ b/include/configs/gr_cpci_ax2000.h
@@ -65,7 +65,6 @@
/*
* Autobooting
*/
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "echo;" \
"echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h
index 956c0e27bd..4e7819912d 100644
--- a/include/configs/gr_ep2s60.h
+++ b/include/configs/gr_ep2s60.h
@@ -67,7 +67,6 @@
/*
* Autobooting
*/
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "echo;" \
"echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h
index 908d545070..36acf01631 100644
--- a/include/configs/gr_xc3s_1500.h
+++ b/include/configs/gr_xc3s_1500.h
@@ -46,7 +46,6 @@
/*
* Autobooting
*/
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "echo;" \
"echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
diff --git a/include/configs/grasshopper.h b/include/configs/grasshopper.h
index 83f1d73087..f1afdedb3c 100644
--- a/include/configs/grasshopper.h
+++ b/include/configs/grasshopper.h
@@ -74,7 +74,6 @@
#define CONFIG_BAUDRATE 115200
-#define CONFIG_BOOTDELAY 1
/*
* After booting the board for the first time, new ethernet addresses
diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index 6a889015a3..c2656fbeb2 100644
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -58,7 +58,6 @@
/*
* Autobooting
*/
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "echo;" \
"echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index 0ebded6bd2..59adbdc102 100644
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -53,7 +53,6 @@
/*
* Autobooting
*/
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "echo;" \
"echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
diff --git a/include/configs/h2200.h b/include/configs/h2200.h
index 3d510d6d88..3e419c6445 100644
--- a/include/configs/h2200.h
+++ b/include/configs/h2200.h
@@ -135,7 +135,6 @@
#define CONFIG_USB_DEV_PULLUP_GPIO 33
/* USB VBUS GPIO 3 */
-#define CONFIG_BOOTDELAY 2
#define CONFIG_BOOTCOMMAND \
"setenv downloaded 0 ; while test $downloaded -eq 0 ; do " \
"if bootp ; then setenv downloaded 1 ; fi ; done ; " \
diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index 9f02a654c3..6a8660b088 100644
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -621,7 +621,6 @@ void fpga_control_clear(unsigned int bus, int pin);
#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */
-#define CONFIG_BOOTDELAY 5 /* -1 disables auto-boot */
#define CONFIG_HOSTNAME hrcon
#define CONFIG_ROOTPATH "/opt/nfsroot"
diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 04515ba80a..b750d72d35 100644
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -25,7 +25,6 @@
#define CONFIG_BOOT_RETRY_TIME 900
#define CONFIG_BOOT_RETRY_MIN 30
-#define CONFIG_BOOTDELAY 1
#define CONFIG_RESET_TO_RETRY
#define CONFIG_83XX_CLKIN 66000000 /* in Hz */
diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h
index b8ee44d868..80628ddaf3 100644
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@@ -175,7 +175,6 @@
#define CONFIG_CMD_JFFS2
#define CONFIG_CMD_NAND
-#define CONFIG_BOOTDELAY 5
#define CONFIG_LOADADDR 0xa0800000 /* loadaddr env var */
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index 94fc077539..50dfc11523 100644
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -54,7 +54,6 @@
***********************************************************/
#define CONFIG_CMD_EEPROM
-#define CONFIG_BOOTDELAY 3
#define MTDPARTS_DEFAULT "mtdparts=physmap-flash.0:128k(uboot)ro," \
"1536k(kernel),-(root)"
diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index 0d4f2925cd..3420a39ade 100644
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -92,7 +92,6 @@
/*
* Autobooting
*/
-#define CONFIG_BOOTDELAY 1 /* autoboot after 1 second */
#define CONFIG_PREBOOT "echo;" \
"echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index a5a8819727..e7d058f7a8 100644
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -31,7 +31,6 @@
/*
* Command line configuration.
*/
-#define CONFIG_BOOTDELAY 2
#define CONFIG_BOOTARGS "root=/dev/mtdblock0 console=ttyAM0 console=tty"
#define CONFIG_BOOTCOMMAND ""
diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index af69ad99c4..d0b6af8cad 100644
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -31,7 +31,6 @@
/*
* Command line configuration.
*/
-#define CONFIG_BOOTDELAY 2
#define CONFIG_BOOTARGS "root=/dev/mtdblock0 console=ttyAMA0 console=tty ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0"
#define CONFIG_BOOTCOMMAND "tftpboot ; bootm"
#define CONFIG_SERVERIP 192.168.1.100
diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
index b2a6e7fb05..b36b75dfb6 100644
--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@@ -223,7 +223,6 @@
#define CONFIG_CMDLINE_TAG
#define CONFIG_REVISION_TAG
#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_BOOTDELAY 2
#define CONFIG_EXTRA_ENV_SETTINGS \
"defbootargs=setenv bootargs mem=128M console=ttyS0,115200n8 " \
"root=/dev/mtdblock5 rw noinitrd " \
diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h
index 55ed6569ef..eb4e3aea38 100644
--- a/include/configs/ipek01.h
+++ b/include/configs/ipek01.h
@@ -115,7 +115,6 @@
/*
* Autobooting
*/
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "echo;" \
"echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index 062820305d..65f53b7612 100644
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -92,7 +92,6 @@
/*
* Autobooting
*/
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "echo;" \
"echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 9f76034e61..6f2773b88c 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -21,7 +21,6 @@
#undef CONFIG_WATCHDOG /* disable platform specific watchdog */
-#define CONFIG_BOOTDELAY 2 /* autoboot after 2 seconds */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
/*
diff --git a/include/configs/kwb.h b/include/configs/kwb.h
index bcb9e7e8be..2bddc6b7df 100644
--- a/include/configs/kwb.h
+++ b/include/configs/kwb.h
@@ -103,7 +103,6 @@ BUR_COMMON_ENV \
#define CONFIG_BOOTCOMMAND \
"run usbscript;"
-#define CONFIG_BOOTDELAY 0
/* undefine command which we not need here */
#undef CONFIG_BOOTM_NETBSD
diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index 710629b6bd..1b4c7d4388 100644
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -31,7 +31,6 @@
#define CONFIG_BAUDRATE 115200
#define CONFIG_BOOTARGS "root=/dev/null console=ttySC4,115200"
-#define CONFIG_BOOTDELAY 3
#define CONFIG_VERSION_VARIABLE
#undef CONFIG_SHOW_BOOT_PROGRESS
diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
index 1aad97d970..f52750e591 100644
--- a/include/configs/legoev3.h
+++ b/include/configs/legoev3.h
@@ -168,7 +168,6 @@
#define CONFIG_SERIAL_TAG
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_SETUP_INITRD_TAG
-#define CONFIG_BOOTDELAY 0
#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_BOOTCOMMAND \
"if mmc rescan; then " \
diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h
index ccd94ec952..fba2facfbd 100644
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -125,7 +125,6 @@
#define CONFIG_BOOTCOMMAND "sf probe 0:0; sf read $kernel_load "\
"$kernel_start $kernel_size && "\
"bootm $kernel_load"
-#define CONFIG_BOOTDELAY 10
/* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 1edf798e32..db684d2558 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -567,7 +567,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_FSL_DEVICE_DISABLE
-#define CONFIG_BOOTDELAY 3
#define CONFIG_SYS_QE_FW_ADDR 0x600c0000
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 30f5655dcb..0fb28eff55 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -416,7 +416,6 @@
#define CONFIG_FSL_DEVICE_DISABLE
-#define CONFIG_BOOTDELAY 3
#ifdef CONFIG_LPUART
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index a7d49ed6e8..b0d4a8d10a 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -264,7 +264,6 @@
#define CONFIG_BOOTCOMMAND "cp.b $kernel_start $kernel_load " \
"$kernel_size && bootm $kernel_load"
#endif
-#define CONFIG_BOOTDELAY 10
/* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h
index c78aeb57ed..2bf524f69a 100644
--- a/include/configs/ls2080a_common.h
+++ b/include/configs/ls2080a_common.h
@@ -255,7 +255,6 @@ unsigned long long get_qixis_addr(void);
#define CONFIG_BOOTCOMMAND "fsl_mc apply dpl 0x580700000 &&" \
" cp.b $kernel_start $kernel_load" \
" $kernel_size && bootm $kernel_load"
-#define CONFIG_BOOTDELAY 10
/* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index d5082fa4cc..0abfb00ef0 100644
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -340,7 +340,6 @@
""
#define CONFIG_BOOTCOMMAND "run flash_self"
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index 428128d297..e7fd6395e0 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -130,7 +130,6 @@
#endif
/* Booting Linux */
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTFILE "fitImage"
#define CONFIG_BOOTARGS "console=ttyAMA0,115200n8 "
#define CONFIG_BOOTCOMMAND "run mmc_mmc"
diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index 4349357b54..781a1623dd 100644
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -226,7 +226,6 @@
#define CONFIG_INITRD_TAG
#define CONFIG_REVISION_TAG
#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTFILE "fitImage"
#define CONFIG_BOOTARGS "console=ttymxc1,115200"
#define CONFIG_LOADADDR 0x70800000
diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h
index fb144637d5..b4bd6b0e1e 100644
--- a/include/configs/ma5d4evk.h
+++ b/include/configs/ma5d4evk.h
@@ -128,7 +128,6 @@
#define CONFIG_CMDLINE_TAG
#define CONFIG_INITRD_TAG
#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTFILE "fitImage"
#define CONFIG_BOOTARGS "console=ttyS3,115200"
#define CONFIG_LOADADDR 0x20800000
diff --git a/include/configs/manroland/common.h b/include/configs/manroland/common.h
index 8d4a8cd0c2..937febea21 100644
--- a/include/configs/manroland/common.h
+++ b/include/configs/manroland/common.h
@@ -37,7 +37,6 @@
/*
* Autobooting
*/
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "echo;" \
"echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 3dbd9204af..0c6e1117d4 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -149,7 +149,6 @@
#define CONFIG_JFFS2_PART_SIZE 0xf980000 /* sz of jffs2 part */
/* Environment information */
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTFILE "uImage"
diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h
index 9262f72085..4211e72dba 100644
--- a/include/configs/mecp5123.h
+++ b/include/configs/mecp5123.h
@@ -362,7 +362,6 @@
#define CONFIG_LOADADDR 400000 /* def. location for tftp and bootm */
-#define CONFIG_BOOTDELAY 5 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs*/
#define CONFIG_PREBOOT "echo;" \
diff --git a/include/configs/meesc.h b/include/configs/meesc.h
index f71b66245f..fbcad4ac80 100644
--- a/include/configs/meesc.h
+++ b/include/configs/meesc.h
@@ -69,7 +69,6 @@
#define CONFIG_USART_ID ATMEL_ID_SYS
#define CONFIG_BAUDRATE 115200
-#define CONFIG_BOOTDELAY 3
#define CONFIG_ZERO_BOOTDELAY_CHECK
/*
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 801d674610..93fb166665 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -239,7 +239,6 @@
/* default load address */
#define CONFIG_SYS_LOAD_ADDR 0
-#define CONFIG_BOOTDELAY -1 /* -1 disables auto-boot */
#define CONFIG_BOOTARGS "root=romfs"
#define CONFIG_HOSTNAME XILINX_BOARD_NAME
#define CONFIG_BOOTCOMMAND "base 0;tftp 11000000 image.img;bootm"
diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index 62919e9cf9..2a83c608b1 100644
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -63,7 +63,6 @@
/*
* Autobooting
*/
-#define CONFIG_BOOTDELAY 2 /* autoboot after 2 seconds */
#undef CONFIG_BOOTARGS
#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h
index e0c9a98de7..3cdd0dcf62 100644
--- a/include/configs/mpc5121ads.h
+++ b/include/configs/mpc5121ads.h
@@ -516,7 +516,6 @@
#define CONFIG_LOADADDR 400000 /* default location for tftp and bootm */
-#define CONFIG_BOOTDELAY 5 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h
index 66e1a45e16..57cb7956a4 100644
--- a/include/configs/mpc8308_p1m.h
+++ b/include/configs/mpc8308_p1m.h
@@ -474,7 +474,6 @@
#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */
-#define CONFIG_BOOTDELAY 5 /* -1 disables auto-boot */
#define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index f983f2d1b5..27e9c0a8f3 100644
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@@ -16,7 +16,6 @@
#define CONFIG_CMD_SDRAM
#define CONFIG_BAUDRATE 115200
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTARGS "console=ttySC0,115200 root=1f01"
#define CONFIG_VERSION_VARIABLE
diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h
index 025a4a6698..c0fb16d095 100644
--- a/include/configs/ms7750se.h
+++ b/include/configs/ms7750se.h
@@ -23,7 +23,6 @@
#define CONFIG_CONS_SCIF1 1
#define CONFIG_BOARD_LATE_INIT
-#define CONFIG_BOOTDELAY -1
#define CONFIG_BOOTARGS "console=ttySC0,38400"
#define CONFIG_ENV_OVERWRITE 1
diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h
index 3073db9ff8..29564d758b 100644
--- a/include/configs/mt_ventoux.h
+++ b/include/configs/mt_ventoux.h
@@ -22,7 +22,6 @@
#define MACH_TYPE_AM3517_MT_VENTOUX 3832
#define CONFIG_MACH_TYPE MACH_TYPE_AM3517_MT_VENTOUX
-#define CONFIG_BOOTDELAY 10
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_AUTO_COMPLETE
diff --git a/include/configs/munices.h b/include/configs/munices.h
index efbd44779e..3e4c062dbf 100644
--- a/include/configs/munices.h
+++ b/include/configs/munices.h
@@ -41,7 +41,6 @@
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
#define CONFIG_TIMESTAMP 1 /* Print image info with timestamp */
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#undef CONFIG_BOOTARGS
#define CONFIG_PREBOOT "echo;" \
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index 6d4bbd1f9a..62f4937c66 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -57,7 +57,6 @@
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \
115200,230400, 460800, 921600 }
/* auto boot */
-#define CONFIG_BOOTDELAY 3 /* default enable autoboot */
#define CONFIG_PREBOOT
/*
diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h
index 1bdbe4bba9..774725871a 100644
--- a/include/configs/mx23_olinuxino.h
+++ b/include/configs/mx23_olinuxino.h
@@ -57,7 +57,6 @@
#endif
/* Booting Linux */
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_LOADADDR 0x42000000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h
index 542f1f42b8..3f9bb0ab46 100644
--- a/include/configs/mx23evk.h
+++ b/include/configs/mx23evk.h
@@ -56,7 +56,6 @@
#endif
/* Boot Linux */
-#define CONFIG_BOOTDELAY 1
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_LOADADDR 0x42000000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h
index c63887bb8c..ea0d605fe3 100644
--- a/include/configs/mx25pdk.h
+++ b/include/configs/mx25pdk.h
@@ -117,7 +117,6 @@
/* Ethernet Configs */
-#define CONFIG_BOOTDELAY 1
#define CONFIG_LOADADDR 0x81000000 /* loadaddr env var */
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index b3c03b3bb3..068596f397 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -137,7 +137,6 @@
#endif
/* Boot Linux */
-#define CONFIG_BOOTDELAY 1
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_LOADADDR 0x42000000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h
index b9992deaab..8de9dec66f 100644
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -64,7 +64,6 @@
***********************************************************/
#define CONFIG_CMD_DATE
-#define CONFIG_BOOTDELAY 3
#define CONFIG_LOADADDR 0x80800000 /* loadaddr env var */
diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h
index 3f63007819..a81dd784c9 100644
--- a/include/configs/mx31pdk.h
+++ b/include/configs/mx31pdk.h
@@ -84,7 +84,6 @@
#define CONFIG_BOARD_LATE_INIT
-#define CONFIG_BOOTDELAY 1
#define CONFIG_EXTRA_ENV_SETTINGS \
"bootargs_base=setenv bootargs console=ttymxc0,115200\0" \
diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index aed0939ce6..1d1178798e 100644
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -91,7 +91,6 @@
#define CONFIG_DOS_PARTITION
#define CONFIG_EFI_PARTITION
-#define CONFIG_BOOTDELAY 1
#define CONFIG_LOADADDR 0x80800000 /* loadaddr env var */
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 23b8b46d8c..93ad048b11 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -120,7 +120,6 @@
#define CONFIG_CMD_DATE
-#define CONFIG_BOOTDELAY 1
#define CONFIG_ETHPRIME "FEC0"
diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h
index e697261248..0419050354 100644
--- a/include/configs/mx53ard.h
+++ b/include/configs/mx53ard.h
@@ -70,7 +70,6 @@
#define CONFIG_BAUDRATE 115200
/* Command definition */
-#define CONFIG_BOOTDELAY 3
#define CONFIG_ETHPRIME "smc911x"
diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index feb5580239..5e1c5977ea 100644
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -77,7 +77,6 @@
#define CONFIG_BAUDRATE 115200
/* Command definition */
-#define CONFIG_BOOTDELAY 3
#define CONFIG_ETHPRIME "FEC0"
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 8743ddce68..1b580f04c7 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -87,7 +87,6 @@
/* Command definition */
#define CONFIG_SUPPORT_RAW_INITRD
-#define CONFIG_BOOTDELAY 1
#define CONFIG_ETHPRIME "FEC0"
diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h
index 9c76678b1c..632ebba35c 100644
--- a/include/configs/mx53smd.h
+++ b/include/configs/mx53smd.h
@@ -64,7 +64,6 @@
#define CONFIG_BAUDRATE 115200
/* Command definition */
-#define CONFIG_BOOTDELAY 3
#define CONFIG_ETHPRIME "FEC0"
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index 17b6c48c1c..27f38f497e 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -60,7 +60,6 @@
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#ifndef CONFIG_BOOTDELAY
-#define CONFIG_BOOTDELAY 3
#endif
/* allow to overwrite serial and ethaddr */
diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index 3c9a794f81..5e5656d480 100644
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -35,7 +35,6 @@
#define CONFIG_SYS_TEXT_BASE 0x87800000
#ifndef CONFIG_BOOTDELAY
-#define CONFIG_BOOTDELAY 3
#endif
/* allow to overwrite serial and ethaddr */
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 0fbbce6d02..cd154a4bbb 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -379,7 +379,6 @@ int rx51_kp_getc(struct stdio_dev *sdev);
"run attachboot;" \
"echo"
-#define CONFIG_BOOTDELAY 30
#define CONFIG_MENU
#define CONFIG_MENU_SHOW
diff --git a/include/configs/o2dnt-common.h b/include/configs/o2dnt-common.h
index 16fa046687..891378420e 100644
--- a/include/configs/o2dnt-common.h
+++ b/include/configs/o2dnt-common.h
@@ -90,7 +90,6 @@
#error "CONFIG_SYS_TEXT_BASE value is invalid"
#endif
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "run master"
diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h
index 3f777b6aeb..96c3c4b958 100644
--- a/include/configs/omap3_cairo.h
+++ b/include/configs/omap3_cairo.h
@@ -74,8 +74,6 @@
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
/* devices */
/* override default CONFIG_BOOTDELAY */
-#undef CONFIG_BOOTDELAY
-#define CONFIG_BOOTDELAY 0
#define CONFIG_EXTRA_ENV_SETTINGS \
"machid=ffffffff\0" \
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 9dbca1c6f4..1726a3ed19 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -106,7 +106,6 @@
* Default environment
* -----------------------------------------------------------------------------
*/
-#define CONFIG_BOOTDELAY 3
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x82000000\0" \
diff --git a/include/configs/omap3_evm_quick_mmc.h b/include/configs/omap3_evm_quick_mmc.h
index a93a2fa0d6..b7d8765db5 100644
--- a/include/configs/omap3_evm_quick_mmc.h
+++ b/include/configs/omap3_evm_quick_mmc.h
@@ -55,7 +55,6 @@
* Default environment
* -----------------------------------------------------------------------------
*/
-#define CONFIG_BOOTDELAY 0
#define CONFIG_EXTRA_ENV_SETTINGS \
"verify=no\0" \
diff --git a/include/configs/omap3_evm_quick_nand.h b/include/configs/omap3_evm_quick_nand.h
index bb908fad3e..da5d32517d 100644
--- a/include/configs/omap3_evm_quick_nand.h
+++ b/include/configs/omap3_evm_quick_nand.h
@@ -45,7 +45,6 @@
* Default environment
* -----------------------------------------------------------------------------
*/
-#define CONFIG_BOOTDELAY 0
#define CONFIG_EXTRA_ENV_SETTINGS \
"verify=no\0" \
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index f3287e3ad3..1f36d36f45 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -204,7 +204,6 @@
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_BOOTARGS "console=ttyS2,115200n8 root=/dev/mmcblk0p2 rw rootwait ip=off"
#define CONFIG_BOOTCOMMAND "if mmc rescan 0; then if fatload mmc 0 0xc0600000 boot.scr; then source 0xc0600000; else fatload mmc 0 0xc0700000 uImage; bootm c0700000; fi; else sf probe 0; sf read 0xc0700000 0x80000 0x220000; bootm 0xc0700000; fi"
-#define CONFIG_BOOTDELAY 3
/*
* U-Boot commands
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 71b2fa9c07..4f22d12a3f 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -944,7 +944,6 @@
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 1000000
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#define CONFIG_BOOTARGS /* the boot command will set bootargs */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h
index 9b75afe92a..30bfbf44f5 100644
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -468,7 +468,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 1000000
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#define CONFIG_BOOTARGS /* the boot command will set bootargs */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index b907419a59..a649991d1a 100644
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -31,7 +31,6 @@
#endif
#endif
-#define CONFIG_BOOTDELAY 2 /* autoboot after 2 seconds */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h
index 0007c50ad9..80d5d6c858 100644
--- a/include/configs/pcm030.h
+++ b/include/configs/pcm030.h
@@ -70,7 +70,6 @@ Serial console configuration
/*-----------------------------------------------------------------------------
Autobooting
-----------------------------------------------------------------------------*/
-#define CONFIG_BOOTDELAY 3 /* autoboot after 3 seconds */
#define CONFIG_ZERO_BOOTDELAY_CHECK /* allow stopping of boot process */
/* even with bootdelay=0 */
#undef CONFIG_BOOTARGS
diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index 494524d065..74e22db151 100644
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -113,7 +113,6 @@
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
#define CONFIG_SYS_I2C_EEPROM_BUS 2
-#define CONFIG_BOOTDELAY 3
#define CONFIG_LOADADDR 0x82000000
diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h
index 3b6c7dc111..6d03d6908e 100644
--- a/include/configs/pdm360ng.h
+++ b/include/configs/pdm360ng.h
@@ -448,7 +448,6 @@
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 400000
-#define CONFIG_BOOTDELAY 5 /* -1 disables auto-boot */
#define CONFIG_PREBOOT "echo;" \
"echo PDM360NG SAMPLE;" \
diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h
index 319e3b5111..49c98d81c4 100644
--- a/include/configs/pic32mzdask.h
+++ b/include/configs/pic32mzdask.h
@@ -125,7 +125,6 @@
* Board boot configuration
*/
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
-#define CONFIG_BOOTDELAY 5
#define MEM_LAYOUT_ENV_SETTINGS \
"kernel_addr_r="__stringify(CONFIG_SYS_LOAD_ADDR)"\0" \
diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h
index 44ffd6d204..7d7315ea1c 100644
--- a/include/configs/picosam9g45.h
+++ b/include/configs/picosam9g45.h
@@ -61,7 +61,6 @@
#define CONFIG_AT91_LED
#define CONFIG_GREEN_LED AT91_PIN_PD31 /* this is the user1 led */
-#define CONFIG_BOOTDELAY 3
/*
* BOOTP options
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index 39af5c0240..0abd84a147 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -168,7 +168,6 @@
#define CONFIG_GREEN_LED GPIO_PIN_PC(13)
#define CONFIG_YELLOW_LED GPIO_PIN_PC(15)
-#define CONFIG_BOOTDELAY 3
/*
* BOOTP options
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 111e0f50cd..b8ce17e807 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -182,7 +182,6 @@
#define CONFIG_RED_LED GPIO_PIN_PB(7) /* this is the power led */
#define CONFIG_GREEN_LED GPIO_PIN_PB(8) /* this is the user1 led */
-#define CONFIG_BOOTDELAY 3
/*
* BOOTP options
diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index facba3864d..0e944d871f 100644
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -57,7 +57,6 @@
#define CONFIG_RED_LED GPIO_PIN_PD(31) /* this is the user1 led */
#define CONFIG_GREEN_LED GPIO_PIN_PD(0) /* this is the user2 led */
-#define CONFIG_BOOTDELAY 3
/*
* BOOTP options
diff --git a/include/configs/pr1.h b/include/configs/pr1.h
index 9b394ddb13..6804acb0cd 100644
--- a/include/configs/pr1.h
+++ b/include/configs/pr1.h
@@ -119,7 +119,6 @@
#define CONFIG_RTC_BFIN
#define CONFIG_UART_CONSOLE 0
#define CONFIG_BOOTCOMMAND "run nandboot"
-#define CONFIG_BOOTDELAY 2
#define CONFIG_LOADADDR 0x2000000
/*
diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index 7450a1a42a..794650a51c 100644
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -92,7 +92,6 @@
#ifndef CONFIG_RESTORE_FLASH
/* set to negative value for no autoboot */
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTCOMMAND \
"if dfubutton; then " \
@@ -118,7 +117,6 @@
"reset;"
#else
-#define CONFIG_BOOTDELAY 0
#define CONFIG_BOOTCOMMAND \
"setenv autoload no; " \
diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index f58fc4c377..546c508d27 100644
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -17,7 +17,6 @@
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_MISC_INIT_R
-#define CONFIG_BOOTDELAY 10 /* autoboot after 10 seconds */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h
index 2190d16200..6cab719203 100644
--- a/include/configs/qemu-mips64.h
+++ b/include/configs/qemu-mips64.h
@@ -17,7 +17,6 @@
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_MISC_INIT_R
-#define CONFIG_BOOTDELAY 10 /* autoboot after 10 seconds */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index 73b377155c..0b8640223f 100644
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -179,7 +179,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
#define CONFIG_BAUDRATE 115200
-#define CONFIG_BOOTDELAY 1
#define CONFIG_BOOTCOMMAND \
"test -n \"$qemu_kernel_addr\" && bootm $qemu_kernel_addr - $fdt_addr_r\0"
diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h
index 437ea92a98..c5e57244ab 100644
--- a/include/configs/r0p7734.h
+++ b/include/configs/r0p7734.h
@@ -22,7 +22,6 @@
#define CONFIG_CMD_ENV
#define CONFIG_BAUDRATE 115200
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTARGS "console=ttySC3,115200"
#define CONFIG_VERSION_VARIABLE
diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index bf81d2b0ee..1fc919b6eb 100644
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -22,7 +22,6 @@
#define CONFIG_CONS_SCIF1 1
#define CONFIG_BOARD_LATE_INIT
-#define CONFIG_BOOTDELAY -1
#define CONFIG_BOOTARGS "console=ttySC0,115200"
#define CONFIG_ENV_OVERWRITE 1
diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index 6097dc2ca8..c15580c582 100644
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -28,7 +28,6 @@
#define CONFIG_BAUDRATE 115200
#define CONFIG_CONS_SCIF0 1
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTARGS "console=ttySC0,115200"
#define CONFIG_ENV_OVERWRITE 1
diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h
index 47d23791c0..6c8681ab4a 100644
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -85,7 +85,6 @@
#ifndef CONFIG_RESTORE_FLASH
/* set to negative value for no autoboot */
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTCOMMAND \
"if dfubutton; then " \
@@ -97,7 +96,6 @@
"reset;"
#else
-#define CONFIG_BOOTDELAY 0
#define CONFIG_BOOTCOMMAND \
"setenv autoload no; " \
diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index 337ba02a63..80313fc8c5 100644
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -31,7 +31,6 @@
#define CONFIG_CMDLINE_EDITING
#define CONFIG_BAUDRATE 38400
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTARGS ""
#define CONFIG_VERSION_VARIABLE
diff --git a/include/configs/redwood.h b/include/configs/redwood.h
index 622b7c79e6..72fbf108fa 100644
--- a/include/configs/redwood.h
+++ b/include/configs/redwood.h
@@ -132,7 +132,6 @@
#define CONFIG_BOOTCOMMAND "run flash_self"
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_IBM_EMAC4_V4 1
#define CONFIG_PHY_RESET 1 /* reset phy upon startup */
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 9ef5eae304..dbbb81efa9 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -214,6 +214,5 @@
ENV_MEM_LAYOUT_SETTINGS \
BOOTENV
-#define CONFIG_BOOTDELAY 2
#endif
diff --git a/include/configs/rsk7264.h b/include/configs/rsk7264.h
index c60e233e9f..3f9fb7bc02 100644
--- a/include/configs/rsk7264.h
+++ b/include/configs/rsk7264.h
@@ -17,7 +17,6 @@
#define CONFIG_BAUDRATE 115200
#define CONFIG_BOOTARGS "console=ttySC3,115200"
-#define CONFIG_BOOTDELAY 3
#define CONFIG_SYS_BAUDRATE_TABLE { CONFIG_BAUDRATE }
#define CONFIG_SYS_LONGHELP 1 /* undef to save memory */
diff --git a/include/configs/rsk7269.h b/include/configs/rsk7269.h
index b4fbc9c17d..b7f361be25 100644
--- a/include/configs/rsk7269.h
+++ b/include/configs/rsk7269.h
@@ -16,7 +16,6 @@
#define CONFIG_BAUDRATE 115200
#define CONFIG_BOOTARGS "console=ttySC7,115200"
-#define CONFIG_BOOTDELAY 3
#define CONFIG_SYS_BAUDRATE_TABLE { CONFIG_BAUDRATE }
#define CONFIG_SYS_LONGHELP /* undef to save memory */
diff --git a/include/configs/rut.h b/include/configs/rut.h
index bf2cc2f2bb..b0dcbd8c5a 100644
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -85,7 +85,6 @@
#ifndef CONFIG_RESTORE_FLASH
/* set to negative value for no autoboot */
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTCOMMAND \
"if mmc rescan; then " \
@@ -107,7 +106,6 @@
"reset;"
#else
-#define CONFIG_BOOTDELAY 0
#define CONFIG_BOOTCOMMAND \
"setenv autoload no; " \
diff --git a/include/configs/sansa_fuze_plus.h b/include/configs/sansa_fuze_plus.h
index 0c8ecc181b..d58b9637f1 100644
--- a/include/configs/sansa_fuze_plus.h
+++ b/include/configs/sansa_fuze_plus.h
@@ -28,7 +28,6 @@
#define CONFIG_ENV_OVERWRITE
/* Booting Linux */
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_BOOTARGS "console=ttyAMA0,115200n8 "
#define CONFIG_LOADADDR 0x42000000
diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 6c0932a8df..567c4d588b 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -641,7 +641,6 @@
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 800000
-#define CONFIG_BOOTDELAY 6 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index bbd1a63344..46766a6779 100644
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -579,7 +579,6 @@
#define CONFIG_LOADADDR 1000000 /*default location for tftp and bootm*/
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs*/
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index c9970f1f3e..248785db38 100644
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -527,7 +527,6 @@
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 1000000
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h
index 42237d373e..b490b62c2d 100644
--- a/include/configs/sc_sps_1.h
+++ b/include/configs/sc_sps_1.h
@@ -52,7 +52,6 @@
#endif
/* Booting Linux */
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_BOOTARGS "console=ttyAMA0,115200"
#define CONFIG_BOOTCOMMAND "bootm"
diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h
index 80997a49bd..fb6e05fafc 100644
--- a/include/configs/sh7752evb.h
+++ b/include/configs/sh7752evb.h
@@ -24,7 +24,6 @@
#define CONFIG_MAC_PARTITION
#define CONFIG_BAUDRATE 115200
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTARGS "console=ttySC2,115200 root=/dev/nfs ip=dhcp"
#define CONFIG_VERSION_VARIABLE
diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h
index 248435b9d1..64e9e52e70 100644
--- a/include/configs/sh7753evb.h
+++ b/include/configs/sh7753evb.h
@@ -24,7 +24,6 @@
#define CONFIG_MAC_PARTITION
#define CONFIG_BAUDRATE 115200
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTARGS "console=ttySC2,115200 root=/dev/nfs ip=dhcp"
#define CONFIG_VERSION_VARIABLE
diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h
index 547b500308..f9a9a03ef4 100644
--- a/include/configs/sh7757lcr.h
+++ b/include/configs/sh7757lcr.h
@@ -24,7 +24,6 @@
#define CONFIG_MAC_PARTITION
#define CONFIG_BAUDRATE 115200
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTARGS "console=ttySC2,115200 root=/dev/nfs ip=dhcp"
#define CONFIG_VERSION_VARIABLE
diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h
index 9f1e6d7fee..538ba98ae5 100644
--- a/include/configs/sh7763rdp.h
+++ b/include/configs/sh7763rdp.h
@@ -20,7 +20,6 @@
#define CONFIG_CMD_SDRAM
#define CONFIG_CMD_JFFS2
-#define CONFIG_BOOTDELAY -1
#define CONFIG_BOOTARGS "console=ttySC2,115200 root=1f01"
#define CONFIG_ENV_OVERWRITE 1
diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index bd4c6bd13a..794c48c49a 100644
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -22,7 +22,6 @@
#define CONFIG_MAC_PARTITION
#define CONFIG_BAUDRATE 115200
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTARGS "console=ttySC1,115200 root=/dev/nfs ip=dhcp"
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index 40b0cd2132..fc4153aba8 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -178,7 +178,6 @@
#endif
/* General Boot Parameter */
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTCOMMAND "run flashboot"
#define CONFIG_SYS_CBSIZE 512
#define CONFIG_SYS_PBSIZE \
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index c5c0c2cb96..f733c35024 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -80,7 +80,6 @@
#define CONFIG_CMDLINE_EDITING
/* autoboot */
-#define CONFIG_BOOTDELAY 5
#define CONFIG_BOOT_RETRY_TIME -1
#define CONFIG_RESET_TO_RETRY
#define CONFIG_ZERO_BOOTDELAY_CHECK
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 0f1a1ecc29..fe41d17149 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -71,7 +71,6 @@
#define CONFIG_CMD_ONENAND
#define CONFIG_CMD_MTDPARTS
-#define CONFIG_BOOTDELAY 3
#define CONFIG_ZERO_BOOTDELAY_CHECK
diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index 16aefc25b4..7981a8d80b 100644
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -117,7 +117,6 @@
/* Boot options */
#define CONFIG_SYS_LOAD_ADDR 0x23000000
-#define CONFIG_BOOTDELAY 3
#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_BOOTP_BOOTFILESIZE
diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h
index ca7f8a28b2..3b0b41612d 100644
--- a/include/configs/socfpga_arria5_socdk.h
+++ b/include/configs/socfpga_arria5_socdk.h
@@ -18,7 +18,6 @@
#define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SoCDK */
/* Booting Linux */
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTFILE "zImage"
#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE)
#ifdef CONFIG_SOCFPGA_VIRTUAL_TARGET
diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h
index a2da7d47c5..7ced6a68a6 100644
--- a/include/configs/socfpga_cyclone5_socdk.h
+++ b/include/configs/socfpga_cyclone5_socdk.h
@@ -18,7 +18,6 @@
#define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SoCDK */
/* Booting Linux */
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTFILE "zImage"
#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE)
#ifdef CONFIG_SOCFPGA_VIRTUAL_TARGET
diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h
index fdddfa3cd2..6b9546e8f7 100644
--- a/include/configs/socfpga_de0_nano_soc.h
+++ b/include/configs/socfpga_de0_nano_soc.h
@@ -18,7 +18,6 @@
#define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */
/* Booting Linux */
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTFILE "fitImage"
#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE)
#define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot"
diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h
index f0fb43a82f..d1b31c4cfa 100644
--- a/include/configs/socfpga_mcvevk.h
+++ b/include/configs/socfpga_mcvevk.h
@@ -18,7 +18,6 @@
#define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on MCV */
/* Booting Linux */
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTFILE "fitImage"
#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE)
#define CONFIG_PREBOOT "run try_bootscript"
diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h
index 675f5d16e9..3fceb31df9 100644
--- a/include/configs/socfpga_sockit.h
+++ b/include/configs/socfpga_sockit.h
@@ -18,7 +18,6 @@
#define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SoCDK */
/* Booting Linux */
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTFILE "fitImage"
#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE)
#define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot"
diff --git a/include/configs/socfpga_socrates.h b/include/configs/socfpga_socrates.h
index 79c16ce91d..c9473df912 100644
--- a/include/configs/socfpga_socrates.h
+++ b/include/configs/socfpga_socrates.h
@@ -18,7 +18,6 @@
#define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SoCrates */
/* Booting Linux */
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTFILE "zImage"
#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE)
#define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot"
diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h
index c097f47edd..286e746a14 100644
--- a/include/configs/socfpga_sr1500.h
+++ b/include/configs/socfpga_sr1500.h
@@ -20,7 +20,6 @@
#define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SR1500 */
/* Booting Linux */
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE)
#define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot"
diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h
index 1ccde1a76f..1c7d45e4a8 100644
--- a/include/configs/socfpga_vining_fpga.h
+++ b/include/configs/socfpga_vining_fpga.h
@@ -21,7 +21,6 @@
#define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on VINING_FPGA */
/* Booting Linux */
-#define CONFIG_BOOTDELAY 5
#define CONFIG_BOOTFILE "openwrt-socfpga-socfpga_cyclone5_vining_fpga-fit-uImage.itb"
#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE)
#define CONFIG_BOOTCOMMAND "run selboot"
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 4ed524b023..624cef712d 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -346,7 +346,6 @@
#define CONFIG_LOADADDR 200000 /* default addr for tftp & bootm*/
-#define CONFIG_BOOTDELAY 1 /* -1 disables auto-boot */
#define CONFIG_PREBOOT "echo;" \
"echo Welcome on the ABB Socrates Board;" \
diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index 7b2d262b4b..43ba84ab58 100644
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -104,12 +104,6 @@
/*
* Default Environment Varible definitions
*/
-#if defined(CONFIG_SPEAR_USBTTY)
-#define CONFIG_BOOTDELAY -1
-#else
-#define CONFIG_BOOTDELAY 1
-#endif
-
#define CONFIG_ENV_OVERWRITE
/*
diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h
index d53f8c18a2..8bbe580ebf 100644
--- a/include/configs/stm32f429-discovery.h
+++ b/include/configs/stm32f429-discovery.h
@@ -82,7 +82,6 @@
"bootcmd_romfs=setenv bootargs ${bootargs} ${bootargs_romfs};" \
"bootm 0x08044000 - 0x08042000\0"
-#define CONFIG_BOOTDELAY 3
#define CONFIG_AUTOBOOT
/*
diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h
index 9d1f02ea15..e544a218dd 100644
--- a/include/configs/stm32f746-disco.h
+++ b/include/configs/stm32f746-disco.h
@@ -69,7 +69,6 @@
"bootcmd_romfs=setenv bootargs ${bootargs} ${bootargs_romfs};" \
"bootm 0x08044000 - 0x08042000\0"
-#define CONFIG_BOOTDELAY 3
/*
* Command line configuration.
diff --git a/include/configs/strider.h b/include/configs/strider.h
index 90492f4fdb..36561e0346 100644
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -659,7 +659,6 @@ void fpga_control_clear(unsigned int bus, int pin);
#define CONFIG_LOADADDR 800000 /* default location for tftp and bootm */
-#define CONFIG_BOOTDELAY 5 /* -1 disables auto-boot */
#define CONFIG_HOSTNAME hrcon
#define CONFIG_ROOTPATH "/opt/nfsroot"
diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h
index d3704a4e2c..bfd1bd7192 100644
--- a/include/configs/stv0991.h
+++ b/include/configs/stv0991.h
@@ -66,7 +66,6 @@
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTCOMMAND "go 0x40040000"
/*
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index 4d66dd2407..6616d7396e 100644
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -128,7 +128,6 @@
/* devices */
#define CONFIG_SYS_NAND_BUSWIDTH_16BIT
/* Environment information */
-#define CONFIG_BOOTDELAY 3
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x82000000\0" \
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index 321fb4756d..0b05289d07 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -60,7 +60,6 @@
#define CONFIG_USART_ID ATMEL_ID_SYS
#define CONFIG_BAUDRATE 115200
-#define CONFIG_BOOTDELAY 3
/*
* Command line configuration.
diff --git a/include/configs/tb100.h b/include/configs/tb100.h
index 870406b208..39bb5b35da 100644
--- a/include/configs/tb100.h
+++ b/include/configs/tb100.h
@@ -79,7 +79,6 @@
/*
* Environment configuration
*/
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_BOOTARGS "console=ttyS0,115200n8"
#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR
diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index 5fed55da1c..a03f87c2fb 100644
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -78,7 +78,6 @@
#ifndef CONFIG_RESTORE_FLASH
/* set to negative value for no autoboot */
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTCOMMAND \
"if dfubutton; then " \
@@ -90,7 +89,6 @@
"reset;"
#else
-#define CONFIG_BOOTDELAY 0
#define CONFIG_BOOTCOMMAND \
"setenv autoload no; " \
diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h
index e43a7fdf3c..5c3b3da73c 100644
--- a/include/configs/thunderx_88xx.h
+++ b/include/configs/thunderx_88xx.h
@@ -84,7 +84,6 @@
"earlycon=pl011,0x87e024000000 " \
"debug maxcpus=48 rootwait rw "\
"root=/dev/sda2 coherent_pool=16M"
-#define CONFIG_BOOTDELAY 5
/* Do not preserve environment */
#define CONFIG_ENV_IS_NOWHERE 1
diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index 09f8e8fe5c..3c058832e1 100644
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -39,7 +39,6 @@
/* commands to include */
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_BOOTDELAY 1 /* negative for no autoboot */
#define CONFIG_ENV_VARS_UBOOT_CONFIG
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index 2e84dd27e4..05fd00fd5d 100644
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -34,7 +34,6 @@
#define CONFIG_VERSION_VARIABLE
#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_BOOTDELAY 3 /* set negative for no autoboot */
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x81000000\0" \
diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h
index abe1da2bd6..74a9a098a0 100644
--- a/include/configs/tplink_wdr4300.h
+++ b/include/configs/tplink_wdr4300.h
@@ -39,7 +39,6 @@
#define CONFIG_SYS_BAUDRATE_TABLE \
{9600, 19200, 38400, 57600, 115200}
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTARGS \
"console=ttyS0,115200 root=/dev/mtdblock2 rootfstype=squashfs"
#define CONFIG_BOOTCOMMAND \
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 855d789c18..aed3931515 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -162,7 +162,6 @@
/* Environment information (this is the common part) */
-#define CONFIG_BOOTDELAY 0
/* hang() the board on panic() */
#define CONFIG_PANIC_HANG
diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h
index aa0605f28d..8b4726f19c 100644
--- a/include/configs/ts4800.h
+++ b/include/configs/ts4800.h
@@ -90,7 +90,6 @@
/* Environment variables */
-#define CONFIG_BOOTDELAY 1
#define CONFIG_LOADADDR 0x91000000 /* loadaddr env var */
diff --git a/include/configs/tseries.h b/include/configs/tseries.h
index b6a1ae0554..8ed9eb080d 100644
--- a/include/configs/tseries.h
+++ b/include/configs/tseries.h
@@ -195,7 +195,6 @@ MMCARGS
#define CONFIG_BOOTCOMMAND \
"run defboot;"
-#define CONFIG_BOOTDELAY 0
#ifdef CONFIG_NAND
/*
diff --git a/include/configs/twister.h b/include/configs/twister.h
index 4f5560fec3..66f4680b7e 100644
--- a/include/configs/twister.h
+++ b/include/configs/twister.h
@@ -20,7 +20,6 @@
#define CONFIG_TAM3517_SW3_SETTINGS
#define CONFIG_XR16L2751
-#define CONFIG_BOOTDELAY 10
#define CONFIG_BOOTFILE "uImage"
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index c826b200ba..9d14c2d59c 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -148,7 +148,6 @@
#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x01000000)
-#define CONFIG_BOOTDELAY 3
#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */
/*
diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h
index d118928ebd..ad54192194 100644
--- a/include/configs/usb_a9263.h
+++ b/include/configs/usb_a9263.h
@@ -46,7 +46,6 @@
#define CONFIG_USART_ID ATMEL_ID_SYS
#define CONFIG_BAUDRATE 115200
-#define CONFIG_BOOTDELAY 3
/*
* BOOTP options
diff --git a/include/configs/v38b.h b/include/configs/v38b.h
index 9a113f4e32..28c748d074 100644
--- a/include/configs/v38b.h
+++ b/include/configs/v38b.h
@@ -102,7 +102,6 @@
/*
* Autobooting
*/
-#define CONFIG_BOOTDELAY 3 /* autoboot after 3 seconds */
#define CONFIG_PREBOOT "echo;" \
"echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
diff --git a/include/configs/vct.h b/include/configs/vct.h
index cc5e3546b0..2bc98a8e8a 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -240,7 +240,6 @@ int vct_gpio_get(int pin);
#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10 /* and takes up to 10 msec */
#define CONFIG_BOOTCOMMAND "run test3"
-#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
/*
* UBI configuration
diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h
index 2425ebf669..83d0004f53 100644
--- a/include/configs/ve8313.h
+++ b/include/configs/ve8313.h
@@ -465,7 +465,6 @@
#define CONFIG_HOSTNAME ve8313
#define CONFIG_UBOOTPATH ve8313/u-boot.bin
-#define CONFIG_BOOTDELAY 6 /* -1 disables auto-boot */
#define CONFIG_BAUDRATE 115200
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index 6a3758216f..46cf83be02 100644
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -216,7 +216,6 @@
"fi ; " \
"booti ${kernel_addr} ${initrd_param} ${fdt_addr}"
-#define CONFIG_BOOTDELAY 1
#elif CONFIG_TARGET_VEXPRESS64_BASE_FVP
#define CONFIG_EXTRA_ENV_SETTINGS \
@@ -241,7 +240,6 @@
"fdt chosen ${initrd_addr} ${initrd_end}; " \
"booti $kernel_addr - $fdt_addr"
-#define CONFIG_BOOTDELAY 1
#elif CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM
#define CONFIG_EXTRA_ENV_SETTINGS \
@@ -260,7 +258,6 @@
#define CONFIG_BOOTCOMMAND "booti $kernel_addr $initrd_addr $fdt_addr"
-#define CONFIG_BOOTDELAY 1
#endif
diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index 6dc8f25b90..51898e623c 100644
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -168,7 +168,6 @@
/* Miscellaneous configurable options */
#define CONFIG_SYS_LOAD_ADDR (V2M_BASE + 0x8000)
#define LINUX_BOOT_PARAM_ADDR (V2M_BASE + 0x2000)
-#define CONFIG_BOOTDELAY 2
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 2
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index b240613bb5..c4a1fd091a 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -103,7 +103,6 @@
#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
#define CONFIG_SYS_SPD_BUS_NUM 0
-#define CONFIG_BOOTDELAY 3
#define CONFIG_SYS_LOAD_ADDR 0x82000000
diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index 732d091583..60513df032 100644
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -542,7 +542,6 @@
#define CONFIG_LOADADDR 800000 /* def location for tftp and bootm */
-#define CONFIG_BOOTDELAY 6 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* boot command will set bootargs */
#define CONFIG_BAUDRATE 9600
diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index 4dfcd28eaf..f112fa5f16 100644
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -9,7 +9,6 @@
#ifndef __WARP7_CONFIG_H
#define __WARP7_CONFIG_H
-#define CONFIG_BOOTDELAY 1
#include "mx7_common.h"
#define PHYS_SDRAM_SIZE SZ_512M
diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h
index a4ae304ade..153466a623 100644
--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@@ -97,7 +97,6 @@
#define CONFIG_NET_RETRY_COUNT 100
-#define CONFIG_BOOTDELAY 3
#define CONFIG_LOADADDR 0x80800000 /* loadaddr env var */
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index b81b6ff1fa..ba222f936f 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -175,7 +175,6 @@
#define CONFIG_INITRD_TAG
#define CONFIG_ZERO_BOOTDELAY_CHECK
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_BOOTARGS "console=ttyS2,115200n8"
diff --git a/include/configs/x600.h b/include/configs/x600.h
index 07c8abe2a7..71c0b45842 100644
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -124,7 +124,6 @@
#define CONFIG_SUPPORT_VFAT
#define CONFIG_DOS_PARTITION
-#define CONFIG_BOOTDELAY 3
/*
* U-Boot Environment placing definitions.
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index b4aad6cd24..fdefeaf24c 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -225,6 +225,5 @@
"tftpboot $loadaddr $bootfile;" \
"zboot $loadaddr"
-#define CONFIG_BOOTDELAY 2
#endif /* __CONFIG_H */
diff --git a/include/configs/xfi3.h b/include/configs/xfi3.h
index 4d68c21ae0..69558fdfd2 100644
--- a/include/configs/xfi3.h
+++ b/include/configs/xfi3.h
@@ -28,7 +28,6 @@
#define CONFIG_ENV_OVERWRITE
/* Booting Linux */
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_BOOTARGS "console=ttyAMA0,115200n8 "
#define CONFIG_LOADADDR 0x42000000
diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h
index 067cfa69f2..e97e9d0816 100644
--- a/include/configs/xilinx-ppc.h
+++ b/include/configs/xilinx-ppc.h
@@ -33,7 +33,6 @@
#undef CONFIG_CMD_EEPROM
/*Misc*/
-#define CONFIG_BOOTDELAY 5/* autoboot after 5 seconds */
#define CONFIG_SYS_LONGHELP /* undef to save memory */
#if defined(CONFIG_CMD_KGDB)
#define CONFIG_SYS_CBSIZE 1024/* Console I/O Buffer Size */
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index b848150182..e776e32412 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -144,7 +144,6 @@
# define DFU_ALT_INFO
#endif
-#define CONFIG_BOOTDELAY 3
#define CONFIG_BOARD_LATE_INIT
diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h
index 9838fbfa2e..73c8d5b6fd 100644
--- a/include/configs/xpedite1000.h
+++ b/include/configs/xpedite1000.h
@@ -196,7 +196,6 @@ extern void out32(unsigned int, unsigned long);
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
#define CONFIG_CMDLINE_EDITING 1 /* Command-line editing */
-#define CONFIG_BOOTDELAY 3 /* -1 disables auto-boot */
#define CONFIG_PANIC_HANG /* do not reset board on panic */
#define CONFIG_PREBOOT /* enable preboot variable */
#define CONFIG_INTEGRITY /* support booting INTEGRITY OS */
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index 86c9b4c41f..9f3158d056 100644
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -536,7 +536,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
#define CONFIG_CMDLINE_EDITING 1 /* Command-line editing */
#define CONFIG_LOADADDR 0x1000000 /* default location for tftp and bootm */
-#define CONFIG_BOOTDELAY 3 /* -1 disables auto-boot */
#define CONFIG_PANIC_HANG /* do not reset board on panic */
#define CONFIG_PREBOOT /* enable preboot variable */
#define CONFIG_INTEGRITY /* support booting INTEGRITY OS */
diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h
index d1847ac2e8..a418fc5c9e 100644
--- a/include/configs/xpedite520x.h
+++ b/include/configs/xpedite520x.h
@@ -319,7 +319,6 @@
#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
#define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */
#define CONFIG_LOADADDR 0x1000000 /* default location for tftp and bootm */
-#define CONFIG_BOOTDELAY 3 /* -1 disables auto-boot */
#define CONFIG_PANIC_HANG /* do not reset board on panic */
#define CONFIG_PREBOOT /* enable preboot variable */
#define CONFIG_INTEGRITY /* support booting INTEGRITY OS */
diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h
index 6a06b0ab1c..36df6682b2 100644
--- a/include/configs/xpedite537x.h
+++ b/include/configs/xpedite537x.h
@@ -391,7 +391,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
#define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */
#define CONFIG_LOADADDR 0x1000000 /* default location for tftp and bootm */
-#define CONFIG_BOOTDELAY 3 /* -1 disables auto-boot */
#define CONFIG_PANIC_HANG /* do not reset board on panic */
#define CONFIG_PREBOOT /* enable preboot variable */
#define CONFIG_INTEGRITY /* support booting INTEGRITY OS */
diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h
index 5b377e35ee..1794ba10a3 100644
--- a/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@ -375,7 +375,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
#define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */
#define CONFIG_LOADADDR 0x1000000 /* default location for tftp and bootm */
-#define CONFIG_BOOTDELAY 3 /* -1 disables auto-boot */
#define CONFIG_PANIC_HANG /* do not reset board on panic */
#define CONFIG_PREBOOT /* enable preboot variable */
#define CONFIG_INTEGRITY /* support booting INTEGRITY OS */
diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index fcd7772642..6e83cc9180 100644
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -40,7 +40,6 @@
#define CONFIG_BOOTARGS \
"console=tty0 console=ttyS2,115200 fbcon=rotate:3"
#define CONFIG_TIMESTAMP
-#define CONFIG_BOOTDELAY 2 /* Autoboot delay */
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_SYS_TEXT_BASE 0x0
diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index 264bb63c06..ea1ead23b7 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -137,7 +137,6 @@
#define CONFIG_PREBOOT ""
-#define CONFIG_BOOTDELAY 5
/*
* Size of malloc() pool
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 82ece0df2d..8dbac8728f 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -236,7 +236,6 @@
#endif
#define CONFIG_BOOTCOMMAND "run $modeboot"
-#define CONFIG_BOOTDELAY 3 /* -1 to Disable autoboot */
#define CONFIG_SYS_LOAD_ADDR 0 /* default? */
/* Miscellaneous configurable options */