All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 0/2] config: move CONFIG_BOOTDELAY to defconfig
@ 2015-10-08 19:10 Igor Grinberg
  2015-10-08 19:10 ` [U-Boot] [PATCH 1/2] Kconfig: add CONFIG_BOOTDELAY Igor Grinberg
  2015-10-08 19:10 ` [U-Boot] [PATCH 2/2] config: move CONFIG_BOOTDELAY to defconfig Igor Grinberg
  0 siblings, 2 replies; 6+ messages in thread
From: Igor Grinberg @ 2015-10-08 19:10 UTC (permalink / raw)
  To: u-boot

Move the CONFIG_BOOTDELAY to defconfig way.
The second patch is quite large. I'm not sure the mailing list will
accept it.
If it will not, then please tell me if can put it on a github
or any other way of delivery.

Igor Grinberg (2):
  Kconfig: add CONFIG_BOOTDELAY
  config: move CONFIG_BOOTDELAY to defconfig

 common/Kconfig                                         | 10 ++++++++++
 configs/A10-OLinuXino-Lime_defconfig                   |  1 +
 configs/A10s-OLinuXino-M_defconfig                     |  1 +
 configs/A13-OLinuXinoM_defconfig                       |  1 +
 configs/A13-OLinuXino_defconfig                        |  1 +
 configs/A20-OLinuXino-Lime2_defconfig                  |  1 +
 configs/A20-OLinuXino-Lime_defconfig                   |  1 +
 configs/A20-OLinuXino_MICRO_defconfig                  |  1 +
 configs/A20-Olimex-SOM-EVB_defconfig                   |  1 +
 configs/Ainol_AW1_defconfig                            |  1 +
 configs/Ampe_A76_defconfig                             |  1 +
 configs/Auxtek-T003_defconfig                          |  1 +
 configs/Auxtek-T004_defconfig                          |  1 +
 configs/B4420QDS_NAND_defconfig                        |  1 +
 configs/B4420QDS_SPIFLASH_defconfig                    |  1 +
 configs/B4420QDS_defconfig                             |  1 +
 configs/B4860QDS_NAND_defconfig                        |  1 +
 configs/B4860QDS_SECURE_BOOT_defconfig                 |  1 +
 configs/B4860QDS_SPIFLASH_defconfig                    |  1 +
 configs/B4860QDS_SRIO_PCIE_BOOT_defconfig              |  1 +
 configs/B4860QDS_defconfig                             |  1 +
 configs/BSC9131RDB_NAND_SYSCLK100_defconfig            |  1 +
 configs/BSC9131RDB_NAND_defconfig                      |  1 +
 configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig        |  1 +
 configs/BSC9131RDB_SPIFLASH_defconfig                  |  1 +
 configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig     |  1 +
 configs/BSC9132QDS_NAND_DDRCLK100_defconfig            |  1 +
 configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig     |  1 +
 configs/BSC9132QDS_NAND_DDRCLK133_defconfig            |  1 +
 configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig      |  1 +
 configs/BSC9132QDS_NOR_DDRCLK100_defconfig             |  1 +
 configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig      |  1 +
 configs/BSC9132QDS_NOR_DDRCLK133_defconfig             |  1 +
 configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig   |  1 +
 configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig          |  1 +
 configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig   |  1 +
 configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig          |  1 +
 configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig |  1 +
 configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig        |  1 +
 configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig |  1 +
 configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig        |  1 +
 configs/Bananapi_defconfig                             |  1 +
 configs/Bananapro_defconfig                            |  1 +
 configs/C29XPCIE_NOR_SECBOOT_defconfig                 |  1 +
 configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig            |  1 +
 configs/CSQ_CS908_defconfig                            |  1 +
 configs/Chuwi_V7_CW0825_defconfig                      |  1 +
 configs/Colombus_defconfig                             |  1 +
 configs/Cubieboard2_defconfig                          |  1 +
 configs/Cubieboard_defconfig                           |  1 +
 configs/Cubietruck_defconfig                           |  1 +
 configs/Et_q8_v1_6_defconfig                           |  1 +
 configs/Hummingbird_A31_defconfig                      |  1 +
 configs/Hyundai_A7HD_defconfig                         |  1 +
 configs/Ippo_q8h_v1_2_a33_1024x600_defconfig           |  1 +
 configs/Ippo_q8h_v1_2_defconfig                        |  1 +
 configs/Ippo_q8h_v5_defconfig                          |  1 +
 configs/Linksprite_pcDuino3_Nano_defconfig             |  1 +
 configs/Linksprite_pcDuino3_defconfig                  |  1 +
 configs/Linksprite_pcDuino_defconfig                   |  1 +
 configs/M5253DEMO_defconfig                            |  1 +
 configs/M5253EVBE_defconfig                            |  1 +
 configs/M5272C3_defconfig                              |  1 +
 configs/M5275EVB_defconfig                             |  1 +
 configs/M5282EVB_defconfig                             |  1 +
 configs/M54418TWR_defconfig                            |  1 +
 configs/M54418TWR_nand_mii_defconfig                   |  1 +
 configs/M54418TWR_nand_rmii_defconfig                  |  1 +
 configs/M54418TWR_nand_rmii_lowfreq_defconfig          |  1 +
 configs/M54418TWR_serial_mii_defconfig                 |  1 +
 configs/M54418TWR_serial_rmii_defconfig                |  1 +
 configs/MIP405T_defconfig                              |  1 +
 configs/MIP405_defconfig                               |  1 +
 configs/MK808C_defconfig                               |  1 +
 configs/MPC8308RDB_defconfig                           |  1 +
 configs/MPC8313ERDB_33_defconfig                       |  1 +
 configs/MPC8313ERDB_66_defconfig                       |  1 +
 configs/MPC8313ERDB_NAND_33_defconfig                  |  1 +
 configs/MPC8313ERDB_NAND_66_defconfig                  |  1 +
 configs/MPC8315ERDB_defconfig                          |  1 +
 configs/MPC8323ERDB_defconfig                          |  1 +
 configs/MPC832XEMDS_ATM_defconfig                      |  1 +
 configs/MPC832XEMDS_HOST_33_defconfig                  |  1 +
 configs/MPC832XEMDS_HOST_66_defconfig                  |  1 +
 configs/MPC832XEMDS_SLAVE_defconfig                    |  1 +
 configs/MPC832XEMDS_defconfig                          |  1 +
 configs/MPC8349EMDS_defconfig                          |  1 +
 configs/MPC8349ITXGP_defconfig                         |  1 +
 configs/MPC8349ITX_LOWBOOT_defconfig                   |  1 +
 configs/MPC8349ITX_defconfig                           |  1 +
 configs/MPC837XEMDS_HOST_defconfig                     |  1 +
 configs/MPC837XEMDS_defconfig                          |  1 +
 configs/MPC837XERDB_defconfig                          |  1 +
 configs/MPC8536DS_36BIT_defconfig                      |  1 +
 configs/MPC8536DS_SDCARD_defconfig                     |  1 +
 configs/MPC8536DS_SPIFLASH_defconfig                   |  1 +
 configs/MPC8536DS_defconfig                            |  1 +
 configs/MPC8540ADS_defconfig                           |  1 +
 configs/MPC8541CDS_defconfig                           |  1 +
 configs/MPC8541CDS_legacy_defconfig                    |  1 +
 configs/MPC8544DS_defconfig                            |  1 +
 configs/MPC8548CDS_36BIT_defconfig                     |  1 +
 configs/MPC8548CDS_defconfig                           |  1 +
 configs/MPC8548CDS_legacy_defconfig                    |  1 +
 configs/MPC8555CDS_defconfig                           |  1 +
 configs/MPC8555CDS_legacy_defconfig                    |  1 +
 configs/MPC8560ADS_defconfig                           |  1 +
 configs/MPC8568MDS_defconfig                           |  1 +
 configs/MPC8569MDS_ATM_defconfig                       |  1 +
 configs/MPC8569MDS_defconfig                           |  1 +
 configs/MPC8572DS_36BIT_defconfig                      |  1 +
 configs/MPC8572DS_defconfig                            |  1 +
 configs/MPC8610HPCD_defconfig                          |  1 +
 configs/MPC8641HPCN_36BIT_defconfig                    |  1 +
 configs/MPC8641HPCN_defconfig                          |  1 +
 configs/MSI_Primo73_defconfig                          |  1 +
 configs/MSI_Primo81_defconfig                          |  1 +
 configs/Marsboard_A10_defconfig                        |  1 +
 configs/Mele_A1000G_quad_defconfig                     |  1 +
 configs/Mele_A1000_defconfig                           |  1 +
 configs/Mele_I7_defconfig                              |  1 +
 configs/Mele_M3_defconfig                              |  1 +
 configs/Mele_M5_defconfig                              |  1 +
 configs/Mele_M9_defconfig                              |  1 +
 configs/Merrii_A80_Optimus_defconfig                   |  1 +
 configs/Mini-X_defconfig                               |  1 +
 configs/MiniFAP_defconfig                              |  1 +
 configs/O2D300_defconfig                               |  1 +
 configs/O2DNT2_RAMBOOT_defconfig                       |  1 +
 configs/O2DNT2_defconfig                               |  1 +
 configs/O2D_defconfig                                  |  1 +
 configs/O2I_defconfig                                  |  1 +
 configs/O2MNT_O2M110_defconfig                         |  1 +
 configs/O2MNT_O2M112_defconfig                         |  1 +
 configs/O2MNT_O2M113_defconfig                         |  1 +
 configs/O2MNT_defconfig                                |  1 +
 configs/O3DNT_defconfig                                |  1 +
 configs/Orangepi_defconfig                             |  1 +
 configs/Orangepi_mini_defconfig                        |  1 +
 configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig       |  1 +
 configs/P1010RDB-PA_36BIT_NAND_defconfig               |  1 +
 configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig        |  1 +
 configs/P1010RDB-PA_36BIT_NOR_defconfig                |  1 +
 configs/P1010RDB-PA_36BIT_SDCARD_defconfig             |  1 +
 configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig   |  1 +
 configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig           |  1 +
 configs/P1010RDB-PA_NAND_SECBOOT_defconfig             |  1 +
 configs/P1010RDB-PA_NAND_defconfig                     |  1 +
 configs/P1010RDB-PA_NOR_SECBOOT_defconfig              |  1 +
 configs/P1010RDB-PA_NOR_defconfig                      |  1 +
 configs/P1010RDB-PA_SDCARD_defconfig                   |  1 +
 configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig         |  1 +
 configs/P1010RDB-PA_SPIFLASH_defconfig                 |  1 +
 configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig       |  1 +
 configs/P1010RDB-PB_36BIT_NAND_defconfig               |  1 +
 configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig        |  1 +
 configs/P1010RDB-PB_36BIT_NOR_defconfig                |  1 +
 configs/P1010RDB-PB_36BIT_SDCARD_defconfig             |  1 +
 configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig   |  1 +
 configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig           |  1 +
 configs/P1010RDB-PB_NAND_SECBOOT_defconfig             |  1 +
 configs/P1010RDB-PB_NAND_defconfig                     |  1 +
 configs/P1010RDB-PB_NOR_SECBOOT_defconfig              |  1 +
 configs/P1010RDB-PB_NOR_defconfig                      |  1 +
 configs/P1010RDB-PB_SDCARD_defconfig                   |  1 +
 configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig         |  1 +
 configs/P1010RDB-PB_SPIFLASH_defconfig                 |  1 +
 configs/P1020MBG-PC_36BIT_SDCARD_defconfig             |  1 +
 configs/P1020MBG-PC_36BIT_defconfig                    |  1 +
 configs/P1020MBG-PC_SDCARD_defconfig                   |  1 +
 configs/P1020MBG-PC_defconfig                          |  1 +
 configs/P1020RDB-PC_36BIT_NAND_defconfig               |  1 +
 configs/P1020RDB-PC_36BIT_SDCARD_defconfig             |  1 +
 configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig           |  1 +
 configs/P1020RDB-PC_36BIT_defconfig                    |  1 +
 configs/P1020RDB-PC_NAND_defconfig                     |  1 +
 configs/P1020RDB-PC_SDCARD_defconfig                   |  1 +
 configs/P1020RDB-PC_SPIFLASH_defconfig                 |  1 +
 configs/P1020RDB-PC_defconfig                          |  1 +
 configs/P1020RDB-PD_NAND_defconfig                     |  1 +
 configs/P1020RDB-PD_SDCARD_defconfig                   |  1 +
 configs/P1020RDB-PD_SPIFLASH_defconfig                 |  1 +
 configs/P1020RDB-PD_defconfig                          |  1 +
 configs/P1020UTM-PC_36BIT_SDCARD_defconfig             |  1 +
 configs/P1020UTM-PC_36BIT_defconfig                    |  1 +
 configs/P1020UTM-PC_SDCARD_defconfig                   |  1 +
 configs/P1020UTM-PC_defconfig                          |  1 +
 configs/P1021RDB-PC_36BIT_NAND_defconfig               |  1 +
 configs/P1021RDB-PC_36BIT_SDCARD_defconfig             |  1 +
 configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig           |  1 +
 configs/P1021RDB-PC_36BIT_defconfig                    |  1 +
 configs/P1021RDB-PC_NAND_defconfig                     |  1 +
 configs/P1021RDB-PC_SDCARD_defconfig                   |  1 +
 configs/P1021RDB-PC_SPIFLASH_defconfig                 |  1 +
 configs/P1021RDB-PC_defconfig                          |  1 +
 configs/P1022DS_36BIT_NAND_defconfig                   |  1 +
 configs/P1022DS_36BIT_SDCARD_defconfig                 |  1 +
 configs/P1022DS_36BIT_SPIFLASH_defconfig               |  1 +
 configs/P1022DS_36BIT_defconfig                        |  1 +
 configs/P1022DS_NAND_defconfig                         |  1 +
 configs/P1022DS_SDCARD_defconfig                       |  1 +
 configs/P1022DS_SPIFLASH_defconfig                     |  1 +
 configs/P1022DS_defconfig                              |  1 +
 configs/P1024RDB_36BIT_defconfig                       |  1 +
 configs/P1024RDB_NAND_defconfig                        |  1 +
 configs/P1024RDB_SDCARD_defconfig                      |  1 +
 configs/P1024RDB_SPIFLASH_defconfig                    |  1 +
 configs/P1024RDB_defconfig                             |  1 +
 configs/P1025RDB_36BIT_defconfig                       |  1 +
 configs/P1025RDB_NAND_defconfig                        |  1 +
 configs/P1025RDB_SDCARD_defconfig                      |  1 +
 configs/P1025RDB_SPIFLASH_defconfig                    |  1 +
 configs/P1025RDB_defconfig                             |  1 +
 configs/P2020RDB-PC_36BIT_NAND_defconfig               |  1 +
 configs/P2020RDB-PC_36BIT_SDCARD_defconfig             |  1 +
 configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig           |  1 +
 configs/P2020RDB-PC_36BIT_defconfig                    |  1 +
 configs/P2020RDB-PC_NAND_defconfig                     |  1 +
 configs/P2020RDB-PC_SDCARD_defconfig                   |  1 +
 configs/P2020RDB-PC_SPIFLASH_defconfig                 |  1 +
 configs/P2020RDB-PC_defconfig                          |  1 +
 configs/P2041RDB_NAND_defconfig                        |  1 +
 configs/P2041RDB_SDCARD_defconfig                      |  1 +
 configs/P2041RDB_SECURE_BOOT_defconfig                 |  1 +
 configs/P2041RDB_SPIFLASH_defconfig                    |  1 +
 configs/P2041RDB_SRIO_PCIE_BOOT_defconfig              |  1 +
 configs/P2041RDB_defconfig                             |  1 +
 configs/P3041DS_NAND_SECURE_BOOT_defconfig             |  1 +
 configs/P3041DS_NAND_defconfig                         |  1 +
 configs/P3041DS_SDCARD_defconfig                       |  1 +
 configs/P3041DS_SECURE_BOOT_defconfig                  |  1 +
 configs/P3041DS_SPIFLASH_defconfig                     |  1 +
 configs/P3041DS_SRIO_PCIE_BOOT_defconfig               |  1 +
 configs/P3041DS_defconfig                              |  1 +
 configs/P4080DS_SDCARD_defconfig                       |  1 +
 configs/P4080DS_SECURE_BOOT_defconfig                  |  1 +
 configs/P4080DS_SPIFLASH_defconfig                     |  1 +
 configs/P4080DS_SRIO_PCIE_BOOT_defconfig               |  1 +
 configs/P4080DS_defconfig                              |  1 +
 configs/P5020DS_NAND_SECURE_BOOT_defconfig             |  1 +
 configs/P5020DS_NAND_defconfig                         |  1 +
 configs/P5020DS_SDCARD_defconfig                       |  1 +
 configs/P5020DS_SECURE_BOOT_defconfig                  |  1 +
 configs/P5020DS_SPIFLASH_defconfig                     |  1 +
 configs/P5020DS_SRIO_PCIE_BOOT_defconfig               |  1 +
 configs/P5020DS_defconfig                              |  1 +
 configs/P5040DS_NAND_SECURE_BOOT_defconfig             |  1 +
 configs/P5040DS_NAND_defconfig                         |  1 +
 configs/P5040DS_SDCARD_defconfig                       |  1 +
 configs/P5040DS_SECURE_BOOT_defconfig                  |  1 +
 configs/P5040DS_SPIFLASH_defconfig                     |  1 +
 configs/P5040DS_defconfig                              |  1 +
 configs/PATI_defconfig                                 |  1 +
 configs/PIP405_defconfig                               |  1 +
 configs/Sinlinx_SinA33_defconfig                       |  1 +
 configs/T1023RDB_NAND_defconfig                        |  1 +
 configs/T1023RDB_SDCARD_defconfig                      |  1 +
 configs/T1023RDB_SECURE_BOOT_defconfig                 |  1 +
 configs/T1023RDB_SPIFLASH_defconfig                    |  1 +
 configs/T1023RDB_defconfig                             |  1 +
 configs/T1024QDS_DDR4_SECURE_BOOT_defconfig            |  1 +
 configs/T1024QDS_DDR4_defconfig                        |  1 +
 configs/T1024QDS_NAND_defconfig                        |  1 +
 configs/T1024QDS_SDCARD_defconfig                      |  1 +
 configs/T1024QDS_SECURE_BOOT_defconfig                 |  1 +
 configs/T1024QDS_SPIFLASH_defconfig                    |  1 +
 configs/T1024QDS_defconfig                             |  1 +
 configs/T1024RDB_NAND_defconfig                        |  1 +
 configs/T1024RDB_SDCARD_defconfig                      |  1 +
 configs/T1024RDB_SECURE_BOOT_defconfig                 |  1 +
 configs/T1024RDB_SPIFLASH_defconfig                    |  1 +
 configs/T1024RDB_defconfig                             |  1 +
 configs/T1040D4RDB_NAND_defconfig                      |  1 +
 configs/T1040D4RDB_SDCARD_defconfig                    |  1 +
 configs/T1040D4RDB_SECURE_BOOT_defconfig               |  1 +
 configs/T1040D4RDB_SPIFLASH_defconfig                  |  1 +
 configs/T1040D4RDB_defconfig                           |  1 +
 configs/T1040QDS_DDR4_defconfig                        |  1 +
 configs/T1040QDS_SECURE_BOOT_defconfig                 |  1 +
 configs/T1040QDS_defconfig                             |  1 +
 configs/T1040RDB_NAND_defconfig                        |  1 +
 configs/T1040RDB_SDCARD_defconfig                      |  1 +
 configs/T1040RDB_SECURE_BOOT_defconfig                 |  1 +
 configs/T1040RDB_SPIFLASH_defconfig                    |  1 +
 configs/T1040RDB_defconfig                             |  1 +
 configs/T1042D4RDB_NAND_defconfig                      |  1 +
 configs/T1042D4RDB_SDCARD_defconfig                    |  1 +
 configs/T1042D4RDB_SECURE_BOOT_defconfig               |  1 +
 configs/T1042D4RDB_SPIFLASH_defconfig                  |  1 +
 configs/T1042D4RDB_defconfig                           |  1 +
 configs/T1042RDB_PI_NAND_defconfig                     |  1 +
 configs/T1042RDB_PI_SDCARD_defconfig                   |  1 +
 configs/T1042RDB_PI_SPIFLASH_defconfig                 |  1 +
 configs/T1042RDB_PI_defconfig                          |  1 +
 configs/T1042RDB_SECURE_BOOT_defconfig                 |  1 +
 configs/T1042RDB_defconfig                             |  1 +
 configs/T2080QDS_NAND_defconfig                        |  1 +
 configs/T2080QDS_SDCARD_defconfig                      |  1 +
 configs/T2080QDS_SECURE_BOOT_defconfig                 |  1 +
 configs/T2080QDS_SPIFLASH_defconfig                    |  1 +
 configs/T2080QDS_SRIO_PCIE_BOOT_defconfig              |  1 +
 configs/T2080QDS_defconfig                             |  1 +
 configs/T2080RDB_NAND_defconfig                        |  1 +
 configs/T2080RDB_SDCARD_defconfig                      |  1 +
 configs/T2080RDB_SECURE_BOOT_defconfig                 |  1 +
 configs/T2080RDB_SPIFLASH_defconfig                    |  1 +
 configs/T2080RDB_SRIO_PCIE_BOOT_defconfig              |  1 +
 configs/T2080RDB_defconfig                             |  1 +
 configs/T2081QDS_NAND_defconfig                        |  1 +
 configs/T2081QDS_SDCARD_defconfig                      |  1 +
 configs/T2081QDS_SPIFLASH_defconfig                    |  1 +
 configs/T2081QDS_SRIO_PCIE_BOOT_defconfig              |  1 +
 configs/T2081QDS_defconfig                             |  1 +
 configs/T4160QDS_NAND_defconfig                        |  1 +
 configs/T4160QDS_SDCARD_defconfig                      |  1 +
 configs/T4160QDS_SECURE_BOOT_defconfig                 |  1 +
 configs/T4160QDS_defconfig                             |  1 +
 configs/T4160RDB_defconfig                             |  1 +
 configs/T4240QDS_NAND_defconfig                        |  1 +
 configs/T4240QDS_SDCARD_defconfig                      |  1 +
 configs/T4240QDS_SECURE_BOOT_defconfig                 |  1 +
 configs/T4240QDS_SRIO_PCIE_BOOT_defconfig              |  1 +
 configs/T4240QDS_defconfig                             |  1 +
 configs/T4240RDB_SDCARD_defconfig                      |  1 +
 configs/T4240RDB_defconfig                             |  1 +
 configs/TQM5200S_HIGHBOOT_defconfig                    |  1 +
 configs/TQM5200S_defconfig                             |  1 +
 configs/TQM5200_B_HIGHBOOT_defconfig                   |  1 +
 configs/TQM5200_B_defconfig                            |  1 +
 configs/TQM5200_STK100_defconfig                       |  1 +
 configs/TQM5200_defconfig                              |  1 +
 configs/TQM823L_LCD_defconfig                          |  1 +
 configs/TQM823L_defconfig                              |  1 +
 configs/TQM823M_defconfig                              |  1 +
 configs/TQM834x_defconfig                              |  1 +
 configs/TQM850L_defconfig                              |  1 +
 configs/TQM850M_defconfig                              |  1 +
 configs/TQM855L_defconfig                              |  1 +
 configs/TQM855M_defconfig                              |  1 +
 configs/TQM860L_defconfig                              |  1 +
 configs/TQM860M_defconfig                              |  1 +
 configs/TQM862L_defconfig                              |  1 +
 configs/TQM862M_defconfig                              |  1 +
 configs/TQM866M_defconfig                              |  1 +
 configs/TQM885D_defconfig                              |  1 +
 configs/TTTech_defconfig                               |  1 +
 configs/TWR-P1025_defconfig                            |  1 +
 configs/TZX-Q8-713B7_defconfig                         |  1 +
 configs/UCP1020_SPIFLASH_defconfig                     |  1 +
 configs/UCP1020_defconfig                              |  1 +
 configs/UTOO_P66_defconfig                             |  1 +
 configs/VCMA9_defconfig                                |  1 +
 configs/Wexler_TAB7200_defconfig                       |  1 +
 configs/Wits_Pro_A20_DKT_defconfig                     |  1 +
 configs/Wobo_i5_defconfig                              |  1 +
 configs/Yones_Toptech_BD1078_defconfig                 |  1 +
 configs/a4m072_defconfig                               |  1 +
 configs/ac14xx_defconfig                               |  1 +
 configs/acadia_defconfig                               |  1 +
 configs/am335x_sl50_defconfig                          |  1 +
 configs/am3517_crane_defconfig                         |  1 +
 configs/am3517_evm_defconfig                           |  1 +
 configs/apalis_t30_defconfig                           |  1 +
 configs/apf27_defconfig                                |  1 +
 configs/arches_defconfig                               |  1 +
 configs/aria_defconfig                                 |  1 +
 configs/arndale_defconfig                              |  1 +
 configs/ba10_tv_box_defconfig                          |  1 +
 configs/bamboo_defconfig                               |  1 +
 configs/beaver_defconfig                               |  1 +
 configs/bf525-ucr2_defconfig                           |  1 +
 configs/bf537-minotaur_defconfig                       |  1 +
 configs/bf537-srv1_defconfig                           |  1 +
 configs/blackstamp_defconfig                           |  1 +
 configs/blackvme_defconfig                             |  1 +
 configs/br4_defconfig                                  |  1 +
 configs/bubinga_defconfig                              |  1 +
 configs/caddy2_defconfig                               |  1 +
 configs/cairo_defconfig                                |  1 +
 configs/calimain_defconfig                             |  1 +
 configs/cam5200_defconfig                              |  1 +
 configs/cam5200_niosflash_defconfig                    |  1 +
 configs/canmb_defconfig                                |  1 +
 configs/canyonlands_defconfig                          |  1 +
 configs/cardhu_defconfig                               |  1 +
 configs/charon_defconfig                               |  1 +
 configs/chromebook_jerry_defconfig                     |  1 +
 configs/cm5200_defconfig                               |  1 +
 configs/cm_t43_defconfig                               |  1 +
 configs/cobra5272_defconfig                            |  1 +
 configs/colibri_pxa270_defconfig                       |  1 +
 configs/colibri_t20_defconfig                          |  1 +
 configs/colibri_t30_defconfig                          |  1 +
 configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig  |  1 +
 configs/controlcenterd_36BIT_SDCARD_defconfig          |  1 +
 configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig   |  1 +
 configs/controlcenterd_TRAILBLAZER_defconfig           |  1 +
 configs/dalmore_defconfig                              |  1 +
 configs/dbau1000_defconfig                             |  1 +
 configs/dbau1100_defconfig                             |  1 +
 configs/dbau1500_defconfig                             |  1 +
 configs/dbau1550_defconfig                             |  1 +
 configs/dbau1550_el_defconfig                          |  1 +
 configs/devconcenter_defconfig                         |  1 +
 configs/dlvision-10g_defconfig                         |  1 +
 configs/dlvision_defconfig                             |  1 +
 configs/e2220-1170_defconfig                           |  1 +
 configs/eb_cpu5282_defconfig                           |  1 +
 configs/eb_cpu5282_internal_defconfig                  |  1 +
 configs/ebony_defconfig                                |  1 +
 configs/eco5pk_defconfig                               |  1 +
 configs/edb9315a_defconfig                             |  1 +
 configs/firefly-rk3288_defconfig                       |  1 +
 configs/fo300_defconfig                                |  1 +
 configs/forfun_q88db_defconfig                         |  1 +
 configs/fx12mm_defconfig                               |  1 +
 configs/fx12mm_flash_defconfig                         |  1 +
 configs/ga10h_v1_1_defconfig                           |  1 +
 configs/gdppc440etx_defconfig                          |  1 +
 configs/glacier_defconfig                              |  1 +
 configs/glacier_ramboot_defconfig                      |  1 +
 configs/gr_cpci_ax2000_defconfig                       |  1 +
 configs/gr_ep2s60_defconfig                            |  1 +
 configs/gr_xc3s_1500_defconfig                         |  1 +
 configs/grsim_defconfig                                |  1 +
 configs/grsim_leon2_defconfig                          |  1 +
 configs/gt90h_v4_defconfig                             |  1 +
 configs/h2200_defconfig                                |  1 +
 configs/haleakala_defconfig                            |  1 +
 configs/harmony_defconfig                              |  1 +
 configs/highbank_defconfig                             |  1 +
 configs/hikey_defconfig                                |  1 +
 configs/hrcon_defconfig                                |  1 +
 configs/i12-tvbox_defconfig                            |  1 +
 configs/iNet_3F_defconfig                              |  1 +
 configs/iNet_3W_defconfig                              |  1 +
 configs/iNet_86VS_defconfig                            |  1 +
 configs/icon_defconfig                                 |  1 +
 configs/igep0020_defconfig                             |  1 +
 configs/igep0020_nand_defconfig                        |  1 +
 configs/igep0030_defconfig                             |  1 +
 configs/igep0030_nand_defconfig                        |  1 +
 configs/igep0032_defconfig                             |  1 +
 configs/inet1_defconfig                                |  1 +
 configs/inet97fv2_defconfig                            |  1 +
 configs/inet98v_rev2_defconfig                         |  1 +
 configs/inet9f_rev03_defconfig                         |  1 +
 configs/integratorap_cm720t_defconfig                  |  1 +
 configs/integratorap_cm920t_defconfig                  |  1 +
 configs/integratorap_cm926ejs_defconfig                |  1 +
 configs/integratorap_cm946es_defconfig                 |  1 +
 configs/integratorcp_cm1136_defconfig                  |  1 +
 configs/integratorcp_cm920t_defconfig                  |  1 +
 configs/integratorcp_cm926ejs_defconfig                |  1 +
 configs/integratorcp_cm946es_defconfig                 |  1 +
 configs/intip_defconfig                                |  1 +
 configs/io64_defconfig                                 |  1 +
 configs/io_defconfig                                   |  1 +
 configs/iocon_defconfig                                |  1 +
 configs/ipam390_defconfig                              |  1 +
 configs/ipek01_defconfig                               |  1 +
 configs/jesurun_q5_defconfig                           |  1 +
 configs/jetson-tk1_defconfig                           |  1 +
 configs/jupiter_defconfig                              |  1 +
 configs/katmai_defconfig                               |  1 +
 configs/kilauea_defconfig                              |  1 +
 configs/km_kirkwood_128m16_defconfig                   |  1 +
 configs/km_kirkwood_defconfig                          |  1 +
 configs/km_kirkwood_pci_defconfig                      |  1 +
 configs/kmcoge4_defconfig                              |  1 +
 configs/kmcoge5ne_defconfig                            |  1 +
 configs/kmcoge5un_defconfig                            |  1 +
 configs/kmeter1_defconfig                              |  1 +
 configs/kmlion1_defconfig                              |  1 +
 configs/kmnusa_defconfig                               |  1 +
 configs/kmopti2_defconfig                              |  1 +
 configs/kmsugp1_defconfig                              |  1 +
 configs/kmsupx5_defconfig                              |  1 +
 configs/kmsuv31_defconfig                              |  1 +
 configs/kmvect1_defconfig                              |  1 +
 configs/kwb_defconfig                                  |  1 +
 configs/ls1021aqds_nor_SECURE_BOOT_defconfig           |  1 +
 configs/ls1021atwr_nor_SECURE_BOOT_defconfig           |  1 +
 configs/ls2085a_emu_defconfig                          |  1 +
 configs/ls2085a_simu_defconfig                         |  1 +
 configs/ls2085aqds_defconfig                           |  1 +
 configs/ls2085aqds_nand_defconfig                      |  1 +
 configs/ls2085ardb_defconfig                           |  1 +
 configs/ls2085ardb_nand_defconfig                      |  1 +
 configs/luan_defconfig                                 |  1 +
 configs/makalu_defconfig                               |  1 +
 configs/marsboard_defconfig                            |  1 +
 configs/mecp5123_defconfig                             |  1 +
 configs/medcom-wide_defconfig                          |  1 +
 configs/mgcoge3ne_defconfig                            |  1 +
 configs/mgcoge3un_defconfig                            |  1 +
 configs/mgcoge_defconfig                               |  1 +
 configs/mixtile_loftq_defconfig                        |  1 +
 configs/mk802_a10s_defconfig                           |  1 +
 configs/mk802_defconfig                                |  1 +
 configs/mk802ii_defconfig                              |  1 +
 configs/ml507_defconfig                                |  1 +
 configs/ml507_flash_defconfig                          |  1 +
 configs/motionpro_defconfig                            |  1 +
 configs/mpc5121ads_defconfig                           |  1 +
 configs/mpc5121ads_rev2_defconfig                      |  1 +
 configs/mpc8308_p1m_defconfig                          |  1 +
 configs/mt_ventoux_defconfig                           |  1 +
 configs/munices_defconfig                              |  1 +
 configs/neo_defconfig                                  |  1 +
 configs/nokia_rx51_defconfig                           |  1 +
 configs/nyan-big_defconfig                             |  1 +
 configs/ocotea_defconfig                               |  1 +
 configs/odroid-xu3_defconfig                           |  1 +
 configs/odroid_defconfig                               |  1 +
 configs/omap3_evm_quick_mmc_defconfig                  |  1 +
 configs/omap3_evm_quick_nand_defconfig                 |  1 +
 configs/origen_defconfig                               |  1 +
 configs/p2371-0000_defconfig                           |  1 +
 configs/p2371-2180_defconfig                           |  1 +
 configs/p2571_defconfig                                |  1 +
 configs/paz00_defconfig                                |  1 +
 configs/pb1000_defconfig                               |  1 +
 configs/pdm360ng_defconfig                             |  1 +
 configs/peach-pi_defconfig                             |  1 +
 configs/peach-pit_defconfig                            |  1 +
 configs/plutux_defconfig                               |  1 +
 configs/portl2_defconfig                               |  1 +
 configs/pov_protab2_ips9_defconfig                     |  1 +
 configs/pr1_defconfig                                  |  1 +
 configs/q8_a13_tablet_defconfig                        |  1 +
 configs/q8_a23_tablet_800x480_defconfig                |  1 +
 configs/q8_a33_tablet_1024x600_defconfig               |  1 +
 configs/q8_a33_tablet_800x480_defconfig                |  1 +
 configs/qemu_mips64_defconfig                          |  1 +
 configs/qemu_mips64el_defconfig                        |  1 +
 configs/qemu_mips_defconfig                            |  1 +
 configs/qemu_mipsel_defconfig                          |  1 +
 configs/r7-tv-dongle_defconfig                         |  1 +
 configs/rainier_defconfig                              |  1 +
 configs/rainier_ramboot_defconfig                      |  1 +
 configs/redwood_defconfig                              |  1 +
 configs/riotboard_defconfig                            |  1 +
 configs/rpi_2_defconfig                                |  1 +
 configs/rpi_defconfig                                  |  1 +
 configs/s5pc210_universal_defconfig                    |  1 +
 configs/sandbox_defconfig                              |  1 +
 configs/sbc8349_PCI_33_defconfig                       |  1 +
 configs/sbc8349_PCI_66_defconfig                       |  1 +
 configs/sbc8349_defconfig                              |  1 +
 configs/sbc8548_PCI_33_PCIE_defconfig                  |  1 +
 configs/sbc8548_PCI_33_defconfig                       |  1 +
 configs/sbc8548_PCI_66_PCIE_defconfig                  |  1 +
 configs/sbc8548_PCI_66_defconfig                       |  1 +
 configs/sbc8548_defconfig                              |  1 +
 configs/sbc8641d_defconfig                             |  1 +
 configs/seaboard_defconfig                             |  1 +
 configs/sequoia_defconfig                              |  1 +
 configs/sequoia_ramboot_defconfig                      |  1 +
 configs/smdk2410_defconfig                             |  1 +
 configs/smdk5250_defconfig                             |  1 +
 configs/smdk5420_defconfig                             |  1 +
 configs/smdkv310_defconfig                             |  1 +
 configs/snow_defconfig                                 |  1 +
 configs/spring_defconfig                               |  1 +
 configs/sunxi_Gemei_G9_defconfig                       |  1 +
 configs/suvd3_defconfig                                |  1 +
 configs/sycamore_defconfig                             |  1 +
 configs/t3corp_defconfig                               |  1 +
 configs/taihu_defconfig                                |  1 +
 configs/taishan_defconfig                              |  1 +
 configs/tec-ng_defconfig                               |  1 +
 configs/tec_defconfig                                  |  1 +
 configs/trats2_defconfig                               |  1 +
 configs/trats_defconfig                                |  1 +
 configs/tricorder_defconfig                            |  1 +
 configs/tricorder_flash_defconfig                      |  1 +
 configs/trimslice_defconfig                            |  1 +
 configs/tseries_mmc_defconfig                          |  1 +
 configs/tseries_nand_defconfig                         |  1 +
 configs/tseries_spi_defconfig                          |  1 +
 configs/tuge1_defconfig                                |  1 +
 configs/tuxx1_defconfig                                |  1 +
 configs/twister_defconfig                              |  1 +
 configs/usbarmory_defconfig                            |  1 +
 configs/v5fx30teval_defconfig                          |  1 +
 configs/v5fx30teval_flash_defconfig                    |  1 +
 configs/vct_platinum_defconfig                         |  1 +
 configs/vct_platinum_onenand_defconfig                 |  1 +
 configs/vct_platinum_onenand_small_defconfig           |  1 +
 configs/vct_platinum_small_defconfig                   |  1 +
 configs/vct_platinumavc_defconfig                      |  1 +
 configs/vct_platinumavc_onenand_defconfig              |  1 +
 configs/vct_platinumavc_onenand_small_defconfig        |  1 +
 configs/vct_platinumavc_small_defconfig                |  1 +
 configs/vct_premium_defconfig                          |  1 +
 configs/vct_premium_onenand_defconfig                  |  1 +
 configs/vct_premium_onenand_small_defconfig            |  1 +
 configs/vct_premium_small_defconfig                    |  1 +
 configs/ve8313_defconfig                               |  1 +
 configs/venice2_defconfig                              |  1 +
 configs/ventana_defconfig                              |  1 +
 configs/vexpress_ca15_tc2_defconfig                    |  1 +
 configs/vexpress_ca5x2_defconfig                       |  1 +
 configs/vexpress_ca9x4_defconfig                       |  1 +
 configs/vme8349_defconfig                              |  1 +
 configs/walnut_defconfig                               |  1 +
 configs/whistler_defconfig                             |  1 +
 configs/wtk_defconfig                                  |  1 +
 configs/xilinx-ppc405-generic_defconfig                |  1 +
 configs/xilinx-ppc405-generic_flash_defconfig          |  1 +
 configs/xilinx-ppc440-generic_defconfig                |  1 +
 configs/xilinx-ppc440-generic_flash_defconfig          |  1 +
 configs/xilinx_zynqmp_ep_defconfig                     |  1 +
 configs/yellowstone_defconfig                          |  1 +
 configs/yosemite_defconfig                             |  1 +
 configs/yucca_defconfig                                |  1 +
 configs/zmx25_defconfig                                |  1 +
 include/config_distro_defaults.h                       |  1 -
 include/config_fsl_secboot.h                           |  7 +------
 include/configs/B4860QDS.h                             |  2 --
 include/configs/BSC9131RDB.h                           |  1 -
 include/configs/BSC9132QDS.h                           |  1 -
 include/configs/C29XPCIE.h                             |  2 --
 include/configs/CPCI2DP.h                              |  1 -
 include/configs/CPCI4052.h                             |  1 -
 include/configs/M5208EVBE.h                            |  1 -
 include/configs/M52277EVB.h                            |  1 -
 include/configs/M5235EVB.h                             |  1 -
 include/configs/M5253DEMO.h                            |  2 --
 include/configs/M5253EVBE.h                            |  2 --
 include/configs/M5272C3.h                              |  2 --
 include/configs/M5275EVB.h                             |  1 -
 include/configs/M5282EVB.h                             |  1 -
 include/configs/M53017EVB.h                            |  1 -
 include/configs/M5329EVB.h                             |  1 -
 include/configs/M5373EVB.h                             |  1 -
 include/configs/M54418TWR.h                            |  2 --
 include/configs/M54451EVB.h                            |  1 -
 include/configs/M54455EVB.h                            |  1 -
 include/configs/M5475EVB.h                             |  1 -
 include/configs/M5485EVB.h                             |  1 -
 include/configs/MIP405.h                               |  1 -
 include/configs/MPC8308RDB.h                           |  2 --
 include/configs/MPC8313ERDB.h                          |  1 -
 include/configs/MPC8315ERDB.h                          |  1 -
 include/configs/MPC8323ERDB.h                          |  1 -
 include/configs/MPC832XEMDS.h                          |  1 -
 include/configs/MPC8349EMDS.h                          |  1 -
 include/configs/MPC8349ITX.h                           |  2 --
 include/configs/MPC837XEMDS.h                          |  1 -
 include/configs/MPC837XERDB.h                          |  1 -
 include/configs/MPC8536DS.h                            |  1 -
 include/configs/MPC8540ADS.h                           |  1 -
 include/configs/MPC8541CDS.h                           |  1 -
 include/configs/MPC8544DS.h                            |  1 -
 include/configs/MPC8548CDS.h                           |  1 -
 include/configs/MPC8555CDS.h                           |  1 -
 include/configs/MPC8560ADS.h                           |  1 -
 include/configs/MPC8568MDS.h                           |  1 -
 include/configs/MPC8569MDS.h                           |  1 -
 include/configs/MPC8572DS.h                            |  1 -
 include/configs/MPC8610HPCD.h                          |  1 -
 include/configs/MPC8641HPCN.h                          |  1 -
 include/configs/MigoR.h                                |  1 -
 include/configs/P1010RDB.h                             |  1 -
 include/configs/P1022DS.h                              |  2 --
 include/configs/P1023RDB.h                             |  2 --
 include/configs/P2041RDB.h                             |  2 --
 include/configs/PATI.h                                 |  6 ------
 include/configs/PIP405.h                               |  2 --
 include/configs/PLU405.h                               |  1 -
 include/configs/PMC405DE.h                             |  1 -
 include/configs/PMC440.h                               |  2 --
 include/configs/T102xQDS.h                             |  1 -
 include/configs/T102xRDB.h                             |  1 -
 include/configs/T1040QDS.h                             |  2 --
 include/configs/T104xRDB.h                             |  2 --
 include/configs/T208xQDS.h                             |  1 -
 include/configs/T208xRDB.h                             |  1 -
 include/configs/T4240QDS.h                             |  2 --
 include/configs/T4240RDB.h                             |  2 --
 include/configs/TQM5200.h                              |  5 -----
 include/configs/TQM823L.h                              |  2 --
 include/configs/TQM823M.h                              |  2 --
 include/configs/TQM834x.h                              |  1 -
 include/configs/TQM850L.h                              |  2 --
 include/configs/TQM850M.h                              |  2 --
 include/configs/TQM855L.h                              |  2 --
 include/configs/TQM855M.h                              |  2 --
 include/configs/TQM860L.h                              |  2 --
 include/configs/TQM860M.h                              |  2 --
 include/configs/TQM862L.h                              |  2 --
 include/configs/TQM862M.h                              |  2 --
 include/configs/TQM866M.h                              |  2 --
 include/configs/TQM885D.h                              |  2 --
 include/configs/UCP1020.h                              |  3 ---
 include/configs/VCMA9.h                                |  1 -
 include/configs/VOM405.h                               |  1 -
 include/configs/a3m071.h                               |  1 -
 include/configs/a4m072.h                               |  5 -----
 include/configs/ac14xx.h                               |  2 --
 include/configs/adp-ag101p.h                           |  2 --
 include/configs/am335x_sl50.h                          |  1 -
 include/configs/am3517_crane.h                         |  2 --
 include/configs/am3517_evm.h                           |  2 --
 include/configs/amcc-common.h                          |  1 -
 include/configs/amcore.h                               |  1 -
 include/configs/ap325rxa.h                             |  1 -
 include/configs/ap_sh4a_4a.h                           |  1 -
 include/configs/apf27.h                                |  1 -
 include/configs/apx4devkit.h                           |  1 -
 include/configs/arcangel4.h                            |  1 -
 include/configs/aria.h                                 |  1 -
 include/configs/armadillo-800eva.h                     |  1 -
 include/configs/astro_mcf5373l.h                       | 15 ---------------
 include/configs/at91-sama5_common.h                    |  2 --
 include/configs/at91rm9200ek.h                         |  5 -----
 include/configs/at91sam9260ek.h                        |  2 --
 include/configs/at91sam9261ek.h                        |  2 --
 include/configs/at91sam9263ek.h                        |  2 --
 include/configs/at91sam9m10g45ek.h                     |  2 --
 include/configs/at91sam9n12ek.h                        |  2 --
 include/configs/at91sam9rlek.h                         |  2 --
 include/configs/at91sam9x5ek.h                         |  2 --
 include/configs/atngw100.h                             |  2 --
 include/configs/atngw100mkii.h                         |  2 --
 include/configs/atstk1002.h                            |  2 --
 include/configs/axs101.h                               |  1 -
 include/configs/bct-brettl2.h                          |  1 -
 include/configs/bf525-ucr2.h                           |  1 -
 include/configs/bf537-minotaur.h                       |  6 ------
 include/configs/bf537-srv1.h                           |  6 ------
 include/configs/bfin_adi_common.h                      |  7 -------
 include/configs/bg0900.h                               |  1 -
 include/configs/blackstamp.h                           |  1 -
 include/configs/blackvme.h                             |  1 -
 include/configs/br4.h                                  |  1 -
 include/configs/calimain.h                             |  1 -
 include/configs/canmb.h                                |  5 -----
 include/configs/cm5200.h                               |  4 ----
 include/configs/cm_t35.h                               |  1 -
 include/configs/cm_t3517.h                             |  1 -
 include/configs/cm_t43.h                               |  1 -
 include/configs/cm_t54.h                               |  2 --
 include/configs/cobra5272.h                            |  8 --------
 include/configs/colibri_pxa270.h                       |  1 -
 include/configs/colibri_vf.h                           |  1 -
 include/configs/controlcenterd.h                       |  3 ---
 include/configs/corenet_ds.h                           |  2 --
 include/configs/corvus.h                               |  2 --
 include/configs/da850evm.h                             |  1 -
 include/configs/dbau1x00.h                             |  2 --
 include/configs/devkit3250.h                           |  1 -
 include/configs/digsy_mtc.h                            |  5 -----
 include/configs/draco.h                                |  3 ---
 include/configs/ea20.h                                 |  1 -
 include/configs/eb_cpu5282.h                           |  1 -
 include/configs/eco5pk.h                               |  1 -
 include/configs/ecovec.h                               |  1 -
 include/configs/edb93xx.h                              |  1 -
 include/configs/edminiv2.h                             |  3 ---
 include/configs/espt.h                                 |  1 -
 include/configs/ethernut5.h                            |  1 -
 include/configs/flea3.h                                |  2 --
 include/configs/gr_cpci_ax2000.h                       |  5 -----
 include/configs/gr_ep2s60.h                            |  5 -----
 include/configs/gr_xc3s_1500.h                         |  5 -----
 include/configs/grasshopper.h                          |  2 --
 include/configs/grsim.h                                |  5 -----
 include/configs/grsim_leon2.h                          |  5 -----
 include/configs/h2200.h                                |  1 -
 include/configs/hrcon.h                                |  2 --
 include/configs/ids8313.h                              |  1 -
 include/configs/imx27lite-common.h                     |  2 --
 include/configs/imx31_phycore.h                        |  2 --
 include/configs/inka4x0.h                              |  5 -----
 include/configs/integratorap.h                         |  1 -
 include/configs/integratorcp.h                         |  1 -
 include/configs/ipam390.h                              |  1 -
 include/configs/ipek01.h                               |  5 -----
 include/configs/jupiter.h                              |  6 ------
 include/configs/km/keymile-common.h                    |  1 -
 include/configs/kwb.h                                  |  1 -
 include/configs/kzm9g.h                                |  1 -
 include/configs/ls1021aqds.h                           |  2 --
 include/configs/ls1021atwr.h                           |  2 --
 include/configs/ls2085a_common.h                       |  1 -
 include/configs/m28evk.h                               |  1 -
 include/configs/m53evk.h                               |  1 -
 include/configs/manroland/common.h                     |  5 -----
 include/configs/mcx.h                                  |  2 --
 include/configs/mecp5123.h                             |  1 -
 include/configs/meesc.h                                |  1 -
 include/configs/microblaze-generic.h                   |  1 -
 include/configs/motionpro.h                            |  4 ----
 include/configs/mpc5121ads.h                           |  1 -
 include/configs/mpc8308_p1m.h                          |  2 --
 include/configs/ms7722se.h                             |  1 -
 include/configs/ms7750se.h                             |  1 -
 include/configs/mt_ventoux.h                           |  1 -
 include/configs/munices.h                              |  1 -
 include/configs/mv-common.h                            |  2 --
 include/configs/mx23_olinuxino.h                       |  1 -
 include/configs/mx23evk.h                              |  1 -
 include/configs/mx25pdk.h                              |  2 --
 include/configs/mx28evk.h                              |  1 -
 include/configs/mx31ads.h                              |  2 --
 include/configs/mx31pdk.h                              |  2 --
 include/configs/mx35pdk.h                              |  2 --
 include/configs/mx51evk.h                              |  2 --
 include/configs/mx53ard.h                              |  2 --
 include/configs/mx53evk.h                              |  2 --
 include/configs/mx53loco.h                             |  2 --
 include/configs/mx53smd.h                              |  2 --
 include/configs/mx6_common.h                           |  4 ----
 include/configs/mx7_common.h                           |  4 ----
 include/configs/nokia_rx51.h                           |  1 -
 include/configs/o2dnt-common.h                         |  2 --
 include/configs/omap3_cairo.h                          |  4 ----
 include/configs/omap3_evm.h                            |  2 --
 include/configs/omap3_evm_quick_mmc.h                  |  2 --
 include/configs/omap3_evm_quick_nand.h                 |  2 --
 include/configs/omap3_igep00x0.h                       |  2 --
 include/configs/omapl138_lcdk.h                        |  1 -
 include/configs/p1_p2_rdb_pc.h                         |  1 -
 include/configs/p1_twr.h                               |  1 -
 include/configs/pb1x00.h                               |  2 --
 include/configs/pcm030.h                               |  1 -
 include/configs/pcm052.h                               |  2 --
 include/configs/pdm360ng.h                             |  2 --
 include/configs/picosam9g45.h                          |  2 --
 include/configs/pm9261.h                               |  2 --
 include/configs/pm9263.h                               |  2 --
 include/configs/pm9g45.h                               |  2 --
 include/configs/pr1.h                                  |  1 -
 include/configs/pxm2.h                                 |  2 --
 include/configs/qemu-mips.h                            |  2 --
 include/configs/qemu-mips64.h                          |  2 --
 include/configs/qemu-ppce500.h                         |  1 -
 include/configs/r0p7734.h                              |  1 -
 include/configs/r2dplus.h                              |  1 -
 include/configs/r7780mp.h                              |  1 -
 include/configs/rastaban.h                             |  2 --
 include/configs/rcar-gen2-common.h                     |  1 -
 include/configs/redwood.h                              |  2 --
 include/configs/rpi-common.h                           |  2 --
 include/configs/rsk7264.h                              |  1 -
 include/configs/rsk7269.h                              |  1 -
 include/configs/rut.h                                  |  2 --
 include/configs/sansa_fuze_plus.h                      |  1 -
 include/configs/sbc8349.h                              |  1 -
 include/configs/sbc8548.h                              |  1 -
 include/configs/sbc8641d.h                             |  1 -
 include/configs/sc_sps_1.h                             |  1 -
 include/configs/sh7752evb.h                            |  1 -
 include/configs/sh7753evb.h                            |  1 -
 include/configs/sh7757lcr.h                            |  1 -
 include/configs/sh7763rdp.h                            |  1 -
 include/configs/sh7785lcr.h                            |  1 -
 include/configs/smartweb.h                             |  1 -
 include/configs/smdk2410.h                             |  1 -
 include/configs/smdkc100.h                             |  2 --
 include/configs/snapper9260.h                          |  1 -
 include/configs/sniper.h                               |  1 -
 include/configs/socfpga_arria5_socdk.h                 |  1 -
 include/configs/socfpga_cyclone5_socdk.h               |  1 -
 include/configs/socfpga_de0_nano_soc.h                 |  1 -
 include/configs/socfpga_mcvevk.h                       |  1 -
 include/configs/socfpga_sockit.h                       |  1 -
 include/configs/socrates.h                             |  2 --
 include/configs/spear-common.h                         |  6 ------
 include/configs/stm32f429-discovery.h                  |  1 -
 include/configs/stv0991.h                              |  1 -
 include/configs/tao3530.h                              |  1 -
 include/configs/taurus.h                               |  2 --
 include/configs/tb100.h                                |  1 -
 include/configs/thuban.h                               |  2 --
 include/configs/ti814x_evm.h                           |  1 -
 include/configs/ti816x_evm.h                           |  1 -
 include/configs/ti_armv7_common.h                      |  5 -----
 include/configs/tricorder.h                            |  2 --
 include/configs/ts4800.h                               |  3 ---
 include/configs/tseries.h                              |  1 -
 include/configs/twister.h                              |  2 --
 include/configs/uniphier.h                             |  1 -
 include/configs/usb_a9263.h                            |  2 --
 include/configs/v38b.h                                 |  5 -----
 include/configs/vct.h                                  |  1 -
 include/configs/ve8313.h                               |  1 -
 include/configs/vexpress_aemv8a.h                      |  4 ----
 include/configs/vexpress_common.h                      |  1 -
 include/configs/vf610twr.h                             |  2 --
 include/configs/vme8349.h                              |  1 -
 include/configs/woodburn_common.h                      |  2 --
 include/configs/work_92105.h                           |  1 -
 include/configs/x600.h                                 |  2 --
 include/configs/xfi3.h                                 |  1 -
 include/configs/xilinx-ppc.h                           |  1 -
 include/configs/xilinx_zynqmp.h                        |  1 -
 include/configs/xpedite1000.h                          |  1 -
 include/configs/xpedite517x.h                          |  1 -
 include/configs/xpedite520x.h                          |  1 -
 include/configs/xpedite537x.h                          |  1 -
 include/configs/xpedite550x.h                          |  1 -
 include/configs/zmx25.h                                |  2 --
 include/configs/zynq-common.h                          |  1 -
 907 files changed, 628 insertions(+), 531 deletions(-)

-- 
2.4.9

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [U-Boot] [PATCH 1/2] Kconfig: add CONFIG_BOOTDELAY
  2015-10-08 19:10 [U-Boot] [PATCH 0/2] config: move CONFIG_BOOTDELAY to defconfig Igor Grinberg
@ 2015-10-08 19:10 ` Igor Grinberg
  2015-10-09  9:36   ` Simon Glass
  2015-10-08 19:10 ` [U-Boot] [PATCH 2/2] config: move CONFIG_BOOTDELAY to defconfig Igor Grinberg
  1 sibling, 1 reply; 6+ messages in thread
From: Igor Grinberg @ 2015-10-08 19:10 UTC (permalink / raw)
  To: u-boot

Add CONFIG_BOOTDELAY to the Kconfig.
Default it to 3 seconds according to the majority of configs.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Cc: Simon Glass <sjg@chromium.org>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
---
 common/Kconfig | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/common/Kconfig b/common/Kconfig
index d98eb19..e13d255 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -100,6 +100,16 @@ config AUTOBOOT_STOP_STR_SHA256
 	  string / password matches a values that is encypted via
 	  a SHA256 hash and saved in the environment.
 
+config BOOTDELAY
+	int "Seconds to delay before autobooting"
+	default 3
+	help
+	  Delay before automatically booting the default image;
+	  set to -1 to disable autoboot.
+	  set to -2 to autoboot with no delay and not check for abort
+	  (even when CONFIG_ZERO_BOOTDELAY_CHECK is defined).
+	  See doc/README.autoboot for additional information.
+
 endmenu
 
 comment "Commands"
-- 
2.4.9

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [U-Boot] [PATCH 2/2] config: move CONFIG_BOOTDELAY to defconfig
  2015-10-08 19:10 [U-Boot] [PATCH 0/2] config: move CONFIG_BOOTDELAY to defconfig Igor Grinberg
  2015-10-08 19:10 ` [U-Boot] [PATCH 1/2] Kconfig: add CONFIG_BOOTDELAY Igor Grinberg
@ 2015-10-08 19:10 ` Igor Grinberg
  1 sibling, 0 replies; 6+ messages in thread
From: Igor Grinberg @ 2015-10-08 19:10 UTC (permalink / raw)
  To: u-boot

Make more use of the Kconfig and move CONFIG_CMD_BOOTZ config option
to defconfigs for all boards.
This has been done with the moveconfig.py utility.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
---
 configs/A10-OLinuXino-Lime_defconfig                   |  1 +
 configs/A10s-OLinuXino-M_defconfig                     |  1 +
 configs/A13-OLinuXinoM_defconfig                       |  1 +
 configs/A13-OLinuXino_defconfig                        |  1 +
 configs/A20-OLinuXino-Lime2_defconfig                  |  1 +
 configs/A20-OLinuXino-Lime_defconfig                   |  1 +
 configs/A20-OLinuXino_MICRO_defconfig                  |  1 +
 configs/A20-Olimex-SOM-EVB_defconfig                   |  1 +
 configs/Ainol_AW1_defconfig                            |  1 +
 configs/Ampe_A76_defconfig                             |  1 +
 configs/Auxtek-T003_defconfig                          |  1 +
 configs/Auxtek-T004_defconfig                          |  1 +
 configs/B4420QDS_NAND_defconfig                        |  1 +
 configs/B4420QDS_SPIFLASH_defconfig                    |  1 +
 configs/B4420QDS_defconfig                             |  1 +
 configs/B4860QDS_NAND_defconfig                        |  1 +
 configs/B4860QDS_SECURE_BOOT_defconfig                 |  1 +
 configs/B4860QDS_SPIFLASH_defconfig                    |  1 +
 configs/B4860QDS_SRIO_PCIE_BOOT_defconfig              |  1 +
 configs/B4860QDS_defconfig                             |  1 +
 configs/BSC9131RDB_NAND_SYSCLK100_defconfig            |  1 +
 configs/BSC9131RDB_NAND_defconfig                      |  1 +
 configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig        |  1 +
 configs/BSC9131RDB_SPIFLASH_defconfig                  |  1 +
 configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig     |  1 +
 configs/BSC9132QDS_NAND_DDRCLK100_defconfig            |  1 +
 configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig     |  1 +
 configs/BSC9132QDS_NAND_DDRCLK133_defconfig            |  1 +
 configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig      |  1 +
 configs/BSC9132QDS_NOR_DDRCLK100_defconfig             |  1 +
 configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig      |  1 +
 configs/BSC9132QDS_NOR_DDRCLK133_defconfig             |  1 +
 configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig   |  1 +
 configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig          |  1 +
 configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig   |  1 +
 configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig          |  1 +
 configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig |  1 +
 configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig        |  1 +
 configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig |  1 +
 configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig        |  1 +
 configs/Bananapi_defconfig                             |  1 +
 configs/Bananapro_defconfig                            |  1 +
 configs/C29XPCIE_NOR_SECBOOT_defconfig                 |  1 +
 configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig            |  1 +
 configs/CSQ_CS908_defconfig                            |  1 +
 configs/Chuwi_V7_CW0825_defconfig                      |  1 +
 configs/Colombus_defconfig                             |  1 +
 configs/Cubieboard2_defconfig                          |  1 +
 configs/Cubieboard_defconfig                           |  1 +
 configs/Cubietruck_defconfig                           |  1 +
 configs/Et_q8_v1_6_defconfig                           |  1 +
 configs/Hummingbird_A31_defconfig                      |  1 +
 configs/Hyundai_A7HD_defconfig                         |  1 +
 configs/Ippo_q8h_v1_2_a33_1024x600_defconfig           |  1 +
 configs/Ippo_q8h_v1_2_defconfig                        |  1 +
 configs/Ippo_q8h_v5_defconfig                          |  1 +
 configs/Linksprite_pcDuino3_Nano_defconfig             |  1 +
 configs/Linksprite_pcDuino3_defconfig                  |  1 +
 configs/Linksprite_pcDuino_defconfig                   |  1 +
 configs/M5253DEMO_defconfig                            |  1 +
 configs/M5253EVBE_defconfig                            |  1 +
 configs/M5272C3_defconfig                              |  1 +
 configs/M5275EVB_defconfig                             |  1 +
 configs/M5282EVB_defconfig                             |  1 +
 configs/M54418TWR_defconfig                            |  1 +
 configs/M54418TWR_nand_mii_defconfig                   |  1 +
 configs/M54418TWR_nand_rmii_defconfig                  |  1 +
 configs/M54418TWR_nand_rmii_lowfreq_defconfig          |  1 +
 configs/M54418TWR_serial_mii_defconfig                 |  1 +
 configs/M54418TWR_serial_rmii_defconfig                |  1 +
 configs/MIP405T_defconfig                              |  1 +
 configs/MIP405_defconfig                               |  1 +
 configs/MK808C_defconfig                               |  1 +
 configs/MPC8308RDB_defconfig                           |  1 +
 configs/MPC8313ERDB_33_defconfig                       |  1 +
 configs/MPC8313ERDB_66_defconfig                       |  1 +
 configs/MPC8313ERDB_NAND_33_defconfig                  |  1 +
 configs/MPC8313ERDB_NAND_66_defconfig                  |  1 +
 configs/MPC8315ERDB_defconfig                          |  1 +
 configs/MPC8323ERDB_defconfig                          |  1 +
 configs/MPC832XEMDS_ATM_defconfig                      |  1 +
 configs/MPC832XEMDS_HOST_33_defconfig                  |  1 +
 configs/MPC832XEMDS_HOST_66_defconfig                  |  1 +
 configs/MPC832XEMDS_SLAVE_defconfig                    |  1 +
 configs/MPC832XEMDS_defconfig                          |  1 +
 configs/MPC8349EMDS_defconfig                          |  1 +
 configs/MPC8349ITXGP_defconfig                         |  1 +
 configs/MPC8349ITX_LOWBOOT_defconfig                   |  1 +
 configs/MPC8349ITX_defconfig                           |  1 +
 configs/MPC837XEMDS_HOST_defconfig                     |  1 +
 configs/MPC837XEMDS_defconfig                          |  1 +
 configs/MPC837XERDB_defconfig                          |  1 +
 configs/MPC8536DS_36BIT_defconfig                      |  1 +
 configs/MPC8536DS_SDCARD_defconfig                     |  1 +
 configs/MPC8536DS_SPIFLASH_defconfig                   |  1 +
 configs/MPC8536DS_defconfig                            |  1 +
 configs/MPC8540ADS_defconfig                           |  1 +
 configs/MPC8541CDS_defconfig                           |  1 +
 configs/MPC8541CDS_legacy_defconfig                    |  1 +
 configs/MPC8544DS_defconfig                            |  1 +
 configs/MPC8548CDS_36BIT_defconfig                     |  1 +
 configs/MPC8548CDS_defconfig                           |  1 +
 configs/MPC8548CDS_legacy_defconfig                    |  1 +
 configs/MPC8555CDS_defconfig                           |  1 +
 configs/MPC8555CDS_legacy_defconfig                    |  1 +
 configs/MPC8560ADS_defconfig                           |  1 +
 configs/MPC8568MDS_defconfig                           |  1 +
 configs/MPC8569MDS_ATM_defconfig                       |  1 +
 configs/MPC8569MDS_defconfig                           |  1 +
 configs/MPC8572DS_36BIT_defconfig                      |  1 +
 configs/MPC8572DS_defconfig                            |  1 +
 configs/MPC8610HPCD_defconfig                          |  1 +
 configs/MPC8641HPCN_36BIT_defconfig                    |  1 +
 configs/MPC8641HPCN_defconfig                          |  1 +
 configs/MSI_Primo73_defconfig                          |  1 +
 configs/MSI_Primo81_defconfig                          |  1 +
 configs/Marsboard_A10_defconfig                        |  1 +
 configs/Mele_A1000G_quad_defconfig                     |  1 +
 configs/Mele_A1000_defconfig                           |  1 +
 configs/Mele_I7_defconfig                              |  1 +
 configs/Mele_M3_defconfig                              |  1 +
 configs/Mele_M5_defconfig                              |  1 +
 configs/Mele_M9_defconfig                              |  1 +
 configs/Merrii_A80_Optimus_defconfig                   |  1 +
 configs/Mini-X_defconfig                               |  1 +
 configs/MiniFAP_defconfig                              |  1 +
 configs/O2D300_defconfig                               |  1 +
 configs/O2DNT2_RAMBOOT_defconfig                       |  1 +
 configs/O2DNT2_defconfig                               |  1 +
 configs/O2D_defconfig                                  |  1 +
 configs/O2I_defconfig                                  |  1 +
 configs/O2MNT_O2M110_defconfig                         |  1 +
 configs/O2MNT_O2M112_defconfig                         |  1 +
 configs/O2MNT_O2M113_defconfig                         |  1 +
 configs/O2MNT_defconfig                                |  1 +
 configs/O3DNT_defconfig                                |  1 +
 configs/Orangepi_defconfig                             |  1 +
 configs/Orangepi_mini_defconfig                        |  1 +
 configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig       |  1 +
 configs/P1010RDB-PA_36BIT_NAND_defconfig               |  1 +
 configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig        |  1 +
 configs/P1010RDB-PA_36BIT_NOR_defconfig                |  1 +
 configs/P1010RDB-PA_36BIT_SDCARD_defconfig             |  1 +
 configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig   |  1 +
 configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig           |  1 +
 configs/P1010RDB-PA_NAND_SECBOOT_defconfig             |  1 +
 configs/P1010RDB-PA_NAND_defconfig                     |  1 +
 configs/P1010RDB-PA_NOR_SECBOOT_defconfig              |  1 +
 configs/P1010RDB-PA_NOR_defconfig                      |  1 +
 configs/P1010RDB-PA_SDCARD_defconfig                   |  1 +
 configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig         |  1 +
 configs/P1010RDB-PA_SPIFLASH_defconfig                 |  1 +
 configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig       |  1 +
 configs/P1010RDB-PB_36BIT_NAND_defconfig               |  1 +
 configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig        |  1 +
 configs/P1010RDB-PB_36BIT_NOR_defconfig                |  1 +
 configs/P1010RDB-PB_36BIT_SDCARD_defconfig             |  1 +
 configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig   |  1 +
 configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig           |  1 +
 configs/P1010RDB-PB_NAND_SECBOOT_defconfig             |  1 +
 configs/P1010RDB-PB_NAND_defconfig                     |  1 +
 configs/P1010RDB-PB_NOR_SECBOOT_defconfig              |  1 +
 configs/P1010RDB-PB_NOR_defconfig                      |  1 +
 configs/P1010RDB-PB_SDCARD_defconfig                   |  1 +
 configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig         |  1 +
 configs/P1010RDB-PB_SPIFLASH_defconfig                 |  1 +
 configs/P1020MBG-PC_36BIT_SDCARD_defconfig             |  1 +
 configs/P1020MBG-PC_36BIT_defconfig                    |  1 +
 configs/P1020MBG-PC_SDCARD_defconfig                   |  1 +
 configs/P1020MBG-PC_defconfig                          |  1 +
 configs/P1020RDB-PC_36BIT_NAND_defconfig               |  1 +
 configs/P1020RDB-PC_36BIT_SDCARD_defconfig             |  1 +
 configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig           |  1 +
 configs/P1020RDB-PC_36BIT_defconfig                    |  1 +
 configs/P1020RDB-PC_NAND_defconfig                     |  1 +
 configs/P1020RDB-PC_SDCARD_defconfig                   |  1 +
 configs/P1020RDB-PC_SPIFLASH_defconfig                 |  1 +
 configs/P1020RDB-PC_defconfig                          |  1 +
 configs/P1020RDB-PD_NAND_defconfig                     |  1 +
 configs/P1020RDB-PD_SDCARD_defconfig                   |  1 +
 configs/P1020RDB-PD_SPIFLASH_defconfig                 |  1 +
 configs/P1020RDB-PD_defconfig                          |  1 +
 configs/P1020UTM-PC_36BIT_SDCARD_defconfig             |  1 +
 configs/P1020UTM-PC_36BIT_defconfig                    |  1 +
 configs/P1020UTM-PC_SDCARD_defconfig                   |  1 +
 configs/P1020UTM-PC_defconfig                          |  1 +
 configs/P1021RDB-PC_36BIT_NAND_defconfig               |  1 +
 configs/P1021RDB-PC_36BIT_SDCARD_defconfig             |  1 +
 configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig           |  1 +
 configs/P1021RDB-PC_36BIT_defconfig                    |  1 +
 configs/P1021RDB-PC_NAND_defconfig                     |  1 +
 configs/P1021RDB-PC_SDCARD_defconfig                   |  1 +
 configs/P1021RDB-PC_SPIFLASH_defconfig                 |  1 +
 configs/P1021RDB-PC_defconfig                          |  1 +
 configs/P1022DS_36BIT_NAND_defconfig                   |  1 +
 configs/P1022DS_36BIT_SDCARD_defconfig                 |  1 +
 configs/P1022DS_36BIT_SPIFLASH_defconfig               |  1 +
 configs/P1022DS_36BIT_defconfig                        |  1 +
 configs/P1022DS_NAND_defconfig                         |  1 +
 configs/P1022DS_SDCARD_defconfig                       |  1 +
 configs/P1022DS_SPIFLASH_defconfig                     |  1 +
 configs/P1022DS_defconfig                              |  1 +
 configs/P1024RDB_36BIT_defconfig                       |  1 +
 configs/P1024RDB_NAND_defconfig                        |  1 +
 configs/P1024RDB_SDCARD_defconfig                      |  1 +
 configs/P1024RDB_SPIFLASH_defconfig                    |  1 +
 configs/P1024RDB_defconfig                             |  1 +
 configs/P1025RDB_36BIT_defconfig                       |  1 +
 configs/P1025RDB_NAND_defconfig                        |  1 +
 configs/P1025RDB_SDCARD_defconfig                      |  1 +
 configs/P1025RDB_SPIFLASH_defconfig                    |  1 +
 configs/P1025RDB_defconfig                             |  1 +
 configs/P2020RDB-PC_36BIT_NAND_defconfig               |  1 +
 configs/P2020RDB-PC_36BIT_SDCARD_defconfig             |  1 +
 configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig           |  1 +
 configs/P2020RDB-PC_36BIT_defconfig                    |  1 +
 configs/P2020RDB-PC_NAND_defconfig                     |  1 +
 configs/P2020RDB-PC_SDCARD_defconfig                   |  1 +
 configs/P2020RDB-PC_SPIFLASH_defconfig                 |  1 +
 configs/P2020RDB-PC_defconfig                          |  1 +
 configs/P2041RDB_NAND_defconfig                        |  1 +
 configs/P2041RDB_SDCARD_defconfig                      |  1 +
 configs/P2041RDB_SECURE_BOOT_defconfig                 |  1 +
 configs/P2041RDB_SPIFLASH_defconfig                    |  1 +
 configs/P2041RDB_SRIO_PCIE_BOOT_defconfig              |  1 +
 configs/P2041RDB_defconfig                             |  1 +
 configs/P3041DS_NAND_SECURE_BOOT_defconfig             |  1 +
 configs/P3041DS_NAND_defconfig                         |  1 +
 configs/P3041DS_SDCARD_defconfig                       |  1 +
 configs/P3041DS_SECURE_BOOT_defconfig                  |  1 +
 configs/P3041DS_SPIFLASH_defconfig                     |  1 +
 configs/P3041DS_SRIO_PCIE_BOOT_defconfig               |  1 +
 configs/P3041DS_defconfig                              |  1 +
 configs/P4080DS_SDCARD_defconfig                       |  1 +
 configs/P4080DS_SECURE_BOOT_defconfig                  |  1 +
 configs/P4080DS_SPIFLASH_defconfig                     |  1 +
 configs/P4080DS_SRIO_PCIE_BOOT_defconfig               |  1 +
 configs/P4080DS_defconfig                              |  1 +
 configs/P5020DS_NAND_SECURE_BOOT_defconfig             |  1 +
 configs/P5020DS_NAND_defconfig                         |  1 +
 configs/P5020DS_SDCARD_defconfig                       |  1 +
 configs/P5020DS_SECURE_BOOT_defconfig                  |  1 +
 configs/P5020DS_SPIFLASH_defconfig                     |  1 +
 configs/P5020DS_SRIO_PCIE_BOOT_defconfig               |  1 +
 configs/P5020DS_defconfig                              |  1 +
 configs/P5040DS_NAND_SECURE_BOOT_defconfig             |  1 +
 configs/P5040DS_NAND_defconfig                         |  1 +
 configs/P5040DS_SDCARD_defconfig                       |  1 +
 configs/P5040DS_SECURE_BOOT_defconfig                  |  1 +
 configs/P5040DS_SPIFLASH_defconfig                     |  1 +
 configs/P5040DS_defconfig                              |  1 +
 configs/PATI_defconfig                                 |  1 +
 configs/PIP405_defconfig                               |  1 +
 configs/Sinlinx_SinA33_defconfig                       |  1 +
 configs/T1023RDB_NAND_defconfig                        |  1 +
 configs/T1023RDB_SDCARD_defconfig                      |  1 +
 configs/T1023RDB_SECURE_BOOT_defconfig                 |  1 +
 configs/T1023RDB_SPIFLASH_defconfig                    |  1 +
 configs/T1023RDB_defconfig                             |  1 +
 configs/T1024QDS_DDR4_SECURE_BOOT_defconfig            |  1 +
 configs/T1024QDS_DDR4_defconfig                        |  1 +
 configs/T1024QDS_NAND_defconfig                        |  1 +
 configs/T1024QDS_SDCARD_defconfig                      |  1 +
 configs/T1024QDS_SECURE_BOOT_defconfig                 |  1 +
 configs/T1024QDS_SPIFLASH_defconfig                    |  1 +
 configs/T1024QDS_defconfig                             |  1 +
 configs/T1024RDB_NAND_defconfig                        |  1 +
 configs/T1024RDB_SDCARD_defconfig                      |  1 +
 configs/T1024RDB_SECURE_BOOT_defconfig                 |  1 +
 configs/T1024RDB_SPIFLASH_defconfig                    |  1 +
 configs/T1024RDB_defconfig                             |  1 +
 configs/T1040D4RDB_NAND_defconfig                      |  1 +
 configs/T1040D4RDB_SDCARD_defconfig                    |  1 +
 configs/T1040D4RDB_SECURE_BOOT_defconfig               |  1 +
 configs/T1040D4RDB_SPIFLASH_defconfig                  |  1 +
 configs/T1040D4RDB_defconfig                           |  1 +
 configs/T1040QDS_DDR4_defconfig                        |  1 +
 configs/T1040QDS_SECURE_BOOT_defconfig                 |  1 +
 configs/T1040QDS_defconfig                             |  1 +
 configs/T1040RDB_NAND_defconfig                        |  1 +
 configs/T1040RDB_SDCARD_defconfig                      |  1 +
 configs/T1040RDB_SECURE_BOOT_defconfig                 |  1 +
 configs/T1040RDB_SPIFLASH_defconfig                    |  1 +
 configs/T1040RDB_defconfig                             |  1 +
 configs/T1042D4RDB_NAND_defconfig                      |  1 +
 configs/T1042D4RDB_SDCARD_defconfig                    |  1 +
 configs/T1042D4RDB_SECURE_BOOT_defconfig               |  1 +
 configs/T1042D4RDB_SPIFLASH_defconfig                  |  1 +
 configs/T1042D4RDB_defconfig                           |  1 +
 configs/T1042RDB_PI_NAND_defconfig                     |  1 +
 configs/T1042RDB_PI_SDCARD_defconfig                   |  1 +
 configs/T1042RDB_PI_SPIFLASH_defconfig                 |  1 +
 configs/T1042RDB_PI_defconfig                          |  1 +
 configs/T1042RDB_SECURE_BOOT_defconfig                 |  1 +
 configs/T1042RDB_defconfig                             |  1 +
 configs/T2080QDS_NAND_defconfig                        |  1 +
 configs/T2080QDS_SDCARD_defconfig                      |  1 +
 configs/T2080QDS_SECURE_BOOT_defconfig                 |  1 +
 configs/T2080QDS_SPIFLASH_defconfig                    |  1 +
 configs/T2080QDS_SRIO_PCIE_BOOT_defconfig              |  1 +
 configs/T2080QDS_defconfig                             |  1 +
 configs/T2080RDB_NAND_defconfig                        |  1 +
 configs/T2080RDB_SDCARD_defconfig                      |  1 +
 configs/T2080RDB_SECURE_BOOT_defconfig                 |  1 +
 configs/T2080RDB_SPIFLASH_defconfig                    |  1 +
 configs/T2080RDB_SRIO_PCIE_BOOT_defconfig              |  1 +
 configs/T2080RDB_defconfig                             |  1 +
 configs/T2081QDS_NAND_defconfig                        |  1 +
 configs/T2081QDS_SDCARD_defconfig                      |  1 +
 configs/T2081QDS_SPIFLASH_defconfig                    |  1 +
 configs/T2081QDS_SRIO_PCIE_BOOT_defconfig              |  1 +
 configs/T2081QDS_defconfig                             |  1 +
 configs/T4160QDS_NAND_defconfig                        |  1 +
 configs/T4160QDS_SDCARD_defconfig                      |  1 +
 configs/T4160QDS_SECURE_BOOT_defconfig                 |  1 +
 configs/T4160QDS_defconfig                             |  1 +
 configs/T4160RDB_defconfig                             |  1 +
 configs/T4240QDS_NAND_defconfig                        |  1 +
 configs/T4240QDS_SDCARD_defconfig                      |  1 +
 configs/T4240QDS_SECURE_BOOT_defconfig                 |  1 +
 configs/T4240QDS_SRIO_PCIE_BOOT_defconfig              |  1 +
 configs/T4240QDS_defconfig                             |  1 +
 configs/T4240RDB_SDCARD_defconfig                      |  1 +
 configs/T4240RDB_defconfig                             |  1 +
 configs/TQM5200S_HIGHBOOT_defconfig                    |  1 +
 configs/TQM5200S_defconfig                             |  1 +
 configs/TQM5200_B_HIGHBOOT_defconfig                   |  1 +
 configs/TQM5200_B_defconfig                            |  1 +
 configs/TQM5200_STK100_defconfig                       |  1 +
 configs/TQM5200_defconfig                              |  1 +
 configs/TQM823L_LCD_defconfig                          |  1 +
 configs/TQM823L_defconfig                              |  1 +
 configs/TQM823M_defconfig                              |  1 +
 configs/TQM834x_defconfig                              |  1 +
 configs/TQM850L_defconfig                              |  1 +
 configs/TQM850M_defconfig                              |  1 +
 configs/TQM855L_defconfig                              |  1 +
 configs/TQM855M_defconfig                              |  1 +
 configs/TQM860L_defconfig                              |  1 +
 configs/TQM860M_defconfig                              |  1 +
 configs/TQM862L_defconfig                              |  1 +
 configs/TQM862M_defconfig                              |  1 +
 configs/TQM866M_defconfig                              |  1 +
 configs/TQM885D_defconfig                              |  1 +
 configs/TTTech_defconfig                               |  1 +
 configs/TWR-P1025_defconfig                            |  1 +
 configs/TZX-Q8-713B7_defconfig                         |  1 +
 configs/UCP1020_SPIFLASH_defconfig                     |  1 +
 configs/UCP1020_defconfig                              |  1 +
 configs/UTOO_P66_defconfig                             |  1 +
 configs/VCMA9_defconfig                                |  1 +
 configs/Wexler_TAB7200_defconfig                       |  1 +
 configs/Wits_Pro_A20_DKT_defconfig                     |  1 +
 configs/Wobo_i5_defconfig                              |  1 +
 configs/Yones_Toptech_BD1078_defconfig                 |  1 +
 configs/a4m072_defconfig                               |  1 +
 configs/ac14xx_defconfig                               |  1 +
 configs/acadia_defconfig                               |  1 +
 configs/am335x_sl50_defconfig                          |  1 +
 configs/am3517_crane_defconfig                         |  1 +
 configs/am3517_evm_defconfig                           |  1 +
 configs/apalis_t30_defconfig                           |  1 +
 configs/apf27_defconfig                                |  1 +
 configs/arches_defconfig                               |  1 +
 configs/aria_defconfig                                 |  1 +
 configs/arndale_defconfig                              |  1 +
 configs/ba10_tv_box_defconfig                          |  1 +
 configs/bamboo_defconfig                               |  1 +
 configs/beaver_defconfig                               |  1 +
 configs/bf525-ucr2_defconfig                           |  1 +
 configs/bf537-minotaur_defconfig                       |  1 +
 configs/bf537-srv1_defconfig                           |  1 +
 configs/blackstamp_defconfig                           |  1 +
 configs/blackvme_defconfig                             |  1 +
 configs/br4_defconfig                                  |  1 +
 configs/bubinga_defconfig                              |  1 +
 configs/caddy2_defconfig                               |  1 +
 configs/cairo_defconfig                                |  1 +
 configs/calimain_defconfig                             |  1 +
 configs/cam5200_defconfig                              |  1 +
 configs/cam5200_niosflash_defconfig                    |  1 +
 configs/canmb_defconfig                                |  1 +
 configs/canyonlands_defconfig                          |  1 +
 configs/cardhu_defconfig                               |  1 +
 configs/charon_defconfig                               |  1 +
 configs/chromebook_jerry_defconfig                     |  1 +
 configs/cm5200_defconfig                               |  1 +
 configs/cm_t43_defconfig                               |  1 +
 configs/cobra5272_defconfig                            |  1 +
 configs/colibri_pxa270_defconfig                       |  1 +
 configs/colibri_t20_defconfig                          |  1 +
 configs/colibri_t30_defconfig                          |  1 +
 configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig  |  1 +
 configs/controlcenterd_36BIT_SDCARD_defconfig          |  1 +
 configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig   |  1 +
 configs/controlcenterd_TRAILBLAZER_defconfig           |  1 +
 configs/dalmore_defconfig                              |  1 +
 configs/dbau1000_defconfig                             |  1 +
 configs/dbau1100_defconfig                             |  1 +
 configs/dbau1500_defconfig                             |  1 +
 configs/dbau1550_defconfig                             |  1 +
 configs/dbau1550_el_defconfig                          |  1 +
 configs/devconcenter_defconfig                         |  1 +
 configs/dlvision-10g_defconfig                         |  1 +
 configs/dlvision_defconfig                             |  1 +
 configs/e2220-1170_defconfig                           |  1 +
 configs/eb_cpu5282_defconfig                           |  1 +
 configs/eb_cpu5282_internal_defconfig                  |  1 +
 configs/ebony_defconfig                                |  1 +
 configs/eco5pk_defconfig                               |  1 +
 configs/edb9315a_defconfig                             |  1 +
 configs/firefly-rk3288_defconfig                       |  1 +
 configs/fo300_defconfig                                |  1 +
 configs/forfun_q88db_defconfig                         |  1 +
 configs/fx12mm_defconfig                               |  1 +
 configs/fx12mm_flash_defconfig                         |  1 +
 configs/ga10h_v1_1_defconfig                           |  1 +
 configs/gdppc440etx_defconfig                          |  1 +
 configs/glacier_defconfig                              |  1 +
 configs/glacier_ramboot_defconfig                      |  1 +
 configs/gr_cpci_ax2000_defconfig                       |  1 +
 configs/gr_ep2s60_defconfig                            |  1 +
 configs/gr_xc3s_1500_defconfig                         |  1 +
 configs/grsim_defconfig                                |  1 +
 configs/grsim_leon2_defconfig                          |  1 +
 configs/gt90h_v4_defconfig                             |  1 +
 configs/h2200_defconfig                                |  1 +
 configs/haleakala_defconfig                            |  1 +
 configs/harmony_defconfig                              |  1 +
 configs/highbank_defconfig                             |  1 +
 configs/hikey_defconfig                                |  1 +
 configs/hrcon_defconfig                                |  1 +
 configs/i12-tvbox_defconfig                            |  1 +
 configs/iNet_3F_defconfig                              |  1 +
 configs/iNet_3W_defconfig                              |  1 +
 configs/iNet_86VS_defconfig                            |  1 +
 configs/icon_defconfig                                 |  1 +
 configs/igep0020_defconfig                             |  1 +
 configs/igep0020_nand_defconfig                        |  1 +
 configs/igep0030_defconfig                             |  1 +
 configs/igep0030_nand_defconfig                        |  1 +
 configs/igep0032_defconfig                             |  1 +
 configs/inet1_defconfig                                |  1 +
 configs/inet97fv2_defconfig                            |  1 +
 configs/inet98v_rev2_defconfig                         |  1 +
 configs/inet9f_rev03_defconfig                         |  1 +
 configs/integratorap_cm720t_defconfig                  |  1 +
 configs/integratorap_cm920t_defconfig                  |  1 +
 configs/integratorap_cm926ejs_defconfig                |  1 +
 configs/integratorap_cm946es_defconfig                 |  1 +
 configs/integratorcp_cm1136_defconfig                  |  1 +
 configs/integratorcp_cm920t_defconfig                  |  1 +
 configs/integratorcp_cm926ejs_defconfig                |  1 +
 configs/integratorcp_cm946es_defconfig                 |  1 +
 configs/intip_defconfig                                |  1 +
 configs/io64_defconfig                                 |  1 +
 configs/io_defconfig                                   |  1 +
 configs/iocon_defconfig                                |  1 +
 configs/ipam390_defconfig                              |  1 +
 configs/ipek01_defconfig                               |  1 +
 configs/jesurun_q5_defconfig                           |  1 +
 configs/jetson-tk1_defconfig                           |  1 +
 configs/jupiter_defconfig                              |  1 +
 configs/katmai_defconfig                               |  1 +
 configs/kilauea_defconfig                              |  1 +
 configs/km_kirkwood_128m16_defconfig                   |  1 +
 configs/km_kirkwood_defconfig                          |  1 +
 configs/km_kirkwood_pci_defconfig                      |  1 +
 configs/kmcoge4_defconfig                              |  1 +
 configs/kmcoge5ne_defconfig                            |  1 +
 configs/kmcoge5un_defconfig                            |  1 +
 configs/kmeter1_defconfig                              |  1 +
 configs/kmlion1_defconfig                              |  1 +
 configs/kmnusa_defconfig                               |  1 +
 configs/kmopti2_defconfig                              |  1 +
 configs/kmsugp1_defconfig                              |  1 +
 configs/kmsupx5_defconfig                              |  1 +
 configs/kmsuv31_defconfig                              |  1 +
 configs/kmvect1_defconfig                              |  1 +
 configs/kwb_defconfig                                  |  1 +
 configs/ls1021aqds_nor_SECURE_BOOT_defconfig           |  1 +
 configs/ls1021atwr_nor_SECURE_BOOT_defconfig           |  1 +
 configs/ls2085a_emu_defconfig                          |  1 +
 configs/ls2085a_simu_defconfig                         |  1 +
 configs/ls2085aqds_defconfig                           |  1 +
 configs/ls2085aqds_nand_defconfig                      |  1 +
 configs/ls2085ardb_defconfig                           |  1 +
 configs/ls2085ardb_nand_defconfig                      |  1 +
 configs/luan_defconfig                                 |  1 +
 configs/makalu_defconfig                               |  1 +
 configs/marsboard_defconfig                            |  1 +
 configs/mecp5123_defconfig                             |  1 +
 configs/medcom-wide_defconfig                          |  1 +
 configs/mgcoge3ne_defconfig                            |  1 +
 configs/mgcoge3un_defconfig                            |  1 +
 configs/mgcoge_defconfig                               |  1 +
 configs/mixtile_loftq_defconfig                        |  1 +
 configs/mk802_a10s_defconfig                           |  1 +
 configs/mk802_defconfig                                |  1 +
 configs/mk802ii_defconfig                              |  1 +
 configs/ml507_defconfig                                |  1 +
 configs/ml507_flash_defconfig                          |  1 +
 configs/motionpro_defconfig                            |  1 +
 configs/mpc5121ads_defconfig                           |  1 +
 configs/mpc5121ads_rev2_defconfig                      |  1 +
 configs/mpc8308_p1m_defconfig                          |  1 +
 configs/mt_ventoux_defconfig                           |  1 +
 configs/munices_defconfig                              |  1 +
 configs/neo_defconfig                                  |  1 +
 configs/nokia_rx51_defconfig                           |  1 +
 configs/nyan-big_defconfig                             |  1 +
 configs/ocotea_defconfig                               |  1 +
 configs/odroid-xu3_defconfig                           |  1 +
 configs/odroid_defconfig                               |  1 +
 configs/omap3_evm_quick_mmc_defconfig                  |  1 +
 configs/omap3_evm_quick_nand_defconfig                 |  1 +
 configs/origen_defconfig                               |  1 +
 configs/p2371-0000_defconfig                           |  1 +
 configs/p2371-2180_defconfig                           |  1 +
 configs/p2571_defconfig                                |  1 +
 configs/paz00_defconfig                                |  1 +
 configs/pb1000_defconfig                               |  1 +
 configs/pdm360ng_defconfig                             |  1 +
 configs/peach-pi_defconfig                             |  1 +
 configs/peach-pit_defconfig                            |  1 +
 configs/plutux_defconfig                               |  1 +
 configs/portl2_defconfig                               |  1 +
 configs/pov_protab2_ips9_defconfig                     |  1 +
 configs/pr1_defconfig                                  |  1 +
 configs/q8_a13_tablet_defconfig                        |  1 +
 configs/q8_a23_tablet_800x480_defconfig                |  1 +
 configs/q8_a33_tablet_1024x600_defconfig               |  1 +
 configs/q8_a33_tablet_800x480_defconfig                |  1 +
 configs/qemu_mips64_defconfig                          |  1 +
 configs/qemu_mips64el_defconfig                        |  1 +
 configs/qemu_mips_defconfig                            |  1 +
 configs/qemu_mipsel_defconfig                          |  1 +
 configs/r7-tv-dongle_defconfig                         |  1 +
 configs/rainier_defconfig                              |  1 +
 configs/rainier_ramboot_defconfig                      |  1 +
 configs/redwood_defconfig                              |  1 +
 configs/riotboard_defconfig                            |  1 +
 configs/rpi_2_defconfig                                |  1 +
 configs/rpi_defconfig                                  |  1 +
 configs/s5pc210_universal_defconfig                    |  1 +
 configs/sandbox_defconfig                              |  1 +
 configs/sbc8349_PCI_33_defconfig                       |  1 +
 configs/sbc8349_PCI_66_defconfig                       |  1 +
 configs/sbc8349_defconfig                              |  1 +
 configs/sbc8548_PCI_33_PCIE_defconfig                  |  1 +
 configs/sbc8548_PCI_33_defconfig                       |  1 +
 configs/sbc8548_PCI_66_PCIE_defconfig                  |  1 +
 configs/sbc8548_PCI_66_defconfig                       |  1 +
 configs/sbc8548_defconfig                              |  1 +
 configs/sbc8641d_defconfig                             |  1 +
 configs/seaboard_defconfig                             |  1 +
 configs/sequoia_defconfig                              |  1 +
 configs/sequoia_ramboot_defconfig                      |  1 +
 configs/smdk2410_defconfig                             |  1 +
 configs/smdk5250_defconfig                             |  1 +
 configs/smdk5420_defconfig                             |  1 +
 configs/smdkv310_defconfig                             |  1 +
 configs/snow_defconfig                                 |  1 +
 configs/spring_defconfig                               |  1 +
 configs/sunxi_Gemei_G9_defconfig                       |  1 +
 configs/suvd3_defconfig                                |  1 +
 configs/sycamore_defconfig                             |  1 +
 configs/t3corp_defconfig                               |  1 +
 configs/taihu_defconfig                                |  1 +
 configs/taishan_defconfig                              |  1 +
 configs/tec-ng_defconfig                               |  1 +
 configs/tec_defconfig                                  |  1 +
 configs/trats2_defconfig                               |  1 +
 configs/trats_defconfig                                |  1 +
 configs/tricorder_defconfig                            |  1 +
 configs/tricorder_flash_defconfig                      |  1 +
 configs/trimslice_defconfig                            |  1 +
 configs/tseries_mmc_defconfig                          |  1 +
 configs/tseries_nand_defconfig                         |  1 +
 configs/tseries_spi_defconfig                          |  1 +
 configs/tuge1_defconfig                                |  1 +
 configs/tuxx1_defconfig                                |  1 +
 configs/twister_defconfig                              |  1 +
 configs/usbarmory_defconfig                            |  1 +
 configs/v5fx30teval_defconfig                          |  1 +
 configs/v5fx30teval_flash_defconfig                    |  1 +
 configs/vct_platinum_defconfig                         |  1 +
 configs/vct_platinum_onenand_defconfig                 |  1 +
 configs/vct_platinum_onenand_small_defconfig           |  1 +
 configs/vct_platinum_small_defconfig                   |  1 +
 configs/vct_platinumavc_defconfig                      |  1 +
 configs/vct_platinumavc_onenand_defconfig              |  1 +
 configs/vct_platinumavc_onenand_small_defconfig        |  1 +
 configs/vct_platinumavc_small_defconfig                |  1 +
 configs/vct_premium_defconfig                          |  1 +
 configs/vct_premium_onenand_defconfig                  |  1 +
 configs/vct_premium_onenand_small_defconfig            |  1 +
 configs/vct_premium_small_defconfig                    |  1 +
 configs/ve8313_defconfig                               |  1 +
 configs/venice2_defconfig                              |  1 +
 configs/ventana_defconfig                              |  1 +
 configs/vexpress_ca15_tc2_defconfig                    |  1 +
 configs/vexpress_ca5x2_defconfig                       |  1 +
 configs/vexpress_ca9x4_defconfig                       |  1 +
 configs/vme8349_defconfig                              |  1 +
 configs/walnut_defconfig                               |  1 +
 configs/whistler_defconfig                             |  1 +
 configs/wtk_defconfig                                  |  1 +
 configs/xilinx-ppc405-generic_defconfig                |  1 +
 configs/xilinx-ppc405-generic_flash_defconfig          |  1 +
 configs/xilinx-ppc440-generic_defconfig                |  1 +
 configs/xilinx-ppc440-generic_flash_defconfig          |  1 +
 configs/xilinx_zynqmp_ep_defconfig                     |  1 +
 configs/yellowstone_defconfig                          |  1 +
 configs/yosemite_defconfig                             |  1 +
 configs/yucca_defconfig                                |  1 +
 configs/zmx25_defconfig                                |  1 +
 include/config_distro_defaults.h                       |  1 -
 include/config_fsl_secboot.h                           |  7 +------
 include/configs/B4860QDS.h                             |  2 --
 include/configs/BSC9131RDB.h                           |  1 -
 include/configs/BSC9132QDS.h                           |  1 -
 include/configs/C29XPCIE.h                             |  2 --
 include/configs/CPCI2DP.h                              |  1 -
 include/configs/CPCI4052.h                             |  1 -
 include/configs/M5208EVBE.h                            |  1 -
 include/configs/M52277EVB.h                            |  1 -
 include/configs/M5235EVB.h                             |  1 -
 include/configs/M5253DEMO.h                            |  2 --
 include/configs/M5253EVBE.h                            |  2 --
 include/configs/M5272C3.h                              |  2 --
 include/configs/M5275EVB.h                             |  1 -
 include/configs/M5282EVB.h                             |  1 -
 include/configs/M53017EVB.h                            |  1 -
 include/configs/M5329EVB.h                             |  1 -
 include/configs/M5373EVB.h                             |  1 -
 include/configs/M54418TWR.h                            |  2 --
 include/configs/M54451EVB.h                            |  1 -
 include/configs/M54455EVB.h                            |  1 -
 include/configs/M5475EVB.h                             |  1 -
 include/configs/M5485EVB.h                             |  1 -
 include/configs/MIP405.h                               |  1 -
 include/configs/MPC8308RDB.h                           |  2 --
 include/configs/MPC8313ERDB.h                          |  1 -
 include/configs/MPC8315ERDB.h                          |  1 -
 include/configs/MPC8323ERDB.h                          |  1 -
 include/configs/MPC832XEMDS.h                          |  1 -
 include/configs/MPC8349EMDS.h                          |  1 -
 include/configs/MPC8349ITX.h                           |  2 --
 include/configs/MPC837XEMDS.h                          |  1 -
 include/configs/MPC837XERDB.h                          |  1 -
 include/configs/MPC8536DS.h                            |  1 -
 include/configs/MPC8540ADS.h                           |  1 -
 include/configs/MPC8541CDS.h                           |  1 -
 include/configs/MPC8544DS.h                            |  1 -
 include/configs/MPC8548CDS.h                           |  1 -
 include/configs/MPC8555CDS.h                           |  1 -
 include/configs/MPC8560ADS.h                           |  1 -
 include/configs/MPC8568MDS.h                           |  1 -
 include/configs/MPC8569MDS.h                           |  1 -
 include/configs/MPC8572DS.h                            |  1 -
 include/configs/MPC8610HPCD.h                          |  1 -
 include/configs/MPC8641HPCN.h                          |  1 -
 include/configs/MigoR.h                                |  1 -
 include/configs/P1010RDB.h                             |  1 -
 include/configs/P1022DS.h                              |  2 --
 include/configs/P1023RDB.h                             |  2 --
 include/configs/P2041RDB.h                             |  2 --
 include/configs/PATI.h                                 |  6 ------
 include/configs/PIP405.h                               |  2 --
 include/configs/PLU405.h                               |  1 -
 include/configs/PMC405DE.h                             |  1 -
 include/configs/PMC440.h                               |  2 --
 include/configs/T102xQDS.h                             |  1 -
 include/configs/T102xRDB.h                             |  1 -
 include/configs/T1040QDS.h                             |  2 --
 include/configs/T104xRDB.h                             |  2 --
 include/configs/T208xQDS.h                             |  1 -
 include/configs/T208xRDB.h                             |  1 -
 include/configs/T4240QDS.h                             |  2 --
 include/configs/T4240RDB.h                             |  2 --
 include/configs/TQM5200.h                              |  5 -----
 include/configs/TQM823L.h                              |  2 --
 include/configs/TQM823M.h                              |  2 --
 include/configs/TQM834x.h                              |  1 -
 include/configs/TQM850L.h                              |  2 --
 include/configs/TQM850M.h                              |  2 --
 include/configs/TQM855L.h                              |  2 --
 include/configs/TQM855M.h                              |  2 --
 include/configs/TQM860L.h                              |  2 --
 include/configs/TQM860M.h                              |  2 --
 include/configs/TQM862L.h                              |  2 --
 include/configs/TQM862M.h                              |  2 --
 include/configs/TQM866M.h                              |  2 --
 include/configs/TQM885D.h                              |  2 --
 include/configs/UCP1020.h                              |  3 ---
 include/configs/VCMA9.h                                |  1 -
 include/configs/VOM405.h                               |  1 -
 include/configs/a3m071.h                               |  1 -
 include/configs/a4m072.h                               |  5 -----
 include/configs/ac14xx.h                               |  2 --
 include/configs/adp-ag101p.h                           |  2 --
 include/configs/am335x_sl50.h                          |  1 -
 include/configs/am3517_crane.h                         |  2 --
 include/configs/am3517_evm.h                           |  2 --
 include/configs/amcc-common.h                          |  1 -
 include/configs/amcore.h                               |  1 -
 include/configs/ap325rxa.h                             |  1 -
 include/configs/ap_sh4a_4a.h                           |  1 -
 include/configs/apf27.h                                |  1 -
 include/configs/apx4devkit.h                           |  1 -
 include/configs/arcangel4.h                            |  1 -
 include/configs/aria.h                                 |  1 -
 include/configs/armadillo-800eva.h                     |  1 -
 include/configs/astro_mcf5373l.h                       | 15 ---------------
 include/configs/at91-sama5_common.h                    |  2 --
 include/configs/at91rm9200ek.h                         |  5 -----
 include/configs/at91sam9260ek.h                        |  2 --
 include/configs/at91sam9261ek.h                        |  2 --
 include/configs/at91sam9263ek.h                        |  2 --
 include/configs/at91sam9m10g45ek.h                     |  2 --
 include/configs/at91sam9n12ek.h                        |  2 --
 include/configs/at91sam9rlek.h                         |  2 --
 include/configs/at91sam9x5ek.h                         |  2 --
 include/configs/atngw100.h                             |  2 --
 include/configs/atngw100mkii.h                         |  2 --
 include/configs/atstk1002.h                            |  2 --
 include/configs/axs101.h                               |  1 -
 include/configs/bct-brettl2.h                          |  1 -
 include/configs/bf525-ucr2.h                           |  1 -
 include/configs/bf537-minotaur.h                       |  6 ------
 include/configs/bf537-srv1.h                           |  6 ------
 include/configs/bfin_adi_common.h                      |  7 -------
 include/configs/bg0900.h                               |  1 -
 include/configs/blackstamp.h                           |  1 -
 include/configs/blackvme.h                             |  1 -
 include/configs/br4.h                                  |  1 -
 include/configs/calimain.h                             |  1 -
 include/configs/canmb.h                                |  5 -----
 include/configs/cm5200.h                               |  4 ----
 include/configs/cm_t35.h                               |  1 -
 include/configs/cm_t3517.h                             |  1 -
 include/configs/cm_t43.h                               |  1 -
 include/configs/cm_t54.h                               |  2 --
 include/configs/cobra5272.h                            |  8 --------
 include/configs/colibri_pxa270.h                       |  1 -
 include/configs/colibri_vf.h                           |  1 -
 include/configs/controlcenterd.h                       |  3 ---
 include/configs/corenet_ds.h                           |  2 --
 include/configs/corvus.h                               |  2 --
 include/configs/da850evm.h                             |  1 -
 include/configs/dbau1x00.h                             |  2 --
 include/configs/devkit3250.h                           |  1 -
 include/configs/digsy_mtc.h                            |  5 -----
 include/configs/draco.h                                |  3 ---
 include/configs/ea20.h                                 |  1 -
 include/configs/eb_cpu5282.h                           |  1 -
 include/configs/eco5pk.h                               |  1 -
 include/configs/ecovec.h                               |  1 -
 include/configs/edb93xx.h                              |  1 -
 include/configs/edminiv2.h                             |  3 ---
 include/configs/espt.h                                 |  1 -
 include/configs/ethernut5.h                            |  1 -
 include/configs/flea3.h                                |  2 --
 include/configs/gr_cpci_ax2000.h                       |  5 -----
 include/configs/gr_ep2s60.h                            |  5 -----
 include/configs/gr_xc3s_1500.h                         |  5 -----
 include/configs/grasshopper.h                          |  2 --
 include/configs/grsim.h                                |  5 -----
 include/configs/grsim_leon2.h                          |  5 -----
 include/configs/h2200.h                                |  1 -
 include/configs/hrcon.h                                |  2 --
 include/configs/ids8313.h                              |  1 -
 include/configs/imx27lite-common.h                     |  2 --
 include/configs/imx31_phycore.h                        |  2 --
 include/configs/inka4x0.h                              |  5 -----
 include/configs/integratorap.h                         |  1 -
 include/configs/integratorcp.h                         |  1 -
 include/configs/ipam390.h                              |  1 -
 include/configs/ipek01.h                               |  5 -----
 include/configs/jupiter.h                              |  6 ------
 include/configs/km/keymile-common.h                    |  1 -
 include/configs/kwb.h                                  |  1 -
 include/configs/kzm9g.h                                |  1 -
 include/configs/ls1021aqds.h                           |  2 --
 include/configs/ls1021atwr.h                           |  2 --
 include/configs/ls2085a_common.h                       |  1 -
 include/configs/m28evk.h                               |  1 -
 include/configs/m53evk.h                               |  1 -
 include/configs/manroland/common.h                     |  5 -----
 include/configs/mcx.h                                  |  2 --
 include/configs/mecp5123.h                             |  1 -
 include/configs/meesc.h                                |  1 -
 include/configs/microblaze-generic.h                   |  1 -
 include/configs/motionpro.h                            |  4 ----
 include/configs/mpc5121ads.h                           |  1 -
 include/configs/mpc8308_p1m.h                          |  2 --
 include/configs/ms7722se.h                             |  1 -
 include/configs/ms7750se.h                             |  1 -
 include/configs/mt_ventoux.h                           |  1 -
 include/configs/munices.h                              |  1 -
 include/configs/mv-common.h                            |  2 --
 include/configs/mx23_olinuxino.h                       |  1 -
 include/configs/mx23evk.h                              |  1 -
 include/configs/mx25pdk.h                              |  2 --
 include/configs/mx28evk.h                              |  1 -
 include/configs/mx31ads.h                              |  2 --
 include/configs/mx31pdk.h                              |  2 --
 include/configs/mx35pdk.h                              |  2 --
 include/configs/mx51evk.h                              |  2 --
 include/configs/mx53ard.h                              |  2 --
 include/configs/mx53evk.h                              |  2 --
 include/configs/mx53loco.h                             |  2 --
 include/configs/mx53smd.h                              |  2 --
 include/configs/mx6_common.h                           |  4 ----
 include/configs/mx7_common.h                           |  4 ----
 include/configs/nokia_rx51.h                           |  1 -
 include/configs/o2dnt-common.h                         |  2 --
 include/configs/omap3_cairo.h                          |  4 ----
 include/configs/omap3_evm.h                            |  2 --
 include/configs/omap3_evm_quick_mmc.h                  |  2 --
 include/configs/omap3_evm_quick_nand.h                 |  2 --
 include/configs/omap3_igep00x0.h                       |  2 --
 include/configs/omapl138_lcdk.h                        |  1 -
 include/configs/p1_p2_rdb_pc.h                         |  1 -
 include/configs/p1_twr.h                               |  1 -
 include/configs/pb1x00.h                               |  2 --
 include/configs/pcm030.h                               |  1 -
 include/configs/pcm052.h                               |  2 --
 include/configs/pdm360ng.h                             |  2 --
 include/configs/picosam9g45.h                          |  2 --
 include/configs/pm9261.h                               |  2 --
 include/configs/pm9263.h                               |  2 --
 include/configs/pm9g45.h                               |  2 --
 include/configs/pr1.h                                  |  1 -
 include/configs/pxm2.h                                 |  2 --
 include/configs/qemu-mips.h                            |  2 --
 include/configs/qemu-mips64.h                          |  2 --
 include/configs/qemu-ppce500.h                         |  1 -
 include/configs/r0p7734.h                              |  1 -
 include/configs/r2dplus.h                              |  1 -
 include/configs/r7780mp.h                              |  1 -
 include/configs/rastaban.h                             |  2 --
 include/configs/rcar-gen2-common.h                     |  1 -
 include/configs/redwood.h                              |  2 --
 include/configs/rpi-common.h                           |  2 --
 include/configs/rsk7264.h                              |  1 -
 include/configs/rsk7269.h                              |  1 -
 include/configs/rut.h                                  |  2 --
 include/configs/sansa_fuze_plus.h                      |  1 -
 include/configs/sbc8349.h                              |  1 -
 include/configs/sbc8548.h                              |  1 -
 include/configs/sbc8641d.h                             |  1 -
 include/configs/sc_sps_1.h                             |  1 -
 include/configs/sh7752evb.h                            |  1 -
 include/configs/sh7753evb.h                            |  1 -
 include/configs/sh7757lcr.h                            |  1 -
 include/configs/sh7763rdp.h                            |  1 -
 include/configs/sh7785lcr.h                            |  1 -
 include/configs/smartweb.h                             |  1 -
 include/configs/smdk2410.h                             |  1 -
 include/configs/smdkc100.h                             |  2 --
 include/configs/snapper9260.h                          |  1 -
 include/configs/sniper.h                               |  1 -
 include/configs/socfpga_arria5_socdk.h                 |  1 -
 include/configs/socfpga_cyclone5_socdk.h               |  1 -
 include/configs/socfpga_de0_nano_soc.h                 |  1 -
 include/configs/socfpga_mcvevk.h                       |  1 -
 include/configs/socfpga_sockit.h                       |  1 -
 include/configs/socrates.h                             |  2 --
 include/configs/spear-common.h                         |  6 ------
 include/configs/stm32f429-discovery.h                  |  1 -
 include/configs/stv0991.h                              |  1 -
 include/configs/tao3530.h                              |  1 -
 include/configs/taurus.h                               |  2 --
 include/configs/tb100.h                                |  1 -
 include/configs/thuban.h                               |  2 --
 include/configs/ti814x_evm.h                           |  1 -
 include/configs/ti816x_evm.h                           |  1 -
 include/configs/ti_armv7_common.h                      |  5 -----
 include/configs/tricorder.h                            |  2 --
 include/configs/ts4800.h                               |  3 ---
 include/configs/tseries.h                              |  1 -
 include/configs/twister.h                              |  2 --
 include/configs/uniphier.h                             |  1 -
 include/configs/usb_a9263.h                            |  2 --
 include/configs/v38b.h                                 |  5 -----
 include/configs/vct.h                                  |  1 -
 include/configs/ve8313.h                               |  1 -
 include/configs/vexpress_aemv8a.h                      |  4 ----
 include/configs/vexpress_common.h                      |  1 -
 include/configs/vf610twr.h                             |  2 --
 include/configs/vme8349.h                              |  1 -
 include/configs/woodburn_common.h                      |  2 --
 include/configs/work_92105.h                           |  1 -
 include/configs/x600.h                                 |  2 --
 include/configs/xfi3.h                                 |  1 -
 include/configs/xilinx-ppc.h                           |  1 -
 include/configs/xilinx_zynqmp.h                        |  1 -
 include/configs/xpedite1000.h                          |  1 -
 include/configs/xpedite517x.h                          |  1 -
 include/configs/xpedite520x.h                          |  1 -
 include/configs/xpedite537x.h                          |  1 -
 include/configs/xpedite550x.h                          |  1 -
 include/configs/zmx25.h                                |  2 --
 include/configs/zynq-common.h                          |  1 -
 906 files changed, 618 insertions(+), 531 deletions(-)

diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig
index f01ace6..22daa0e 100644
--- a/configs/A10-OLinuXino-Lime_defconfig
+++ b/configs/A10-OLinuXino-Lime_defconfig
@@ -9,6 +9,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-olinuxino-lime"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3)"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/A10s-OLinuXino-M_defconfig b/configs/A10s-OLinuXino-M_defconfig
index 54506e4..404373e 100644
--- a/configs/A10s-OLinuXino-M_defconfig
+++ b/configs/A10s-OLinuXino-M_defconfig
@@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-olinuxino-micro"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,SUNXI_EMAC"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig
index b729c94..c6f5d35 100644
--- a/configs/A13-OLinuXinoM_defconfig
+++ b/configs/A13-OLinuXinoM_defconfig
@@ -14,6 +14,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino-micro"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig
index c6d8f14..ce5b78b 100644
--- a/configs/A13-OLinuXino_defconfig
+++ b/configs/A13-OLinuXino_defconfig
@@ -15,6 +15,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig
index f38111a..e0174fe 100644
--- a/configs/A20-OLinuXino-Lime2_defconfig
+++ b/configs/A20-OLinuXino-Lime2_defconfig
@@ -9,6 +9,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime2"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3)"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig
index ecdfc95..e22385f 100644
--- a/configs/A20-OLinuXino-Lime_defconfig
+++ b/configs/A20-OLinuXino-Lime_defconfig
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPC(3)"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig
index 85e1b42..2d57c0a 100644
--- a/configs/A20-OLinuXino_MICRO_defconfig
+++ b/configs/A20-OLinuXino_MICRO_defconfig
@@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-micro"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8)"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/A20-Olimex-SOM-EVB_defconfig b/configs/A20-Olimex-SOM-EVB_defconfig
index 9cfa388..c380b49 100644
--- a/configs/A20-Olimex-SOM-EVB_defconfig
+++ b/configs/A20-Olimex-SOM-EVB_defconfig
@@ -9,6 +9,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olimex-som-evb"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3)"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Ainol_AW1_defconfig b/configs/Ainol_AW1_defconfig
index 1fc55b0..f082d57 100644
--- a/configs/Ainol_AW1_defconfig
+++ b/configs/Ainol_AW1_defconfig
@@ -15,6 +15,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-ainol-aw1"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Ampe_A76_defconfig b/configs/Ampe_A76_defconfig
index 81e49cb..67a294b 100644
--- a/configs/Ampe_A76_defconfig
+++ b/configs/Ampe_A76_defconfig
@@ -16,6 +16,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-ampe-a76"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Auxtek-T003_defconfig b/configs/Auxtek-T003_defconfig
index ddcf572..00b2671 100644
--- a/configs/Auxtek-T003_defconfig
+++ b/configs/Auxtek-T003_defconfig
@@ -9,6 +9,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-auxtek-t003"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Auxtek-T004_defconfig b/configs/Auxtek-T004_defconfig
index 4e6db4a..1e0959a 100644
--- a/configs/Auxtek-T004_defconfig
+++ b/configs/Auxtek-T004_defconfig
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-auxtek-t004"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/B4420QDS_NAND_defconfig b/configs/B4420QDS_NAND_defconfig
index 986eda6..5a4fbfd 100644
--- a/configs/B4420QDS_NAND_defconfig
+++ b/configs/B4420QDS_NAND_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_B4860QDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4420,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/B4420QDS_SPIFLASH_defconfig b/configs/B4420QDS_SPIFLASH_defconfig
index 5c6a319..fb23d59 100644
--- a/configs/B4420QDS_SPIFLASH_defconfig
+++ b/configs/B4420QDS_SPIFLASH_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_B4860QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4420,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/B4420QDS_defconfig b/configs/B4420QDS_defconfig
index 8568f7d..b618019 100644
--- a/configs/B4420QDS_defconfig
+++ b/configs/B4420QDS_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_B4860QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4420"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/B4860QDS_NAND_defconfig b/configs/B4860QDS_NAND_defconfig
index a48ada4..a6ab70e 100644
--- a/configs/B4860QDS_NAND_defconfig
+++ b/configs/B4860QDS_NAND_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_B4860QDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/B4860QDS_SECURE_BOOT_defconfig b/configs/B4860QDS_SECURE_BOOT_defconfig
index 60ff218..2e96c64 100644
--- a/configs/B4860QDS_SECURE_BOOT_defconfig
+++ b/configs/B4860QDS_SECURE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_B4860QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/B4860QDS_SPIFLASH_defconfig b/configs/B4860QDS_SPIFLASH_defconfig
index 7e8449e..c14b069 100644
--- a/configs/B4860QDS_SPIFLASH_defconfig
+++ b/configs/B4860QDS_SPIFLASH_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_B4860QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig b/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig
index 5e3fd50..f2d2ee6 100644
--- a/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/B4860QDS_SRIO_PCIE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_B4860QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/B4860QDS_defconfig b/configs/B4860QDS_defconfig
index d5c7545..d91b7d3 100644
--- a/configs/B4860QDS_defconfig
+++ b/configs/B4860QDS_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_B4860QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/BSC9131RDB_NAND_SYSCLK100_defconfig b/configs/BSC9131RDB_NAND_SYSCLK100_defconfig
index 90aa865..b625eff 100644
--- a/configs/BSC9131RDB_NAND_SYSCLK100_defconfig
+++ b/configs/BSC9131RDB_NAND_SYSCLK100_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9131RDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,NAND,SYS_CLK_100"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9131RDB_NAND_defconfig b/configs/BSC9131RDB_NAND_defconfig
index 9cd68f0..081e9e2 100644
--- a/configs/BSC9131RDB_NAND_defconfig
+++ b/configs/BSC9131RDB_NAND_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9131RDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,NAND"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig b/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig
index d90d7a0..703f5e9 100644
--- a/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig
+++ b/configs/BSC9131RDB_SPIFLASH_SYSCLK100_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9131RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,SPIFLASH,SYS_CLK_100"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9131RDB_SPIFLASH_defconfig b/configs/BSC9131RDB_SPIFLASH_defconfig
index 4ba8d62..31bf0db 100644
--- a/configs/BSC9131RDB_SPIFLASH_defconfig
+++ b/configs/BSC9131RDB_SPIFLASH_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9131RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,SPIFLASH"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig
index b123f9e..a4b5a94 100644
--- a/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig
+++ b/configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND_SECBOOT,SYS_CLK_100_DDR_100,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/BSC9132QDS_NAND_DDRCLK100_defconfig b/configs/BSC9132QDS_NAND_DDRCLK100_defconfig
index 0da87b3..35ef7be 100644
--- a/configs/BSC9132QDS_NAND_DDRCLK100_defconfig
+++ b/configs/BSC9132QDS_NAND_DDRCLK100_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND,SYS_CLK_100_DDR_100"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig
index d8ad344..7816cd3 100644
--- a/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig
+++ b/configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND_SECBOOT,SYS_CLK_100_DDR_133,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/BSC9132QDS_NAND_DDRCLK133_defconfig b/configs/BSC9132QDS_NAND_DDRCLK133_defconfig
index 738c490..06b31c0 100644
--- a/configs/BSC9132QDS_NAND_DDRCLK133_defconfig
+++ b/configs/BSC9132QDS_NAND_DDRCLK133_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND,SYS_CLK_100_DDR_133"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig
index c468137..252e04e 100644
--- a/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig
+++ b/configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_100,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/BSC9132QDS_NOR_DDRCLK100_defconfig b/configs/BSC9132QDS_NOR_DDRCLK100_defconfig
index 31a5223..fa7bd760 100644
--- a/configs/BSC9132QDS_NOR_DDRCLK100_defconfig
+++ b/configs/BSC9132QDS_NOR_DDRCLK100_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_100"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig
index 726c8ff..d8ba096 100644
--- a/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig
+++ b/configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_133,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/BSC9132QDS_NOR_DDRCLK133_defconfig b/configs/BSC9132QDS_NOR_DDRCLK133_defconfig
index ff4e4b4..f381b47 100644
--- a/configs/BSC9132QDS_NOR_DDRCLK133_defconfig
+++ b/configs/BSC9132QDS_NOR_DDRCLK133_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_133"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig
index 61725cd..d33ff25 100644
--- a/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig
+++ b/configs/BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_100,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig
index 484857a..f067fac 100644
--- a/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig
+++ b/configs/BSC9132QDS_SDCARD_DDRCLK100_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_100"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig
index c4a772a..638babc 100644
--- a/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig
+++ b/configs/BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_133,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig b/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig
index fcada6d..604b9ae 100644
--- a/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig
+++ b/configs/BSC9132QDS_SDCARD_DDRCLK133_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_133"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig
index 9282e0e..c9f7e7f 100644
--- a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig
+++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_100,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig
index f6ad1e9..ea10b65 100644
--- a/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig
+++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK100_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_100"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig
index f3c5702..12c6031 100644
--- a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig
+++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_133,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig
index 7f3554d..ca03386 100644
--- a/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig
+++ b/configs/BSC9132QDS_SPIFLASH_DDRCLK133_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_BSC9132QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_133"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig
index 610ee6d..5889d89 100644
--- a/configs/Bananapi_defconfig
+++ b/configs/Bananapi_defconfig
@@ -8,6 +8,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapi"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Bananapro_defconfig b/configs/Bananapro_defconfig
index 1a9e261..22329c4 100644
--- a/configs/Bananapro_defconfig
+++ b/configs/Bananapro_defconfig
@@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapro"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/C29XPCIE_NOR_SECBOOT_defconfig b/configs/C29XPCIE_NOR_SECBOOT_defconfig
index bcc2701..cf13e0b 100644
--- a/configs/C29XPCIE_NOR_SECBOOT_defconfig
+++ b/configs/C29XPCIE_NOR_SECBOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_C29XPCIE=y
 CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig b/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
index 2f151fa..2f7092e 100644
--- a/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
+++ b/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_C29XPCIE=y
 CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,SPIFLASH,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/CSQ_CS908_defconfig b/configs/CSQ_CS908_defconfig
index 4c3874c..f2a038c 100644
--- a/configs/CSQ_CS908_defconfig
+++ b/configs/CSQ_CS908_defconfig
@@ -8,6 +8,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31s-cs908"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Chuwi_V7_CW0825_defconfig b/configs/Chuwi_V7_CW0825_defconfig
index 0145bd6..2f376db 100644
--- a/configs/Chuwi_V7_CW0825_defconfig
+++ b/configs/Chuwi_V7_CW0825_defconfig
@@ -15,6 +15,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-chuwi-v7-cw0825"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Colombus_defconfig b/configs/Colombus_defconfig
index b3d3d79..1ac60cb 100644
--- a/configs/Colombus_defconfig
+++ b/configs/Colombus_defconfig
@@ -18,6 +18,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-colombus"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig
index f40cff1..5e91225 100644
--- a/configs/Cubieboard2_defconfig
+++ b/configs/Cubieboard2_defconfig
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubieboard2"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8)"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig
index e3359fa..6960fb6 100644
--- a/configs/Cubieboard_defconfig
+++ b/configs/Cubieboard_defconfig
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-cubieboard"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8)"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
index 3554b63..8e99ff9 100644
--- a/configs/Cubietruck_defconfig
+++ b/configs/Cubietruck_defconfig
@@ -9,6 +9,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubietruck"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12)"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Et_q8_v1_6_defconfig b/configs/Et_q8_v1_6_defconfig
index ec38d1e..56e00dc 100644
--- a/configs/Et_q8_v1_6_defconfig
+++ b/configs/Et_q8_v1_6_defconfig
@@ -15,6 +15,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-et-q8-v1.6"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Hummingbird_A31_defconfig b/configs/Hummingbird_A31_defconfig
index e1767b7..c06880d 100644
--- a/configs/Hummingbird_A31_defconfig
+++ b/configs/Hummingbird_A31_defconfig
@@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-hummingbird"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPA(21)"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Hyundai_A7HD_defconfig b/configs/Hyundai_A7HD_defconfig
index ac68288..bf1d789 100644
--- a/configs/Hyundai_A7HD_defconfig
+++ b/configs/Hyundai_A7HD_defconfig
@@ -16,6 +16,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-hyundai-a7hd"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig b/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig
index 78d341f..a8891c3 100644
--- a/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig
+++ b/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig
@@ -16,6 +16,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-ippo-q8h-v1.2"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Ippo_q8h_v1_2_defconfig b/configs/Ippo_q8h_v1_2_defconfig
index c84d668..e622e32 100644
--- a/configs/Ippo_q8h_v1_2_defconfig
+++ b/configs/Ippo_q8h_v1_2_defconfig
@@ -16,6 +16,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-ippo-q8h-v1.2"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Ippo_q8h_v5_defconfig b/configs/Ippo_q8h_v5_defconfig
index 9788550..402e822 100644
--- a/configs/Ippo_q8h_v5_defconfig
+++ b/configs/Ippo_q8h_v5_defconfig
@@ -16,6 +16,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-ippo-q8h-v5"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Linksprite_pcDuino3_Nano_defconfig b/configs/Linksprite_pcDuino3_Nano_defconfig
index 81c5bab..4dc16bf 100644
--- a/configs/Linksprite_pcDuino3_Nano_defconfig
+++ b/configs/Linksprite_pcDuino3_Nano_defconfig
@@ -9,6 +9,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3-nano"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(2)"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig
index be9e401..291b360 100644
--- a/configs/Linksprite_pcDuino3_defconfig
+++ b/configs/Linksprite_pcDuino3_defconfig
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2)"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Linksprite_pcDuino_defconfig b/configs/Linksprite_pcDuino_defconfig
index 1d57047..3f20c95 100644
--- a/configs/Linksprite_pcDuino_defconfig
+++ b/configs/Linksprite_pcDuino_defconfig
@@ -6,6 +6,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-pcduino"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/M5253DEMO_defconfig b/configs/M5253DEMO_defconfig
index 89e7e75..0fe3221 100644
--- a/configs/M5253DEMO_defconfig
+++ b/configs/M5253DEMO_defconfig
@@ -1,3 +1,4 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5253DEMO=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M5253EVBE_defconfig b/configs/M5253EVBE_defconfig
index e337f32..fdaf282 100644
--- a/configs/M5253EVBE_defconfig
+++ b/configs/M5253EVBE_defconfig
@@ -1,4 +1,5 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5253EVBE=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
diff --git a/configs/M5272C3_defconfig b/configs/M5272C3_defconfig
index 6e9609f..8d03800 100644
--- a/configs/M5272C3_defconfig
+++ b/configs/M5272C3_defconfig
@@ -1,6 +1,7 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5272C3=y
 CONFIG_SYS_PROMPT="-> "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M5275EVB_defconfig b/configs/M5275EVB_defconfig
index 5eb2373..6bfd7f7 100644
--- a/configs/M5275EVB_defconfig
+++ b/configs/M5275EVB_defconfig
@@ -1,6 +1,7 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5275EVB=y
 CONFIG_SYS_PROMPT="-> "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M5282EVB_defconfig b/configs/M5282EVB_defconfig
index e0af388..50831e8 100644
--- a/configs/M5282EVB_defconfig
+++ b/configs/M5282EVB_defconfig
@@ -1,6 +1,7 @@
 CONFIG_M68K=y
 CONFIG_TARGET_M5282EVB=y
 CONFIG_SYS_PROMPT="-> "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/M54418TWR_defconfig b/configs/M54418TWR_defconfig
index bc47ed6..c1486e4 100644
--- a/configs/M54418TWR_defconfig
+++ b/configs/M54418TWR_defconfig
@@ -2,6 +2,7 @@ CONFIG_M68K=y
 CONFIG_TARGET_M54418TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000"
 CONFIG_SYS_PROMPT="-> "
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
diff --git a/configs/M54418TWR_nand_mii_defconfig b/configs/M54418TWR_nand_mii_defconfig
index 949be9a..17b52f7 100644
--- a/configs/M54418TWR_nand_mii_defconfig
+++ b/configs/M54418TWR_nand_mii_defconfig
@@ -2,6 +2,7 @@ CONFIG_M68K=y
 CONFIG_TARGET_M54418TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=25000000"
 CONFIG_SYS_PROMPT="-> "
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
diff --git a/configs/M54418TWR_nand_rmii_defconfig b/configs/M54418TWR_nand_rmii_defconfig
index 4035ea9..4ba1ee4 100644
--- a/configs/M54418TWR_nand_rmii_defconfig
+++ b/configs/M54418TWR_nand_rmii_defconfig
@@ -2,6 +2,7 @@ CONFIG_M68K=y
 CONFIG_TARGET_M54418TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000"
 CONFIG_SYS_PROMPT="-> "
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
diff --git a/configs/M54418TWR_nand_rmii_lowfreq_defconfig b/configs/M54418TWR_nand_rmii_lowfreq_defconfig
index d89a587..023065a 100644
--- a/configs/M54418TWR_nand_rmii_lowfreq_defconfig
+++ b/configs/M54418TWR_nand_rmii_lowfreq_defconfig
@@ -2,6 +2,7 @@ CONFIG_M68K=y
 CONFIG_TARGET_M54418TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BOOT,LOW_MCFCLK,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000"
 CONFIG_SYS_PROMPT="-> "
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
diff --git a/configs/M54418TWR_serial_mii_defconfig b/configs/M54418TWR_serial_mii_defconfig
index cd383c2..4adb861 100644
--- a/configs/M54418TWR_serial_mii_defconfig
+++ b/configs/M54418TWR_serial_mii_defconfig
@@ -2,6 +2,7 @@ CONFIG_M68K=y
 CONFIG_TARGET_M54418TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=25000000"
 CONFIG_SYS_PROMPT="-> "
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
diff --git a/configs/M54418TWR_serial_rmii_defconfig b/configs/M54418TWR_serial_rmii_defconfig
index bc47ed6..c1486e4 100644
--- a/configs/M54418TWR_serial_rmii_defconfig
+++ b/configs/M54418TWR_serial_rmii_defconfig
@@ -2,6 +2,7 @@ CONFIG_M68K=y
 CONFIG_TARGET_M54418TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E00000,SYS_INPUT_CLKSRC=50000000"
 CONFIG_SYS_PROMPT="-> "
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
diff --git a/configs/MIP405T_defconfig b/configs/MIP405T_defconfig
index 22b82b1..201085d 100644
--- a/configs/MIP405T_defconfig
+++ b/configs/MIP405T_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_MIP405=y
 CONFIG_SYS_EXTRA_OPTIONS="MIP405T"
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MIP405_defconfig b/configs/MIP405_defconfig
index f25cf51..de49d7f 100644
--- a/configs/MIP405_defconfig
+++ b/configs/MIP405_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_MIP405=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MK808C_defconfig b/configs/MK808C_defconfig
index 64304ac..65cea99 100644
--- a/configs/MK808C_defconfig
+++ b/configs/MK808C_defconfig
@@ -6,6 +6,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-mk808c"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/MPC8308RDB_defconfig b/configs/MPC8308RDB_defconfig
index cb98324..ff10bc8 100644
--- a/configs/MPC8308RDB_defconfig
+++ b/configs/MPC8308RDB_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8308RDB=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC8313ERDB_33_defconfig b/configs/MPC8313ERDB_33_defconfig
index a984c48..58762a1 100644
--- a/configs/MPC8313ERDB_33_defconfig
+++ b/configs/MPC8313ERDB_33_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8313ERDB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_33MHZ"
+CONFIG_BOOTDELAY=6
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC8313ERDB_66_defconfig b/configs/MPC8313ERDB_66_defconfig
index 5b1ee7c..a287613 100644
--- a/configs/MPC8313ERDB_66_defconfig
+++ b/configs/MPC8313ERDB_66_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8313ERDB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_66MHZ"
+CONFIG_BOOTDELAY=6
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC8313ERDB_NAND_33_defconfig b/configs/MPC8313ERDB_NAND_33_defconfig
index b1052ef..6038de4 100644
--- a/configs/MPC8313ERDB_NAND_33_defconfig
+++ b/configs/MPC8313ERDB_NAND_33_defconfig
@@ -3,4 +3,5 @@ CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8313ERDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_33MHZ,NAND"
+CONFIG_BOOTDELAY=6
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC8313ERDB_NAND_66_defconfig b/configs/MPC8313ERDB_NAND_66_defconfig
index fe59fe8..c18545c 100644
--- a/configs/MPC8313ERDB_NAND_66_defconfig
+++ b/configs/MPC8313ERDB_NAND_66_defconfig
@@ -3,4 +3,5 @@ CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8313ERDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_66MHZ,NAND"
+CONFIG_BOOTDELAY=6
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC8315ERDB_defconfig b/configs/MPC8315ERDB_defconfig
index e618381..7502d28 100644
--- a/configs/MPC8315ERDB_defconfig
+++ b/configs/MPC8315ERDB_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8315ERDB=y
+CONFIG_BOOTDELAY=6
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC8323ERDB_defconfig b/configs/MPC8323ERDB_defconfig
index 762ad5b..70dd915 100644
--- a/configs/MPC8323ERDB_defconfig
+++ b/configs/MPC8323ERDB_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8323ERDB=y
+CONFIG_BOOTDELAY=6
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC832XEMDS_ATM_defconfig b/configs/MPC832XEMDS_ATM_defconfig
index b4b3724..78f7479 100644
--- a/configs/MPC832XEMDS_ATM_defconfig
+++ b/configs/MPC832XEMDS_ATM_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC832XEMDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PQ_MDS_PIB=1,PQ_MDS_PIB_ATM=1"
+CONFIG_BOOTDELAY=6
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC832XEMDS_HOST_33_defconfig b/configs/MPC832XEMDS_HOST_33_defconfig
index 9a2f338..bafc697 100644
--- a/configs/MPC832XEMDS_HOST_33_defconfig
+++ b/configs/MPC832XEMDS_HOST_33_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC832XEMDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PCI,PCI_33M,PQ_MDS_PIB=1"
+CONFIG_BOOTDELAY=6
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC832XEMDS_HOST_66_defconfig b/configs/MPC832XEMDS_HOST_66_defconfig
index 66e4269..87a0773 100644
--- a/configs/MPC832XEMDS_HOST_66_defconfig
+++ b/configs/MPC832XEMDS_HOST_66_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC832XEMDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PCI,PCI_66M,PQ_MDS_PIB=1"
+CONFIG_BOOTDELAY=6
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC832XEMDS_SLAVE_defconfig b/configs/MPC832XEMDS_SLAVE_defconfig
index 467f220..c438364 100644
--- a/configs/MPC832XEMDS_SLAVE_defconfig
+++ b/configs/MPC832XEMDS_SLAVE_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC832XEMDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PCI,PCISLAVE"
+CONFIG_BOOTDELAY=6
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC832XEMDS_defconfig b/configs/MPC832XEMDS_defconfig
index 3e24ab1..ec36d5b 100644
--- a/configs/MPC832XEMDS_defconfig
+++ b/configs/MPC832XEMDS_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC832XEMDS=y
+CONFIG_BOOTDELAY=6
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC8349EMDS_defconfig b/configs/MPC8349EMDS_defconfig
index 6a907cf..410ce39 100644
--- a/configs/MPC8349EMDS_defconfig
+++ b/configs/MPC8349EMDS_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8349EMDS=y
+CONFIG_BOOTDELAY=6
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC8349ITXGP_defconfig b/configs/MPC8349ITXGP_defconfig
index 1a85eea..28aecb4 100644
--- a/configs/MPC8349ITXGP_defconfig
+++ b/configs/MPC8349ITXGP_defconfig
@@ -3,4 +3,5 @@ CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8349ITX=y
 CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITXGP,SYS_TEXT_BASE=0xFE000000"
 CONFIG_SYS_PROMPT="MPC8349E-mITX-GP> "
+CONFIG_BOOTDELAY=6
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC8349ITX_LOWBOOT_defconfig b/configs/MPC8349ITX_LOWBOOT_defconfig
index 9aabd6a..d23edd2 100644
--- a/configs/MPC8349ITX_LOWBOOT_defconfig
+++ b/configs/MPC8349ITX_LOWBOOT_defconfig
@@ -3,4 +3,5 @@ CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8349ITX=y
 CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITX,SYS_TEXT_BASE=0xFE000000"
 CONFIG_SYS_PROMPT="MPC8349E-mITX> "
+CONFIG_BOOTDELAY=6
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC8349ITX_defconfig b/configs/MPC8349ITX_defconfig
index a5309de..94482f4 100644
--- a/configs/MPC8349ITX_defconfig
+++ b/configs/MPC8349ITX_defconfig
@@ -3,4 +3,5 @@ CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8349ITX=y
 CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITX"
 CONFIG_SYS_PROMPT="MPC8349E-mITX> "
+CONFIG_BOOTDELAY=6
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC837XEMDS_HOST_defconfig b/configs/MPC837XEMDS_HOST_defconfig
index 2e472a7..301655b 100644
--- a/configs/MPC837XEMDS_HOST_defconfig
+++ b/configs/MPC837XEMDS_HOST_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC837XEMDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PCI"
+CONFIG_BOOTDELAY=6
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC837XEMDS_defconfig b/configs/MPC837XEMDS_defconfig
index 21b4506..39a9a22 100644
--- a/configs/MPC837XEMDS_defconfig
+++ b/configs/MPC837XEMDS_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC837XEMDS=y
+CONFIG_BOOTDELAY=6
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC837XERDB_defconfig b/configs/MPC837XERDB_defconfig
index 126d0d2..926b7f3 100644
--- a/configs/MPC837XERDB_defconfig
+++ b/configs/MPC837XERDB_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC837XERDB=y
+CONFIG_BOOTDELAY=6
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC8536DS_36BIT_defconfig b/configs/MPC8536DS_36BIT_defconfig
index 6604004..d420939 100644
--- a/configs/MPC8536DS_36BIT_defconfig
+++ b/configs/MPC8536DS_36BIT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8536DS=y
 CONFIG_SYS_EXTRA_OPTIONS="36BIT"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/MPC8536DS_SDCARD_defconfig b/configs/MPC8536DS_SDCARD_defconfig
index d1bad84..0f331f2 100644
--- a/configs/MPC8536DS_SDCARD_defconfig
+++ b/configs/MPC8536DS_SDCARD_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8536DS=y
 CONFIG_SYS_EXTRA_OPTIONS="SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/MPC8536DS_SPIFLASH_defconfig b/configs/MPC8536DS_SPIFLASH_defconfig
index ad0ae69..13be385 100644
--- a/configs/MPC8536DS_SPIFLASH_defconfig
+++ b/configs/MPC8536DS_SPIFLASH_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8536DS=y
 CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/MPC8536DS_defconfig b/configs/MPC8536DS_defconfig
index 2e9ae63..eec4471 100644
--- a/configs/MPC8536DS_defconfig
+++ b/configs/MPC8536DS_defconfig
@@ -1,6 +1,7 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8536DS=y
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/MPC8540ADS_defconfig b/configs/MPC8540ADS_defconfig
index 41af349..15e43cd 100644
--- a/configs/MPC8540ADS_defconfig
+++ b/configs/MPC8540ADS_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8540ADS=y
+CONFIG_BOOTDELAY=10
diff --git a/configs/MPC8541CDS_defconfig b/configs/MPC8541CDS_defconfig
index bc9c246..6fb74e5 100644
--- a/configs/MPC8541CDS_defconfig
+++ b/configs/MPC8541CDS_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8541CDS=y
+CONFIG_BOOTDELAY=10
diff --git a/configs/MPC8541CDS_legacy_defconfig b/configs/MPC8541CDS_legacy_defconfig
index 55478ab..ba5a86e 100644
--- a/configs/MPC8541CDS_legacy_defconfig
+++ b/configs/MPC8541CDS_legacy_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8541CDS=y
 CONFIG_SYS_EXTRA_OPTIONS="LEGACY"
+CONFIG_BOOTDELAY=10
diff --git a/configs/MPC8544DS_defconfig b/configs/MPC8544DS_defconfig
index ab0c79b..c42dd47 100644
--- a/configs/MPC8544DS_defconfig
+++ b/configs/MPC8544DS_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8544DS=y
+CONFIG_BOOTDELAY=10
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/MPC8548CDS_36BIT_defconfig b/configs/MPC8548CDS_36BIT_defconfig
index 11d67ef..e4c0907 100644
--- a/configs/MPC8548CDS_36BIT_defconfig
+++ b/configs/MPC8548CDS_36BIT_defconfig
@@ -2,5 +2,6 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8548CDS=y
 CONFIG_SYS_EXTRA_OPTIONS="36BIT"
+CONFIG_BOOTDELAY=10
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/MPC8548CDS_defconfig b/configs/MPC8548CDS_defconfig
index 6a9ce6a..1a19a5e 100644
--- a/configs/MPC8548CDS_defconfig
+++ b/configs/MPC8548CDS_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8548CDS=y
+CONFIG_BOOTDELAY=10
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/MPC8548CDS_legacy_defconfig b/configs/MPC8548CDS_legacy_defconfig
index 381947f..c54c7b0 100644
--- a/configs/MPC8548CDS_legacy_defconfig
+++ b/configs/MPC8548CDS_legacy_defconfig
@@ -2,5 +2,6 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8548CDS=y
 CONFIG_SYS_EXTRA_OPTIONS="LEGACY"
+CONFIG_BOOTDELAY=10
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/MPC8555CDS_defconfig b/configs/MPC8555CDS_defconfig
index 3bdbb0c..d0a1a51 100644
--- a/configs/MPC8555CDS_defconfig
+++ b/configs/MPC8555CDS_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8555CDS=y
+CONFIG_BOOTDELAY=10
diff --git a/configs/MPC8555CDS_legacy_defconfig b/configs/MPC8555CDS_legacy_defconfig
index 8e53ee0..775e0b7 100644
--- a/configs/MPC8555CDS_legacy_defconfig
+++ b/configs/MPC8555CDS_legacy_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8555CDS=y
 CONFIG_SYS_EXTRA_OPTIONS="LEGACY"
+CONFIG_BOOTDELAY=10
diff --git a/configs/MPC8560ADS_defconfig b/configs/MPC8560ADS_defconfig
index aa84d28..90d1b22 100644
--- a/configs/MPC8560ADS_defconfig
+++ b/configs/MPC8560ADS_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8560ADS=y
+CONFIG_BOOTDELAY=10
diff --git a/configs/MPC8568MDS_defconfig b/configs/MPC8568MDS_defconfig
index ac0ec8c..ad1ff6c 100644
--- a/configs/MPC8568MDS_defconfig
+++ b/configs/MPC8568MDS_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8568MDS=y
+CONFIG_BOOTDELAY=10
diff --git a/configs/MPC8569MDS_ATM_defconfig b/configs/MPC8569MDS_ATM_defconfig
index 719ca84..40c18aa 100644
--- a/configs/MPC8569MDS_ATM_defconfig
+++ b/configs/MPC8569MDS_ATM_defconfig
@@ -2,5 +2,6 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8569MDS=y
 CONFIG_SYS_EXTRA_OPTIONS="ATM"
+CONFIG_BOOTDELAY=10
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/MPC8569MDS_defconfig b/configs/MPC8569MDS_defconfig
index bb1a4fb..a556d7b 100644
--- a/configs/MPC8569MDS_defconfig
+++ b/configs/MPC8569MDS_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8569MDS=y
+CONFIG_BOOTDELAY=10
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/MPC8572DS_36BIT_defconfig b/configs/MPC8572DS_36BIT_defconfig
index 5c76524..1c1b3bf 100644
--- a/configs/MPC8572DS_36BIT_defconfig
+++ b/configs/MPC8572DS_36BIT_defconfig
@@ -2,5 +2,6 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8572DS=y
 CONFIG_SYS_EXTRA_OPTIONS="36BIT"
+CONFIG_BOOTDELAY=10
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/MPC8572DS_defconfig b/configs/MPC8572DS_defconfig
index 2f69b14..3d4ea94 100644
--- a/configs/MPC8572DS_defconfig
+++ b/configs/MPC8572DS_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_MPC8572DS=y
+CONFIG_BOOTDELAY=10
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/MPC8610HPCD_defconfig b/configs/MPC8610HPCD_defconfig
index f0e1370..7c614a6 100644
--- a/configs/MPC8610HPCD_defconfig
+++ b/configs/MPC8610HPCD_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC86xx=y
 CONFIG_TARGET_MPC8610HPCD=y
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC8641HPCN_36BIT_defconfig b/configs/MPC8641HPCN_36BIT_defconfig
index 0aee7ea..1a0a112 100644
--- a/configs/MPC8641HPCN_36BIT_defconfig
+++ b/configs/MPC8641HPCN_36BIT_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC86xx=y
 CONFIG_TARGET_MPC8641HPCN=y
 CONFIG_SYS_EXTRA_OPTIONS="PHYS_64BIT"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MPC8641HPCN_defconfig b/configs/MPC8641HPCN_defconfig
index 2bee038..b83841e 100644
--- a/configs/MPC8641HPCN_defconfig
+++ b/configs/MPC8641HPCN_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC86xx=y
 CONFIG_TARGET_MPC8641HPCN=y
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/MSI_Primo73_defconfig b/configs/MSI_Primo73_defconfig
index ee12521..3b75ddb 100644
--- a/configs/MSI_Primo73_defconfig
+++ b/configs/MSI_Primo73_defconfig
@@ -11,6 +11,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-primo73"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/MSI_Primo81_defconfig b/configs/MSI_Primo81_defconfig
index 13d8b0b..5c19c38 100644
--- a/configs/MSI_Primo81_defconfig
+++ b/configs/MSI_Primo81_defconfig
@@ -13,6 +13,7 @@ CONFIG_VIDEO_LCD_PANEL_MIPI_4_LANE_513_MBPS_VIA_SSD2828=y
 CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31s-primo81"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Marsboard_A10_defconfig b/configs/Marsboard_A10_defconfig
index 7d74077..dc086c2 100644
--- a/configs/Marsboard_A10_defconfig
+++ b/configs/Marsboard_A10_defconfig
@@ -5,6 +5,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-marsboard"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,AHCI"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Mele_A1000G_quad_defconfig b/configs/Mele_A1000G_quad_defconfig
index 5d4fce3..5ff3092 100644
--- a/configs/Mele_A1000G_quad_defconfig
+++ b/configs/Mele_A1000G_quad_defconfig
@@ -8,6 +8,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-mele-a1000g-quad"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig
index 14d12a2..1cb2f92 100644
--- a/configs/Mele_A1000_defconfig
+++ b/configs/Mele_A1000_defconfig
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-a1000"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Mele_I7_defconfig b/configs/Mele_I7_defconfig
index ac86fc4..581d8e8 100644
--- a/configs/Mele_I7_defconfig
+++ b/configs/Mele_I7_defconfig
@@ -8,6 +8,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-i7"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Mele_M3_defconfig b/configs/Mele_M3_defconfig
index 9edf6b8..d8fe93d 100644
--- a/configs/Mele_M3_defconfig
+++ b/configs/Mele_M3_defconfig
@@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m3"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Mele_M5_defconfig b/configs/Mele_M5_defconfig
index 519d99f..967f331 100644
--- a/configs/Mele_M5_defconfig
+++ b/configs/Mele_M5_defconfig
@@ -9,6 +9,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m5"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,AHCI,STATUSLED=234"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Mele_M9_defconfig b/configs/Mele_M9_defconfig
index aa22371..c165cfa 100644
--- a/configs/Mele_M9_defconfig
+++ b/configs/Mele_M9_defconfig
@@ -8,6 +8,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-m9"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Merrii_A80_Optimus_defconfig b/configs/Merrii_A80_Optimus_defconfig
index 526f5c9..a1c2f18 100644
--- a/configs/Merrii_A80_Optimus_defconfig
+++ b/configs/Merrii_A80_Optimus_defconfig
@@ -8,6 +8,7 @@ CONFIG_MMC0_CD_PIN="PH18"
 # CONFIG_VIDEO is not set
 CONFIG_DEFAULT_DEVICE_TREE="sun9i-a80-optimus"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Mini-X_defconfig b/configs/Mini-X_defconfig
index e838510..84ce426 100644
--- a/configs/Mini-X_defconfig
+++ b/configs/Mini-X_defconfig
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mini-xplus"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/MiniFAP_defconfig b/configs/MiniFAP_defconfig
index 1e5fd75..94b4719 100644
--- a/configs/MiniFAP_defconfig
+++ b/configs/MiniFAP_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_TQM5200=y
 CONFIG_SYS_EXTRA_OPTIONS="MINIFAP"
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/O2D300_defconfig b/configs/O2D300_defconfig
index db88295..351c534 100644
--- a/configs/O2D300_defconfig
+++ b/configs/O2D300_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_O2D300=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/O2DNT2_RAMBOOT_defconfig b/configs/O2DNT2_RAMBOOT_defconfig
index ca54ca5..7525c11 100644
--- a/configs/O2DNT2_RAMBOOT_defconfig
+++ b/configs/O2DNT2_RAMBOOT_defconfig
@@ -5,4 +5,5 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x00100000"
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press password to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="++++++++++"
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/O2DNT2_defconfig b/configs/O2DNT2_defconfig
index a4ead75..9747aa9 100644
--- a/configs/O2DNT2_defconfig
+++ b/configs/O2DNT2_defconfig
@@ -4,4 +4,5 @@ CONFIG_TARGET_O2DNT2=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press password to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="++++++++++"
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/O2D_defconfig b/configs/O2D_defconfig
index 3248fc9..b65a9b7 100644
--- a/configs/O2D_defconfig
+++ b/configs/O2D_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_O2D=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/O2I_defconfig b/configs/O2I_defconfig
index 5d51be6..c3ded5f 100644
--- a/configs/O2I_defconfig
+++ b/configs/O2I_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_O2I=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/O2MNT_O2M110_defconfig b/configs/O2MNT_O2M110_defconfig
index 22e7e98..11ed439 100644
--- a/configs/O2MNT_O2M110_defconfig
+++ b/configs/O2MNT_O2M110_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_O2MNT=y
 CONFIG_SYS_EXTRA_OPTIONS="IFM_SENSOR_TYPE=\"O2M110\""
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/O2MNT_O2M112_defconfig b/configs/O2MNT_O2M112_defconfig
index 5342719..0031584 100644
--- a/configs/O2MNT_O2M112_defconfig
+++ b/configs/O2MNT_O2M112_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_O2MNT=y
 CONFIG_SYS_EXTRA_OPTIONS="IFM_SENSOR_TYPE=\"O2M112\""
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/O2MNT_O2M113_defconfig b/configs/O2MNT_O2M113_defconfig
index bcbb598..888a99c 100644
--- a/configs/O2MNT_O2M113_defconfig
+++ b/configs/O2MNT_O2M113_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_O2MNT=y
 CONFIG_SYS_EXTRA_OPTIONS="IFM_SENSOR_TYPE=\"O2M113\""
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/O2MNT_defconfig b/configs/O2MNT_defconfig
index a29f70a..e74cfee 100644
--- a/configs/O2MNT_defconfig
+++ b/configs/O2MNT_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_O2MNT=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/O3DNT_defconfig b/configs/O3DNT_defconfig
index 8411294..6576681 100644
--- a/configs/O3DNT_defconfig
+++ b/configs/O3DNT_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_O3DNT=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/Orangepi_defconfig b/configs/Orangepi_defconfig
index a7c4521..cbca3ba 100644
--- a/configs/Orangepi_defconfig
+++ b/configs/Orangepi_defconfig
@@ -11,6 +11,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig
index 1b83970..80da710 100644
--- a/configs/Orangepi_mini_defconfig
+++ b/configs/Orangepi_mini_defconfig
@@ -13,6 +13,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi-mini"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig b/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig
index 407f0fb..ddf82b0 100644
--- a/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,NAND_SECBOOT,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1010RDB-PA_36BIT_NAND_defconfig b/configs/P1010RDB-PA_36BIT_NAND_defconfig
index 737921c..c4b3648 100644
--- a/configs/P1010RDB-PA_36BIT_NAND_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NAND_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_P1010RDB=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,NAND"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig b/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig
index a34436e..b7996ae 100644
--- a/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1010RDB-PA_36BIT_NOR_defconfig b/configs/P1010RDB-PA_36BIT_NOR_defconfig
index c6cc9b5..798e07c 100644
--- a/configs/P1010RDB-PA_36BIT_NOR_defconfig
+++ b/configs/P1010RDB-PA_36BIT_NOR_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
index d32ca80..3f52906 100644
--- a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
+++ b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig
index 56cc3c6..c066a84 100644
--- a/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,SPIFLASH,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
index da56dfb..4af2aec 100644
--- a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,SPIFLASH"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1010RDB-PA_NAND_SECBOOT_defconfig b/configs/P1010RDB-PA_NAND_SECBOOT_defconfig
index fec2697..d10cfe8 100644
--- a/configs/P1010RDB-PA_NAND_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_NAND_SECBOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,NAND_SECBOOT,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1010RDB-PA_NAND_defconfig b/configs/P1010RDB-PA_NAND_defconfig
index e45a541..0a62044 100644
--- a/configs/P1010RDB-PA_NAND_defconfig
+++ b/configs/P1010RDB-PA_NAND_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_P1010RDB=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,NAND"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1010RDB-PA_NOR_SECBOOT_defconfig b/configs/P1010RDB-PA_NOR_SECBOOT_defconfig
index 64ed63a..a8a3acc 100644
--- a/configs/P1010RDB-PA_NOR_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_NOR_SECBOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1010RDB-PA_NOR_defconfig b/configs/P1010RDB-PA_NOR_defconfig
index fe4c8b5..821a200 100644
--- a/configs/P1010RDB-PA_NOR_defconfig
+++ b/configs/P1010RDB-PA_NOR_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1010RDB-PA_SDCARD_defconfig b/configs/P1010RDB-PA_SDCARD_defconfig
index 3d41cb0..27374a3 100644
--- a/configs/P1010RDB-PA_SDCARD_defconfig
+++ b/configs/P1010RDB-PA_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig
index 6afce00..7b6431e 100644
--- a/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig
+++ b/configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SPIFLASH,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1010RDB-PA_SPIFLASH_defconfig b/configs/P1010RDB-PA_SPIFLASH_defconfig
index faab1ac..e3a9181 100644
--- a/configs/P1010RDB-PA_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PA_SPIFLASH_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SPIFLASH"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig b/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig
index a76affd..26c1aa1 100644
--- a/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,NAND_SECBOOT,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1010RDB-PB_36BIT_NAND_defconfig b/configs/P1010RDB-PB_36BIT_NAND_defconfig
index 64963b6..ce065a1 100644
--- a/configs/P1010RDB-PB_36BIT_NAND_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NAND_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_P1010RDB=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,NAND"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig b/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig
index ea68ffb..1ed5043 100644
--- a/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1010RDB-PB_36BIT_NOR_defconfig b/configs/P1010RDB-PB_36BIT_NOR_defconfig
index 0a5403d..a7cbd46 100644
--- a/configs/P1010RDB-PB_36BIT_NOR_defconfig
+++ b/configs/P1010RDB-PB_36BIT_NOR_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
index f7e9050..b326964 100644
--- a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
+++ b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig
index b92c3f3..6cb7f9d 100644
--- a/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,SPIFLASH,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
index ae9309a..eb919e8 100644
--- a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,SPIFLASH"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1010RDB-PB_NAND_SECBOOT_defconfig b/configs/P1010RDB-PB_NAND_SECBOOT_defconfig
index 9b9a8a2..e7902d2 100644
--- a/configs/P1010RDB-PB_NAND_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_NAND_SECBOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,NAND_SECBOOT,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1010RDB-PB_NAND_defconfig b/configs/P1010RDB-PB_NAND_defconfig
index 60b3417..942daf7 100644
--- a/configs/P1010RDB-PB_NAND_defconfig
+++ b/configs/P1010RDB-PB_NAND_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_P1010RDB=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,NAND"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1010RDB-PB_NOR_SECBOOT_defconfig b/configs/P1010RDB-PB_NOR_SECBOOT_defconfig
index 17b9941..a077422 100644
--- a/configs/P1010RDB-PB_NOR_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_NOR_SECBOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1010RDB-PB_NOR_defconfig b/configs/P1010RDB-PB_NOR_defconfig
index f3b3b22..5abe626 100644
--- a/configs/P1010RDB-PB_NOR_defconfig
+++ b/configs/P1010RDB-PB_NOR_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1010RDB-PB_SDCARD_defconfig b/configs/P1010RDB-PB_SDCARD_defconfig
index 5d9607c..4505281 100644
--- a/configs/P1010RDB-PB_SDCARD_defconfig
+++ b/configs/P1010RDB-PB_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig b/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig
index c88b433..6deca04 100644
--- a/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig
+++ b/configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SPIFLASH,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1010RDB-PB_SPIFLASH_defconfig b/configs/P1010RDB-PB_SPIFLASH_defconfig
index b390406..8d67635 100644
--- a/configs/P1010RDB-PB_SPIFLASH_defconfig
+++ b/configs/P1010RDB-PB_SPIFLASH_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1010RDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SPIFLASH"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1020MBG-PC_36BIT_SDCARD_defconfig b/configs/P1020MBG-PC_36BIT_SDCARD_defconfig
index 7714ac6..ffcb7aa 100644
--- a/configs/P1020MBG-PC_36BIT_SDCARD_defconfig
+++ b/configs/P1020MBG-PC_36BIT_SDCARD_defconfig
@@ -3,5 +3,6 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020MBG,SDCARD,36BIT"
+CONFIG_BOOTDELAY=10
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1020MBG-PC_36BIT_defconfig b/configs/P1020MBG-PC_36BIT_defconfig
index 29a520b..9ab027f 100644
--- a/configs/P1020MBG-PC_36BIT_defconfig
+++ b/configs/P1020MBG-PC_36BIT_defconfig
@@ -2,5 +2,6 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020MBG,36BIT"
+CONFIG_BOOTDELAY=10
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1020MBG-PC_SDCARD_defconfig b/configs/P1020MBG-PC_SDCARD_defconfig
index c0a0745..b688e45 100644
--- a/configs/P1020MBG-PC_SDCARD_defconfig
+++ b/configs/P1020MBG-PC_SDCARD_defconfig
@@ -3,5 +3,6 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020MBG,SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1020MBG-PC_defconfig b/configs/P1020MBG-PC_defconfig
index bc408b7..4f94c00 100644
--- a/configs/P1020MBG-PC_defconfig
+++ b/configs/P1020MBG-PC_defconfig
@@ -2,5 +2,6 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020MBG"
+CONFIG_BOOTDELAY=10
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1020RDB-PC_36BIT_NAND_defconfig b/configs/P1020RDB-PC_36BIT_NAND_defconfig
index b7d1d2e..5b40aee 100644
--- a/configs/P1020RDB-PC_36BIT_NAND_defconfig
+++ b/configs/P1020RDB-PC_36BIT_NAND_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,36BIT,NAND"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
index 6b55479..80676a5 100644
--- a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
+++ b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,36BIT,SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
index 78db491..9d5dce7 100644
--- a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,36BIT,SPIFLASH"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1020RDB-PC_36BIT_defconfig b/configs/P1020RDB-PC_36BIT_defconfig
index df9dbc9..a3214e4 100644
--- a/configs/P1020RDB-PC_36BIT_defconfig
+++ b/configs/P1020RDB-PC_36BIT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,36BIT"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1020RDB-PC_NAND_defconfig b/configs/P1020RDB-PC_NAND_defconfig
index c54b31a..3f901e2 100644
--- a/configs/P1020RDB-PC_NAND_defconfig
+++ b/configs/P1020RDB-PC_NAND_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,NAND"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1020RDB-PC_SDCARD_defconfig b/configs/P1020RDB-PC_SDCARD_defconfig
index 3c08d4f..dd02444 100644
--- a/configs/P1020RDB-PC_SDCARD_defconfig
+++ b/configs/P1020RDB-PC_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1020RDB-PC_SPIFLASH_defconfig b/configs/P1020RDB-PC_SPIFLASH_defconfig
index 708d5c4..dd8d203 100644
--- a/configs/P1020RDB-PC_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PC_SPIFLASH_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,SPIFLASH"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1020RDB-PC_defconfig b/configs/P1020RDB-PC_defconfig
index b7c624f..fff6a50 100644
--- a/configs/P1020RDB-PC_defconfig
+++ b/configs/P1020RDB-PC_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1020RDB-PD_NAND_defconfig b/configs/P1020RDB-PD_NAND_defconfig
index 82492c0..72a64fc 100644
--- a/configs/P1020RDB-PD_NAND_defconfig
+++ b/configs/P1020RDB-PD_NAND_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PD,NAND"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1020RDB-PD_SDCARD_defconfig b/configs/P1020RDB-PD_SDCARD_defconfig
index e694d5b..63ed76e 100644
--- a/configs/P1020RDB-PD_SDCARD_defconfig
+++ b/configs/P1020RDB-PD_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PD,SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1020RDB-PD_SPIFLASH_defconfig b/configs/P1020RDB-PD_SPIFLASH_defconfig
index 3cf0b8a..b96a35a 100644
--- a/configs/P1020RDB-PD_SPIFLASH_defconfig
+++ b/configs/P1020RDB-PD_SPIFLASH_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PD,SPIFLASH"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1020RDB-PD_defconfig b/configs/P1020RDB-PD_defconfig
index 6ddf70c..8e19e50 100644
--- a/configs/P1020RDB-PD_defconfig
+++ b/configs/P1020RDB-PD_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PD"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1020UTM-PC_36BIT_SDCARD_defconfig b/configs/P1020UTM-PC_36BIT_SDCARD_defconfig
index b29fcc4..02cdb14 100644
--- a/configs/P1020UTM-PC_36BIT_SDCARD_defconfig
+++ b/configs/P1020UTM-PC_36BIT_SDCARD_defconfig
@@ -3,5 +3,6 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020UTM,36BIT,SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1020UTM-PC_36BIT_defconfig b/configs/P1020UTM-PC_36BIT_defconfig
index 63b6471..7d71e1a 100644
--- a/configs/P1020UTM-PC_36BIT_defconfig
+++ b/configs/P1020UTM-PC_36BIT_defconfig
@@ -2,5 +2,6 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020UTM,36BIT"
+CONFIG_BOOTDELAY=10
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1020UTM-PC_SDCARD_defconfig b/configs/P1020UTM-PC_SDCARD_defconfig
index 650ffe5..11c0af3 100644
--- a/configs/P1020UTM-PC_SDCARD_defconfig
+++ b/configs/P1020UTM-PC_SDCARD_defconfig
@@ -3,5 +3,6 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020UTM,SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1020UTM-PC_defconfig b/configs/P1020UTM-PC_defconfig
index 56ca99c..2a82c0b 100644
--- a/configs/P1020UTM-PC_defconfig
+++ b/configs/P1020UTM-PC_defconfig
@@ -2,5 +2,6 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1020UTM"
+CONFIG_BOOTDELAY=10
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1021RDB-PC_36BIT_NAND_defconfig b/configs/P1021RDB-PC_36BIT_NAND_defconfig
index d246c7b..4a9f6a1 100644
--- a/configs/P1021RDB-PC_36BIT_NAND_defconfig
+++ b/configs/P1021RDB-PC_36BIT_NAND_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,36BIT,NAND"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1021RDB-PC_36BIT_SDCARD_defconfig b/configs/P1021RDB-PC_36BIT_SDCARD_defconfig
index 1bf813f..4d5092d 100644
--- a/configs/P1021RDB-PC_36BIT_SDCARD_defconfig
+++ b/configs/P1021RDB-PC_36BIT_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,36BIT,SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig
index d5c8bd2..c4ae037 100644
--- a/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig
+++ b/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,36BIT,SPIFLASH"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1021RDB-PC_36BIT_defconfig b/configs/P1021RDB-PC_36BIT_defconfig
index a9510dc..b0d275b 100644
--- a/configs/P1021RDB-PC_36BIT_defconfig
+++ b/configs/P1021RDB-PC_36BIT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,36BIT"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1021RDB-PC_NAND_defconfig b/configs/P1021RDB-PC_NAND_defconfig
index a7de239..762fe29 100644
--- a/configs/P1021RDB-PC_NAND_defconfig
+++ b/configs/P1021RDB-PC_NAND_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,NAND"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1021RDB-PC_SDCARD_defconfig b/configs/P1021RDB-PC_SDCARD_defconfig
index faf36fe..8504270 100644
--- a/configs/P1021RDB-PC_SDCARD_defconfig
+++ b/configs/P1021RDB-PC_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1021RDB-PC_SPIFLASH_defconfig b/configs/P1021RDB-PC_SPIFLASH_defconfig
index cc9320f..2f79019 100644
--- a/configs/P1021RDB-PC_SPIFLASH_defconfig
+++ b/configs/P1021RDB-PC_SPIFLASH_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,SPIFLASH"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1021RDB-PC_defconfig b/configs/P1021RDB-PC_defconfig
index 9ac36f7..0a8738e 100644
--- a/configs/P1021RDB-PC_defconfig
+++ b/configs/P1021RDB-PC_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1021RDB"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1022DS_36BIT_NAND_defconfig b/configs/P1022DS_36BIT_NAND_defconfig
index c093ccf..13e52d6 100644
--- a/configs/P1022DS_36BIT_NAND_defconfig
+++ b/configs/P1022DS_36BIT_NAND_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_P1022DS=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="36BIT,NAND"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1022DS_36BIT_SDCARD_defconfig b/configs/P1022DS_36BIT_SDCARD_defconfig
index 342870d..36369a9 100644
--- a/configs/P1022DS_36BIT_SDCARD_defconfig
+++ b/configs/P1022DS_36BIT_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1022DS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="36BIT,SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1022DS_36BIT_SPIFLASH_defconfig b/configs/P1022DS_36BIT_SPIFLASH_defconfig
index 40db7b5..279387e 100644
--- a/configs/P1022DS_36BIT_SPIFLASH_defconfig
+++ b/configs/P1022DS_36BIT_SPIFLASH_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1022DS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="36BIT,SPIFLASH"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1022DS_36BIT_defconfig b/configs/P1022DS_36BIT_defconfig
index d6f2ee4..efb4022 100644
--- a/configs/P1022DS_36BIT_defconfig
+++ b/configs/P1022DS_36BIT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1022DS=y
 CONFIG_SYS_EXTRA_OPTIONS="36BIT"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1022DS_NAND_defconfig b/configs/P1022DS_NAND_defconfig
index 22e354c..f549df9 100644
--- a/configs/P1022DS_NAND_defconfig
+++ b/configs/P1022DS_NAND_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_P1022DS=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="NAND"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1022DS_SDCARD_defconfig b/configs/P1022DS_SDCARD_defconfig
index 25ec334..8f21ff3 100644
--- a/configs/P1022DS_SDCARD_defconfig
+++ b/configs/P1022DS_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1022DS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1022DS_SPIFLASH_defconfig b/configs/P1022DS_SPIFLASH_defconfig
index 0227f35..701b30c 100644
--- a/configs/P1022DS_SPIFLASH_defconfig
+++ b/configs/P1022DS_SPIFLASH_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1022DS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1022DS_defconfig b/configs/P1022DS_defconfig
index 427c64b..487689b 100644
--- a/configs/P1022DS_defconfig
+++ b/configs/P1022DS_defconfig
@@ -1,6 +1,7 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1022DS=y
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1024RDB_36BIT_defconfig b/configs/P1024RDB_36BIT_defconfig
index ab32765..c2b48cd 100644
--- a/configs/P1024RDB_36BIT_defconfig
+++ b/configs/P1024RDB_36BIT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1024RDB,36BIT"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1024RDB_NAND_defconfig b/configs/P1024RDB_NAND_defconfig
index 1b4f31c..01d68f5 100644
--- a/configs/P1024RDB_NAND_defconfig
+++ b/configs/P1024RDB_NAND_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1024RDB,NAND"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1024RDB_SDCARD_defconfig b/configs/P1024RDB_SDCARD_defconfig
index d647f8a..6293813 100644
--- a/configs/P1024RDB_SDCARD_defconfig
+++ b/configs/P1024RDB_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1024RDB,SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1024RDB_SPIFLASH_defconfig b/configs/P1024RDB_SPIFLASH_defconfig
index b5790e1..25da8a1 100644
--- a/configs/P1024RDB_SPIFLASH_defconfig
+++ b/configs/P1024RDB_SPIFLASH_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1024RDB,SPIFLASH"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1024RDB_defconfig b/configs/P1024RDB_defconfig
index 5dd1cbc..9dc4179 100644
--- a/configs/P1024RDB_defconfig
+++ b/configs/P1024RDB_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1024RDB"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1025RDB_36BIT_defconfig b/configs/P1025RDB_36BIT_defconfig
index 509f116..68578a2 100644
--- a/configs/P1025RDB_36BIT_defconfig
+++ b/configs/P1025RDB_36BIT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1025RDB,36BIT"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1025RDB_NAND_defconfig b/configs/P1025RDB_NAND_defconfig
index 6369e39..eaadf11 100644
--- a/configs/P1025RDB_NAND_defconfig
+++ b/configs/P1025RDB_NAND_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1025RDB,NAND"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1025RDB_SDCARD_defconfig b/configs/P1025RDB_SDCARD_defconfig
index a3cc80a..da8e112 100644
--- a/configs/P1025RDB_SDCARD_defconfig
+++ b/configs/P1025RDB_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1025RDB,SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1025RDB_SPIFLASH_defconfig b/configs/P1025RDB_SPIFLASH_defconfig
index b5d56f7..dcd1329 100644
--- a/configs/P1025RDB_SPIFLASH_defconfig
+++ b/configs/P1025RDB_SPIFLASH_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P1025RDB,SPIFLASH"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P1025RDB_defconfig b/configs/P1025RDB_defconfig
index 05c347e..cd24d97 100644
--- a/configs/P1025RDB_defconfig
+++ b/configs/P1025RDB_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P1025RDB"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P2020RDB-PC_36BIT_NAND_defconfig b/configs/P2020RDB-PC_36BIT_NAND_defconfig
index e86ff8c..705787d 100644
--- a/configs/P2020RDB-PC_36BIT_NAND_defconfig
+++ b/configs/P2020RDB-PC_36BIT_NAND_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,36BIT,NAND"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
index d97c6bc..14ce916 100644
--- a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
+++ b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,36BIT,SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
index 8c15726..446b0cf 100644
--- a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
+++ b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,36BIT,SPIFLASH"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P2020RDB-PC_36BIT_defconfig b/configs/P2020RDB-PC_36BIT_defconfig
index b93ce08..fbce023 100644
--- a/configs/P2020RDB-PC_36BIT_defconfig
+++ b/configs/P2020RDB-PC_36BIT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,36BIT"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P2020RDB-PC_NAND_defconfig b/configs/P2020RDB-PC_NAND_defconfig
index 3184f5e..52fca8b 100644
--- a/configs/P2020RDB-PC_NAND_defconfig
+++ b/configs/P2020RDB-PC_NAND_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_TPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,NAND"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P2020RDB-PC_SDCARD_defconfig b/configs/P2020RDB-PC_SDCARD_defconfig
index 4328967..b376168 100644
--- a/configs/P2020RDB-PC_SDCARD_defconfig
+++ b/configs/P2020RDB-PC_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P2020RDB-PC_SPIFLASH_defconfig b/configs/P2020RDB-PC_SPIFLASH_defconfig
index 55cb86c..d907870 100644
--- a/configs/P2020RDB-PC_SPIFLASH_defconfig
+++ b/configs/P2020RDB-PC_SPIFLASH_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,SPIFLASH"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P2020RDB-PC_defconfig b/configs/P2020RDB-PC_defconfig
index b5496fc..432633d 100644
--- a/configs/P2020RDB-PC_defconfig
+++ b/configs/P2020RDB-PC_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_P2_RDB_PC=y
 CONFIG_SYS_EXTRA_OPTIONS="P2020RDB"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P2041RDB_NAND_defconfig b/configs/P2041RDB_NAND_defconfig
index a3e8f9c..d2697a5 100644
--- a/configs/P2041RDB_NAND_defconfig
+++ b/configs/P2041RDB_NAND_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P2041RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P2041RDB_SDCARD_defconfig b/configs/P2041RDB_SDCARD_defconfig
index dc022a1..cfb6a36 100644
--- a/configs/P2041RDB_SDCARD_defconfig
+++ b/configs/P2041RDB_SDCARD_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P2041RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P2041RDB_SECURE_BOOT_defconfig b/configs/P2041RDB_SECURE_BOOT_defconfig
index 3fccb2b..f13e442 100644
--- a/configs/P2041RDB_SECURE_BOOT_defconfig
+++ b/configs/P2041RDB_SECURE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P2041RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P2041RDB_SPIFLASH_defconfig b/configs/P2041RDB_SPIFLASH_defconfig
index f748ba3..cb66fae 100644
--- a/configs/P2041RDB_SPIFLASH_defconfig
+++ b/configs/P2041RDB_SPIFLASH_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P2041RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P2041RDB_SRIO_PCIE_BOOT_defconfig b/configs/P2041RDB_SRIO_PCIE_BOOT_defconfig
index 4d62252..ec98774 100644
--- a/configs/P2041RDB_SRIO_PCIE_BOOT_defconfig
+++ b/configs/P2041RDB_SRIO_PCIE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P2041RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/P2041RDB_defconfig b/configs/P2041RDB_defconfig
index 9dba9a6..589c232 100644
--- a/configs/P2041RDB_defconfig
+++ b/configs/P2041RDB_defconfig
@@ -1,6 +1,7 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P2041RDB=y
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P3041DS_NAND_SECURE_BOOT_defconfig b/configs/P3041DS_NAND_SECURE_BOOT_defconfig
index 6e4b88e..a024753 100644
--- a/configs/P3041DS_NAND_SECURE_BOOT_defconfig
+++ b/configs/P3041DS_NAND_SECURE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P3041DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SECURE_BOOT,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P3041DS_NAND_defconfig b/configs/P3041DS_NAND_defconfig
index d075e8f..c7d30ce 100644
--- a/configs/P3041DS_NAND_defconfig
+++ b/configs/P3041DS_NAND_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P3041DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P3041DS_SDCARD_defconfig b/configs/P3041DS_SDCARD_defconfig
index 5f1c198..f4249ff 100644
--- a/configs/P3041DS_SDCARD_defconfig
+++ b/configs/P3041DS_SDCARD_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P3041DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P3041DS_SECURE_BOOT_defconfig b/configs/P3041DS_SECURE_BOOT_defconfig
index 307f6d7..dcf5ada 100644
--- a/configs/P3041DS_SECURE_BOOT_defconfig
+++ b/configs/P3041DS_SECURE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P3041DS=y
 CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P3041DS_SPIFLASH_defconfig b/configs/P3041DS_SPIFLASH_defconfig
index 6112639..ce6044a 100644
--- a/configs/P3041DS_SPIFLASH_defconfig
+++ b/configs/P3041DS_SPIFLASH_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P3041DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P3041DS_SRIO_PCIE_BOOT_defconfig b/configs/P3041DS_SRIO_PCIE_BOOT_defconfig
index 24a79ce..10681bd 100644
--- a/configs/P3041DS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/P3041DS_SRIO_PCIE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P3041DS=y
 CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/P3041DS_defconfig b/configs/P3041DS_defconfig
index 0fed50f..6457dff 100644
--- a/configs/P3041DS_defconfig
+++ b/configs/P3041DS_defconfig
@@ -1,6 +1,7 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P3041DS=y
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P4080DS_SDCARD_defconfig b/configs/P4080DS_SDCARD_defconfig
index 74a1452..91024aa 100644
--- a/configs/P4080DS_SDCARD_defconfig
+++ b/configs/P4080DS_SDCARD_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P4080DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P4080DS_SECURE_BOOT_defconfig b/configs/P4080DS_SECURE_BOOT_defconfig
index 0dd1f32..c6e9836 100644
--- a/configs/P4080DS_SECURE_BOOT_defconfig
+++ b/configs/P4080DS_SECURE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P4080DS=y
 CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P4080DS_SPIFLASH_defconfig b/configs/P4080DS_SPIFLASH_defconfig
index b7bfc38..40d9784 100644
--- a/configs/P4080DS_SPIFLASH_defconfig
+++ b/configs/P4080DS_SPIFLASH_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P4080DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P4080DS_SRIO_PCIE_BOOT_defconfig b/configs/P4080DS_SRIO_PCIE_BOOT_defconfig
index 766db5e..946f141 100644
--- a/configs/P4080DS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/P4080DS_SRIO_PCIE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P4080DS=y
 CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/P4080DS_defconfig b/configs/P4080DS_defconfig
index b0a6bdf..640c948 100644
--- a/configs/P4080DS_defconfig
+++ b/configs/P4080DS_defconfig
@@ -1,6 +1,7 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P4080DS=y
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P5020DS_NAND_SECURE_BOOT_defconfig b/configs/P5020DS_NAND_SECURE_BOOT_defconfig
index c89ec85..3188cd8 100644
--- a/configs/P5020DS_NAND_SECURE_BOOT_defconfig
+++ b/configs/P5020DS_NAND_SECURE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5020DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SECURE_BOOT,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P5020DS_NAND_defconfig b/configs/P5020DS_NAND_defconfig
index 64ba6e9..702c24c 100644
--- a/configs/P5020DS_NAND_defconfig
+++ b/configs/P5020DS_NAND_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5020DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P5020DS_SDCARD_defconfig b/configs/P5020DS_SDCARD_defconfig
index 796e9a1..b0325d3 100644
--- a/configs/P5020DS_SDCARD_defconfig
+++ b/configs/P5020DS_SDCARD_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5020DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P5020DS_SECURE_BOOT_defconfig b/configs/P5020DS_SECURE_BOOT_defconfig
index 27ae488..90b2c93 100644
--- a/configs/P5020DS_SECURE_BOOT_defconfig
+++ b/configs/P5020DS_SECURE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5020DS=y
 CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P5020DS_SPIFLASH_defconfig b/configs/P5020DS_SPIFLASH_defconfig
index 65cc600..b27ad15 100644
--- a/configs/P5020DS_SPIFLASH_defconfig
+++ b/configs/P5020DS_SPIFLASH_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5020DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P5020DS_SRIO_PCIE_BOOT_defconfig b/configs/P5020DS_SRIO_PCIE_BOOT_defconfig
index 65e9d2f..f02e93d 100644
--- a/configs/P5020DS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/P5020DS_SRIO_PCIE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5020DS=y
 CONFIG_SYS_EXTRA_OPTIONS="SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/P5020DS_defconfig b/configs/P5020DS_defconfig
index bd06987..66a71a8 100644
--- a/configs/P5020DS_defconfig
+++ b/configs/P5020DS_defconfig
@@ -1,6 +1,7 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5020DS=y
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P5040DS_NAND_SECURE_BOOT_defconfig b/configs/P5040DS_NAND_SECURE_BOOT_defconfig
index 3027031..0505408 100644
--- a/configs/P5040DS_NAND_SECURE_BOOT_defconfig
+++ b/configs/P5040DS_NAND_SECURE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5040DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SECURE_BOOT,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P5040DS_NAND_defconfig b/configs/P5040DS_NAND_defconfig
index b2f5cda..f5793d5 100644
--- a/configs/P5040DS_NAND_defconfig
+++ b/configs/P5040DS_NAND_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5040DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P5040DS_SDCARD_defconfig b/configs/P5040DS_SDCARD_defconfig
index 950df55..158e2c5 100644
--- a/configs/P5040DS_SDCARD_defconfig
+++ b/configs/P5040DS_SDCARD_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5040DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P5040DS_SECURE_BOOT_defconfig b/configs/P5040DS_SECURE_BOOT_defconfig
index d0bc383..3e50ddf 100644
--- a/configs/P5040DS_SECURE_BOOT_defconfig
+++ b/configs/P5040DS_SECURE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5040DS=y
 CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P5040DS_SPIFLASH_defconfig b/configs/P5040DS_SPIFLASH_defconfig
index 0dbc3eb..0fc91a9 100644
--- a/configs/P5040DS_SPIFLASH_defconfig
+++ b/configs/P5040DS_SPIFLASH_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5040DS=y
 CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/P5040DS_defconfig b/configs/P5040DS_defconfig
index 5da5a3c..caa3f7e 100644
--- a/configs/P5040DS_defconfig
+++ b/configs/P5040DS_defconfig
@@ -1,6 +1,7 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P5040DS=y
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/PATI_defconfig b/configs/PATI_defconfig
index ae95732..72733e5 100644
--- a/configs/PATI_defconfig
+++ b/configs/PATI_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_5xx=y
 CONFIG_TARGET_PATI=y
 CONFIG_SYS_PROMPT="pati=> "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_BOOTD is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
diff --git a/configs/PIP405_defconfig b/configs/PIP405_defconfig
index ced7d1a..e12e929 100644
--- a/configs/PIP405_defconfig
+++ b/configs/PIP405_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_PIP405=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig
index 8041508..c6fcc72 100644
--- a/configs/Sinlinx_SinA33_defconfig
+++ b/configs/Sinlinx_SinA33_defconfig
@@ -6,6 +6,7 @@ CONFIG_DRAM_ZQ=15291
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-sinlinx-sina33"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/T1023RDB_NAND_defconfig b/configs/T1023RDB_NAND_defconfig
index 836bde4..e01ff95 100644
--- a/configs/T1023RDB_NAND_defconfig
+++ b/configs/T1023RDB_NAND_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1023RDB_SDCARD_defconfig b/configs/T1023RDB_SDCARD_defconfig
index 7bc7f54..84d0eb6 100644
--- a/configs/T1023RDB_SDCARD_defconfig
+++ b/configs/T1023RDB_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1023RDB_SECURE_BOOT_defconfig b/configs/T1023RDB_SECURE_BOOT_defconfig
index 6a3ccca..deba1e3 100644
--- a/configs/T1023RDB_SECURE_BOOT_defconfig
+++ b/configs/T1023RDB_SECURE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1023RDB_SPIFLASH_defconfig b/configs/T1023RDB_SPIFLASH_defconfig
index 83b14a8..ae294b5 100644
--- a/configs/T1023RDB_SPIFLASH_defconfig
+++ b/configs/T1023RDB_SPIFLASH_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1023RDB_defconfig b/configs/T1023RDB_defconfig
index c4b72d4..e165bf5 100644
--- a/configs/T1023RDB_defconfig
+++ b/configs/T1023RDB_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1023,T1023RDB"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig b/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
index f69c49d..8d26835 100644
--- a/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
+++ b/configs/T1024QDS_DDR4_SECURE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SYS_FSL_DDR4,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1024QDS_DDR4_defconfig b/configs/T1024QDS_DDR4_defconfig
index 174fbca..6f68ba2 100644
--- a/configs/T1024QDS_DDR4_defconfig
+++ b/configs/T1024QDS_DDR4_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SYS_FSL_DDR4"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
diff --git a/configs/T1024QDS_NAND_defconfig b/configs/T1024QDS_NAND_defconfig
index caedd39..d0ac1f7 100644
--- a/configs/T1024QDS_NAND_defconfig
+++ b/configs/T1024QDS_NAND_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XQDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1024QDS_SDCARD_defconfig b/configs/T1024QDS_SDCARD_defconfig
index 844d9a5..fa5d971 100644
--- a/configs/T1024QDS_SDCARD_defconfig
+++ b/configs/T1024QDS_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XQDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1024QDS_SECURE_BOOT_defconfig b/configs/T1024QDS_SECURE_BOOT_defconfig
index 9f80de0..29b5c8b 100644
--- a/configs/T1024QDS_SECURE_BOOT_defconfig
+++ b/configs/T1024QDS_SECURE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1024QDS_SPIFLASH_defconfig b/configs/T1024QDS_SPIFLASH_defconfig
index dc5a460..2a1b5be 100644
--- a/configs/T1024QDS_SPIFLASH_defconfig
+++ b/configs/T1024QDS_SPIFLASH_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XQDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1024QDS_defconfig b/configs/T1024QDS_defconfig
index 74138c7..103ad67 100644
--- a/configs/T1024QDS_defconfig
+++ b/configs/T1024QDS_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1024RDB_NAND_defconfig b/configs/T1024RDB_NAND_defconfig
index 7ae0433..dab835b 100644
--- a/configs/T1024RDB_NAND_defconfig
+++ b/configs/T1024RDB_NAND_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1024RDB_SDCARD_defconfig b/configs/T1024RDB_SDCARD_defconfig
index 3a664f8..36470b7 100644
--- a/configs/T1024RDB_SDCARD_defconfig
+++ b/configs/T1024RDB_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1024RDB_SECURE_BOOT_defconfig b/configs/T1024RDB_SECURE_BOOT_defconfig
index 8f4378b..ed90bbc 100644
--- a/configs/T1024RDB_SECURE_BOOT_defconfig
+++ b/configs/T1024RDB_SECURE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1024RDB_SPIFLASH_defconfig b/configs/T1024RDB_SPIFLASH_defconfig
index 36f2208..4f8b329 100644
--- a/configs/T1024RDB_SPIFLASH_defconfig
+++ b/configs/T1024RDB_SPIFLASH_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1024RDB_defconfig b/configs/T1024RDB_defconfig
index fba47c2..1db9600 100644
--- a/configs/T1024RDB_defconfig
+++ b/configs/T1024RDB_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T102XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,T1024RDB"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1040D4RDB_NAND_defconfig b/configs/T1040D4RDB_NAND_defconfig
index 0af8c8d..8b371f1 100644
--- a/configs/T1040D4RDB_NAND_defconfig
+++ b/configs/T1040D4RDB_NAND_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND,T104XD4RDB,SYS_FSL_DDR4"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1040D4RDB_SDCARD_defconfig b/configs/T1040D4RDB_SDCARD_defconfig
index dc9ee34..db8774e 100644
--- a/configs/T1040D4RDB_SDCARD_defconfig
+++ b/configs/T1040D4RDB_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD,T104XD4RDB,SYS_FSL_DDR4"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1040D4RDB_SECURE_BOOT_defconfig b/configs/T1040D4RDB_SECURE_BOOT_defconfig
index 6a891a6..bca1571 100644
--- a/configs/T1040D4RDB_SECURE_BOOT_defconfig
+++ b/configs/T1040D4RDB_SECURE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,T104XD4RDB,SYS_FSL_DDR4,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1040D4RDB_SPIFLASH_defconfig b/configs/T1040D4RDB_SPIFLASH_defconfig
index 4628576..10d88cd 100644
--- a/configs/T1040D4RDB_SPIFLASH_defconfig
+++ b/configs/T1040D4RDB_SPIFLASH_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH,T104XD4RDB,SYS_FSL_DDR4"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1040D4RDB_defconfig b/configs/T1040D4RDB_defconfig
index 6adc196..d46325d 100644
--- a/configs/T1040D4RDB_defconfig
+++ b/configs/T1040D4RDB_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,T104XD4RDB,SYS_FSL_DDR4"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1040QDS_DDR4_defconfig b/configs/T1040QDS_DDR4_defconfig
index 8c4320b..12aefb1 100644
--- a/configs/T1040QDS_DDR4_defconfig
+++ b/configs/T1040QDS_DDR4_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T1040QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,SYS_FSL_DDR4"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1040QDS_SECURE_BOOT_defconfig b/configs/T1040QDS_SECURE_BOOT_defconfig
index 607c280..3c7191c 100644
--- a/configs/T1040QDS_SECURE_BOOT_defconfig
+++ b/configs/T1040QDS_SECURE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T1040QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1040QDS_defconfig b/configs/T1040QDS_defconfig
index 1f200f9..8f19df3 100644
--- a/configs/T1040QDS_defconfig
+++ b/configs/T1040QDS_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T1040QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1040RDB_NAND_defconfig b/configs/T1040RDB_NAND_defconfig
index 146448d..007614f 100644
--- a/configs/T1040RDB_NAND_defconfig
+++ b/configs/T1040RDB_NAND_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1040RDB_SDCARD_defconfig b/configs/T1040RDB_SDCARD_defconfig
index f363067..dacc25b 100644
--- a/configs/T1040RDB_SDCARD_defconfig
+++ b/configs/T1040RDB_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1040RDB_SECURE_BOOT_defconfig b/configs/T1040RDB_SECURE_BOOT_defconfig
index 55d2a5e..6399873 100644
--- a/configs/T1040RDB_SECURE_BOOT_defconfig
+++ b/configs/T1040RDB_SECURE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,SECURE_BOOT,T1040RDB"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1040RDB_SPIFLASH_defconfig b/configs/T1040RDB_SPIFLASH_defconfig
index c6fd93a..4a2fa67 100644
--- a/configs/T1040RDB_SPIFLASH_defconfig
+++ b/configs/T1040RDB_SPIFLASH_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1040RDB_defconfig b/configs/T1040RDB_defconfig
index 810d1d8..67110ed 100644
--- a/configs/T1040RDB_defconfig
+++ b/configs/T1040RDB_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1042D4RDB_NAND_defconfig b/configs/T1042D4RDB_NAND_defconfig
index c06e335..14c4779 100644
--- a/configs/T1042D4RDB_NAND_defconfig
+++ b/configs/T1042D4RDB_NAND_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND,T104XD4RDB,SYS_FSL_DDR4"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1042D4RDB_SDCARD_defconfig b/configs/T1042D4RDB_SDCARD_defconfig
index b86554a..5cee5bd 100644
--- a/configs/T1042D4RDB_SDCARD_defconfig
+++ b/configs/T1042D4RDB_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD,T104XD4RDB,SYS_FSL_DDR4"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1042D4RDB_SECURE_BOOT_defconfig b/configs/T1042D4RDB_SECURE_BOOT_defconfig
index 8130f7c..5582f3d 100644
--- a/configs/T1042D4RDB_SECURE_BOOT_defconfig
+++ b/configs/T1042D4RDB_SECURE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,T104XD4RDB,SYS_FSL_DDR4,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1042D4RDB_SPIFLASH_defconfig b/configs/T1042D4RDB_SPIFLASH_defconfig
index ca7243a..72b3e73 100644
--- a/configs/T1042D4RDB_SPIFLASH_defconfig
+++ b/configs/T1042D4RDB_SPIFLASH_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH,T104XD4RDB,SYS_FSL_DDR4"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1042D4RDB_defconfig b/configs/T1042D4RDB_defconfig
index 4e44c89..4633ce1 100644
--- a/configs/T1042D4RDB_defconfig
+++ b/configs/T1042D4RDB_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,T104XD4RDB,SYS_FSL_DDR4"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1042RDB_PI_NAND_defconfig b/configs/T1042RDB_PI_NAND_defconfig
index ff0052a..399935e 100644
--- a/configs/T1042RDB_PI_NAND_defconfig
+++ b/configs/T1042RDB_PI_NAND_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1042RDB_PI_SDCARD_defconfig b/configs/T1042RDB_PI_SDCARD_defconfig
index c19bd8b..3e15d6a 100644
--- a/configs/T1042RDB_PI_SDCARD_defconfig
+++ b/configs/T1042RDB_PI_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1042RDB_PI_SPIFLASH_defconfig b/configs/T1042RDB_PI_SPIFLASH_defconfig
index fbce984..d6dbd92 100644
--- a/configs/T1042RDB_PI_SPIFLASH_defconfig
+++ b/configs/T1042RDB_PI_SPIFLASH_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1042RDB_PI_defconfig b/configs/T1042RDB_PI_defconfig
index 6353543..760d0a8 100644
--- a/configs/T1042RDB_PI_defconfig
+++ b/configs/T1042RDB_PI_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1042RDB_SECURE_BOOT_defconfig b/configs/T1042RDB_SECURE_BOOT_defconfig
index 39121ca..f2d1688 100644
--- a/configs/T1042RDB_SECURE_BOOT_defconfig
+++ b/configs/T1042RDB_SECURE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,SECURE_BOOT,T1042RDB"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T1042RDB_defconfig b/configs/T1042RDB_defconfig
index e5888e3..9ef8254 100644
--- a/configs/T1042RDB_defconfig
+++ b/configs/T1042RDB_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T104XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T2080QDS_NAND_defconfig b/configs/T2080QDS_NAND_defconfig
index 3610370..2d3ff3d 100644
--- a/configs/T2080QDS_NAND_defconfig
+++ b/configs/T2080QDS_NAND_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XQDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T2080QDS_SDCARD_defconfig b/configs/T2080QDS_SDCARD_defconfig
index 37cb6b7..49b2c9c 100644
--- a/configs/T2080QDS_SDCARD_defconfig
+++ b/configs/T2080QDS_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XQDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T2080QDS_SECURE_BOOT_defconfig b/configs/T2080QDS_SECURE_BOOT_defconfig
index 0f27b07..5b1cfcb 100644
--- a/configs/T2080QDS_SECURE_BOOT_defconfig
+++ b/configs/T2080QDS_SECURE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T2080QDS_SPIFLASH_defconfig b/configs/T2080QDS_SPIFLASH_defconfig
index 85a3689..738b789 100644
--- a/configs/T2080QDS_SPIFLASH_defconfig
+++ b/configs/T2080QDS_SPIFLASH_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XQDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig b/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
index 8f276fa..00e5fa3 100644
--- a/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/T2080QDS_SRIO_PCIE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/T2080QDS_defconfig b/configs/T2080QDS_defconfig
index c681528..9276364 100644
--- a/configs/T2080QDS_defconfig
+++ b/configs/T2080QDS_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T2080RDB_NAND_defconfig b/configs/T2080RDB_NAND_defconfig
index ab4a7be..41a63dc 100644
--- a/configs/T2080RDB_NAND_defconfig
+++ b/configs/T2080RDB_NAND_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T2080RDB_SDCARD_defconfig b/configs/T2080RDB_SDCARD_defconfig
index 5d0f43a..1b28b5d 100644
--- a/configs/T2080RDB_SDCARD_defconfig
+++ b/configs/T2080RDB_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T2080RDB_SECURE_BOOT_defconfig b/configs/T2080RDB_SECURE_BOOT_defconfig
index 43a76bc..e70c449 100644
--- a/configs/T2080RDB_SECURE_BOOT_defconfig
+++ b/configs/T2080RDB_SECURE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T2080RDB_SPIFLASH_defconfig b/configs/T2080RDB_SPIFLASH_defconfig
index 1b230b1..506b123 100644
--- a/configs/T2080RDB_SPIFLASH_defconfig
+++ b/configs/T2080RDB_SPIFLASH_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XRDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig b/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig
index af1a232..65b0dac 100644
--- a/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig
+++ b/configs/T2080RDB_SRIO_PCIE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/T2080RDB_defconfig b/configs/T2080RDB_defconfig
index cbd1220..94c4e06 100644
--- a/configs/T2080RDB_defconfig
+++ b/configs/T2080RDB_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XRDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T2081QDS_NAND_defconfig b/configs/T2081QDS_NAND_defconfig
index 9ef946b..042b478 100644
--- a/configs/T2081QDS_NAND_defconfig
+++ b/configs/T2081QDS_NAND_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XQDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T2081QDS_SDCARD_defconfig b/configs/T2081QDS_SDCARD_defconfig
index 8728f2d..213da68 100644
--- a/configs/T2081QDS_SDCARD_defconfig
+++ b/configs/T2081QDS_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XQDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T2081QDS_SPIFLASH_defconfig b/configs/T2081QDS_SPIFLASH_defconfig
index 95c37dc..77c665e 100644
--- a/configs/T2081QDS_SPIFLASH_defconfig
+++ b/configs/T2081QDS_SPIFLASH_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XQDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig b/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig
index 1b0ac47..8e9f5fc 100644
--- a/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/T2081QDS_SRIO_PCIE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/T2081QDS_defconfig b/configs/T2081QDS_defconfig
index 8f3bcf6..9fc4231 100644
--- a/configs/T2081QDS_defconfig
+++ b/configs/T2081QDS_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T208XQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T4160QDS_NAND_defconfig b/configs/T4160QDS_NAND_defconfig
index 3a35060..bbbd489 100644
--- a/configs/T4160QDS_NAND_defconfig
+++ b/configs/T4160QDS_NAND_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240QDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T4160QDS_SDCARD_defconfig b/configs/T4160QDS_SDCARD_defconfig
index ef7135e..636395f 100644
--- a/configs/T4160QDS_SDCARD_defconfig
+++ b/configs/T4160QDS_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240QDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T4160QDS_SECURE_BOOT_defconfig b/configs/T4160QDS_SECURE_BOOT_defconfig
index d08f98c..1b9a769 100644
--- a/configs/T4160QDS_SECURE_BOOT_defconfig
+++ b/configs/T4160QDS_SECURE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T4160QDS_defconfig b/configs/T4160QDS_defconfig
index e44af1e..597c20d 100644
--- a/configs/T4160QDS_defconfig
+++ b/configs/T4160QDS_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T4160RDB_defconfig b/configs/T4160RDB_defconfig
index 1cc929f..b504128 100644
--- a/configs/T4160RDB_defconfig
+++ b/configs/T4160RDB_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T4240QDS_NAND_defconfig b/configs/T4240QDS_NAND_defconfig
index 31e1f53..b25d2ca 100644
--- a/configs/T4240QDS_NAND_defconfig
+++ b/configs/T4240QDS_NAND_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240QDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T4240QDS_SDCARD_defconfig b/configs/T4240QDS_SDCARD_defconfig
index a464136..e7fdb02 100644
--- a/configs/T4240QDS_SDCARD_defconfig
+++ b/configs/T4240QDS_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240QDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T4240QDS_SECURE_BOOT_defconfig b/configs/T4240QDS_SECURE_BOOT_defconfig
index 094f305..2f74a50 100644
--- a/configs/T4240QDS_SECURE_BOOT_defconfig
+++ b/configs/T4240QDS_SECURE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T4240QDS_SRIO_PCIE_BOOT_defconfig b/configs/T4240QDS_SRIO_PCIE_BOOT_defconfig
index 60afd9e..0d5bd41 100644
--- a/configs/T4240QDS_SRIO_PCIE_BOOT_defconfig
+++ b/configs/T4240QDS_SRIO_PCIE_BOOT_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/T4240QDS_defconfig b/configs/T4240QDS_defconfig
index 7fe54bf..83f419b 100644
--- a/configs/T4240QDS_defconfig
+++ b/configs/T4240QDS_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240QDS=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T4240RDB_SDCARD_defconfig b/configs/T4240RDB_SDCARD_defconfig
index 0d0d26c..03081fe 100644
--- a/configs/T4240RDB_SDCARD_defconfig
+++ b/configs/T4240RDB_SDCARD_defconfig
@@ -3,6 +3,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240RDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/T4240RDB_defconfig b/configs/T4240RDB_defconfig
index 01221b0..d51943b 100644
--- a/configs/T4240RDB_defconfig
+++ b/configs/T4240RDB_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240RDB=y
 CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240"
+CONFIG_BOOTDELAY=10
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/TQM5200S_HIGHBOOT_defconfig b/configs/TQM5200S_HIGHBOOT_defconfig
index 4c38482..b3c4aa0 100644
--- a/configs/TQM5200S_HIGHBOOT_defconfig
+++ b/configs/TQM5200S_HIGHBOOT_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_TQM5200=y
 CONFIG_SYS_EXTRA_OPTIONS="TQM5200_B,TQM5200S,SYS_TEXT_BASE=0xFFF00000"
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM5200S_defconfig b/configs/TQM5200S_defconfig
index a01bd39..745b666 100644
--- a/configs/TQM5200S_defconfig
+++ b/configs/TQM5200S_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_TQM5200=y
 CONFIG_SYS_EXTRA_OPTIONS="TQM5200_B,TQM5200S"
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM5200_B_HIGHBOOT_defconfig b/configs/TQM5200_B_HIGHBOOT_defconfig
index dac1eef..38a4e62 100644
--- a/configs/TQM5200_B_HIGHBOOT_defconfig
+++ b/configs/TQM5200_B_HIGHBOOT_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_TQM5200=y
 CONFIG_SYS_EXTRA_OPTIONS="TQM5200_B,SYS_TEXT_BASE=0xFFF00000"
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM5200_B_defconfig b/configs/TQM5200_B_defconfig
index 8417ce2..5934c52 100644
--- a/configs/TQM5200_B_defconfig
+++ b/configs/TQM5200_B_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_TQM5200=y
 CONFIG_SYS_EXTRA_OPTIONS="TQM5200_B"
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM5200_STK100_defconfig b/configs/TQM5200_STK100_defconfig
index 9e381f4..f816c7b 100644
--- a/configs/TQM5200_STK100_defconfig
+++ b/configs/TQM5200_STK100_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_TQM5200=y
 CONFIG_SYS_EXTRA_OPTIONS="STK52XX_REV100"
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM5200_defconfig b/configs/TQM5200_defconfig
index d82a5be..1e4cc15 100644
--- a/configs/TQM5200_defconfig
+++ b/configs/TQM5200_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_TQM5200=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM823L_LCD_defconfig b/configs/TQM823L_LCD_defconfig
index ebe9bdf..fce6439 100644
--- a/configs/TQM823L_LCD_defconfig
+++ b/configs/TQM823L_LCD_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM823L=y
 CONFIG_SYS_EXTRA_OPTIONS="LCD,NEC_NL6448BC20"
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM823L_defconfig b/configs/TQM823L_defconfig
index 05e69c3..214a2d3 100644
--- a/configs/TQM823L_defconfig
+++ b/configs/TQM823L_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM823L=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM823M_defconfig b/configs/TQM823M_defconfig
index 4c9ead8..12818c1 100644
--- a/configs/TQM823M_defconfig
+++ b/configs/TQM823M_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM823M=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM834x_defconfig b/configs/TQM834x_defconfig
index c980d95..6fa91e0 100644
--- a/configs/TQM834x_defconfig
+++ b/configs/TQM834x_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_TQM834X=y
+CONFIG_BOOTDELAY=6
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM850L_defconfig b/configs/TQM850L_defconfig
index 47c4070..68fde60 100644
--- a/configs/TQM850L_defconfig
+++ b/configs/TQM850L_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM850L=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM850M_defconfig b/configs/TQM850M_defconfig
index e4784b5..b7ec3d0 100644
--- a/configs/TQM850M_defconfig
+++ b/configs/TQM850M_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM850M=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM855L_defconfig b/configs/TQM855L_defconfig
index e0b03af..06d90f8 100644
--- a/configs/TQM855L_defconfig
+++ b/configs/TQM855L_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM855L=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM855M_defconfig b/configs/TQM855M_defconfig
index 32496bf..0d62eab 100644
--- a/configs/TQM855M_defconfig
+++ b/configs/TQM855M_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM855M=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM860L_defconfig b/configs/TQM860L_defconfig
index b83a07b..c3d8dc9 100644
--- a/configs/TQM860L_defconfig
+++ b/configs/TQM860L_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM860L=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM860M_defconfig b/configs/TQM860M_defconfig
index d95ad79..2aee755 100644
--- a/configs/TQM860M_defconfig
+++ b/configs/TQM860M_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM860M=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM862L_defconfig b/configs/TQM862L_defconfig
index 75c8801..2b3d626 100644
--- a/configs/TQM862L_defconfig
+++ b/configs/TQM862L_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM862L=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM862M_defconfig b/configs/TQM862M_defconfig
index d5f8222..de18ec3 100644
--- a/configs/TQM862M_defconfig
+++ b/configs/TQM862M_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM862M=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM866M_defconfig b/configs/TQM866M_defconfig
index 74f12e2..fadeb7f 100644
--- a/configs/TQM866M_defconfig
+++ b/configs/TQM866M_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM866M=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TQM885D_defconfig b/configs/TQM885D_defconfig
index bcad969..c3562c1 100644
--- a/configs/TQM885D_defconfig
+++ b/configs/TQM885D_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM885D=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TTTech_defconfig b/configs/TTTech_defconfig
index d239a73..a8c53f7 100644
--- a/configs/TTTech_defconfig
+++ b/configs/TTTech_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM823L=y
 CONFIG_SYS_EXTRA_OPTIONS="LCD,SHARP_LQ104V7DS01"
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/TWR-P1025_defconfig b/configs/TWR-P1025_defconfig
index e6d34e8..41aaa58 100644
--- a/configs/TWR-P1025_defconfig
+++ b/configs/TWR-P1025_defconfig
@@ -2,5 +2,6 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_P1_TWR=y
 CONFIG_SYS_EXTRA_OPTIONS="TWR_P1025"
+CONFIG_BOOTDELAY=10
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/TZX-Q8-713B7_defconfig b/configs/TZX-Q8-713B7_defconfig
index 5881c07..7a1e817 100644
--- a/configs/TZX-Q8-713B7_defconfig
+++ b/configs/TZX-Q8-713B7_defconfig
@@ -15,6 +15,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-tzx-q8-713b7"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/UCP1020_SPIFLASH_defconfig b/configs/UCP1020_SPIFLASH_defconfig
index 267dc0f..d3399d3 100644
--- a/configs/UCP1020_SPIFLASH_defconfig
+++ b/configs/UCP1020_SPIFLASH_defconfig
@@ -5,6 +5,7 @@ CONFIG_TARGET_UCP1020_SPIFLASH=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc>\" to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="\x1b"
+CONFIG_BOOTDELAY=2
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/UCP1020_defconfig b/configs/UCP1020_defconfig
index fa54286..958eb70 100644
--- a/configs/UCP1020_defconfig
+++ b/configs/UCP1020_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_PROMPT="B$ "
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc>\" to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="\x1b"
+CONFIG_BOOTDELAY=2
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/UTOO_P66_defconfig b/configs/UTOO_P66_defconfig
index d956917..bbee197 100644
--- a/configs/UTOO_P66_defconfig
+++ b/configs/UTOO_P66_defconfig
@@ -21,6 +21,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-utoo-p66"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/VCMA9_defconfig b/configs/VCMA9_defconfig
index 927967d..7c278c6 100644
--- a/configs/VCMA9_defconfig
+++ b/configs/VCMA9_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
 CONFIG_TARGET_VCMA9=y
 CONFIG_SYS_PROMPT="VCMA9 # "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/Wexler_TAB7200_defconfig b/configs/Wexler_TAB7200_defconfig
index 524720e..5cebca8 100644
--- a/configs/Wexler_TAB7200_defconfig
+++ b/configs/Wexler_TAB7200_defconfig
@@ -14,6 +14,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-wexler-tab7200"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Wits_Pro_A20_DKT_defconfig b/configs/Wits_Pro_A20_DKT_defconfig
index bec4a11..4cc3135 100644
--- a/configs/Wits_Pro_A20_DKT_defconfig
+++ b/configs/Wits_Pro_A20_DKT_defconfig
@@ -12,6 +12,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-wits-pro-a20-dkt"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Wobo_i5_defconfig b/configs/Wobo_i5_defconfig
index 4814e85..5203c2e 100644
--- a/configs/Wobo_i5_defconfig
+++ b/configs/Wobo_i5_defconfig
@@ -8,6 +8,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-wobo-i5"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/Yones_Toptech_BD1078_defconfig b/configs/Yones_Toptech_BD1078_defconfig
index 20ae0b9..7a440eb 100644
--- a/configs/Yones_Toptech_BD1078_defconfig
+++ b/configs/Yones_Toptech_BD1078_defconfig
@@ -20,6 +20,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-yones-toptech-bd1078"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/a4m072_defconfig b/configs/a4m072_defconfig
index 4a02293..8132f4c 100644
--- a/configs/a4m072_defconfig
+++ b/configs/a4m072_defconfig
@@ -4,4 +4,5 @@ CONFIG_TARGET_A4M072=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="asdfg"
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ac14xx_defconfig b/configs/ac14xx_defconfig
index 608b56a..8de3af9 100644
--- a/configs/ac14xx_defconfig
+++ b/configs/ac14xx_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC512X=y
 CONFIG_TARGET_AC14XX=y
 CONFIG_SYS_PROMPT="ac14xx> "
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/acadia_defconfig b/configs/acadia_defconfig
index 26221ce..1e1ac4e 100644
--- a/configs/acadia_defconfig
+++ b/configs/acadia_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_ACADIA=y
+CONFIG_BOOTDELAY=5
diff --git a/configs/am335x_sl50_defconfig b/configs/am335x_sl50_defconfig
index 887a5ef..c8aa0a8 100644
--- a/configs/am335x_sl50_defconfig
+++ b/configs/am335x_sl50_defconfig
@@ -4,6 +4,7 @@ CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/am3517_crane_defconfig b/configs/am3517_crane_defconfig
index 48a184f..ed09b1b 100644
--- a/configs/am3517_crane_defconfig
+++ b/configs/am3517_crane_defconfig
@@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_AM3517_CRANE=y
 CONFIG_SPL=y
 CONFIG_SYS_PROMPT="AM3517_CRANE # "
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig
index 8857b9f..8142400 100644
--- a/configs/am3517_evm_defconfig
+++ b/configs/am3517_evm_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_AM3517_EVM=y
 CONFIG_SPL=y
 CONFIG_FIT=y
 CONFIG_SYS_PROMPT="AM3517_EVM # "
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig
index b4827e5..e4b9e45 100644
--- a/configs/apalis_t30_defconfig
+++ b/configs/apalis_t30_defconfig
@@ -5,6 +5,7 @@ CONFIG_TEGRA30=y
 CONFIG_TARGET_APALIS_T30=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-apalis"
 CONFIG_SYS_PROMPT="Apalis T30 # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig
index 3a7a8c1..39e00ec 100644
--- a/configs/apf27_defconfig
+++ b/configs/apf27_defconfig
@@ -2,5 +2,6 @@ CONFIG_ARM=y
 CONFIG_TARGET_APF27=y
 CONFIG_SPL=y
 CONFIG_SYS_PROMPT="BIOS> "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/arches_defconfig b/configs/arches_defconfig
index 9084a3a..c06fd79 100644
--- a/configs/arches_defconfig
+++ b/configs/arches_defconfig
@@ -3,4 +3,5 @@ CONFIG_4xx=y
 CONFIG_TARGET_CANYONLANDS=y
 CONFIG_ARCHES=y
 CONFIG_DEFAULT_DEVICE_TREE="arches"
+CONFIG_BOOTDELAY=5
 CONFIG_OF_CONTROL=y
diff --git a/configs/aria_defconfig b/configs/aria_defconfig
index 1c073bf..098be8c 100644
--- a/configs/aria_defconfig
+++ b/configs/aria_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC512X=y
 CONFIG_TARGET_ARIA=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index be27365..8011ae9 100644
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -5,6 +5,7 @@ CONFIG_DM_I2C=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale"
 CONFIG_SPL=y
 CONFIG_SYS_PROMPT="ARNDALE # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ba10_tv_box_defconfig b/configs/ba10_tv_box_defconfig
index db6657e..9856438 100644
--- a/configs/ba10_tv_box_defconfig
+++ b/configs/ba10_tv_box_defconfig
@@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-ba10-tvbox"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/bamboo_defconfig b/configs/bamboo_defconfig
index 1d66807..a31672a 100644
--- a/configs/bamboo_defconfig
+++ b/configs/bamboo_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_BAMBOO=y
+CONFIG_BOOTDELAY=5
diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index b178641..64c12ec 100644
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -5,6 +5,7 @@ CONFIG_TEGRA30=y
 CONFIG_TARGET_BEAVER=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-beaver"
 CONFIG_SYS_PROMPT="Tegra30 (Beaver) # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/bf525-ucr2_defconfig b/configs/bf525-ucr2_defconfig
index 6406f20..1b1952e 100644
--- a/configs/bf525-ucr2_defconfig
+++ b/configs/bf525-ucr2_defconfig
@@ -1,5 +1,6 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF525_UCR2=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/bf537-minotaur_defconfig b/configs/bf537-minotaur_defconfig
index f71af52..022ffb7 100644
--- a/configs/bf537-minotaur_defconfig
+++ b/configs/bf537-minotaur_defconfig
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF537_MINOTAUR=y
 CONFIG_SYS_PROMPT="minotaur> "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/bf537-srv1_defconfig b/configs/bf537-srv1_defconfig
index 3db7400..4b7c1c2 100644
--- a/configs/bf537-srv1_defconfig
+++ b/configs/bf537-srv1_defconfig
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF537_SRV1=y
 CONFIG_SYS_PROMPT="srv1> "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/blackstamp_defconfig b/configs/blackstamp_defconfig
index 762eef3..2a201ba 100644
--- a/configs/blackstamp_defconfig
+++ b/configs/blackstamp_defconfig
@@ -1,5 +1,6 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BLACKSTAMP=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/blackvme_defconfig b/configs/blackvme_defconfig
index 53f4a0d..afd80de 100644
--- a/configs/blackvme_defconfig
+++ b/configs/blackvme_defconfig
@@ -1,5 +1,6 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BLACKVME=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/br4_defconfig b/configs/br4_defconfig
index 5a680a0..a5a37dc 100644
--- a/configs/br4_defconfig
+++ b/configs/br4_defconfig
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BR4=y
 CONFIG_SYS_PROMPT="br4>"
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/bubinga_defconfig b/configs/bubinga_defconfig
index 65ea4d1..f4dc521 100644
--- a/configs/bubinga_defconfig
+++ b/configs/bubinga_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_BUBINGA=y
+CONFIG_BOOTDELAY=5
diff --git a/configs/caddy2_defconfig b/configs/caddy2_defconfig
index 343432c..0c35f79 100644
--- a/configs/caddy2_defconfig
+++ b/configs/caddy2_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_VME8349=y
 CONFIG_SYS_EXTRA_OPTIONS="CADDY2"
+CONFIG_BOOTDELAY=6
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig
index bb3a348..5fd55db 100644
--- a/configs/cairo_defconfig
+++ b/configs/cairo_defconfig
@@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_CAIRO=y
 CONFIG_SPL=y
 CONFIG_SYS_PROMPT="Cairo # "
+CONFIG_BOOTDELAY=0
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/calimain_defconfig b/configs/calimain_defconfig
index 271b556..d3554ee 100644
--- a/configs/calimain_defconfig
+++ b/configs/calimain_defconfig
@@ -4,4 +4,5 @@ CONFIG_TARGET_CALIMAIN=y
 CONFIG_SYS_PROMPT="Calimain > "
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR="\x0b"
+CONFIG_BOOTDELAY=0
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/cam5200_defconfig b/configs/cam5200_defconfig
index eda131a..bb1f44a 100644
--- a/configs/cam5200_defconfig
+++ b/configs/cam5200_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_TQM5200=y
 CONFIG_SYS_EXTRA_OPTIONS="CAM5200,TQM5200S,TQM5200_B"
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/cam5200_niosflash_defconfig b/configs/cam5200_niosflash_defconfig
index aa7c70a..3568d59 100644
--- a/configs/cam5200_niosflash_defconfig
+++ b/configs/cam5200_niosflash_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_TQM5200=y
 CONFIG_SYS_EXTRA_OPTIONS="CAM5200,TQM5200S,TQM5200_B,CAM5200_NIOSFLASH"
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/canmb_defconfig b/configs/canmb_defconfig
index b1ec147..5b39f41 100644
--- a/configs/canmb_defconfig
+++ b/configs/canmb_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_CANMB=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/canyonlands_defconfig b/configs/canyonlands_defconfig
index 44d4fbd..708d51d 100644
--- a/configs/canyonlands_defconfig
+++ b/configs/canyonlands_defconfig
@@ -3,5 +3,6 @@ CONFIG_4xx=y
 CONFIG_TARGET_CANYONLANDS=y
 CONFIG_CANYONLANDS=y
 CONFIG_DEFAULT_DEVICE_TREE="canyonlands"
+CONFIG_BOOTDELAY=5
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
index 921ed88..7911c2e 100644
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_defconfig
@@ -5,6 +5,7 @@ CONFIG_TEGRA30=y
 CONFIG_TARGET_CARDHU=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-cardhu"
 CONFIG_SYS_PROMPT="Tegra30 (Cardhu) # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/charon_defconfig b/configs/charon_defconfig
index d67cc55..d80e5df 100644
--- a/configs/charon_defconfig
+++ b/configs/charon_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_CHARON=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig
index 9e87b66..5d836ae 100644
--- a/configs/chromebook_jerry_defconfig
+++ b/configs/chromebook_jerry_defconfig
@@ -6,6 +6,7 @@ CONFIG_TARGET_CHROMEBOOK_JERRY=y
 CONFIG_DEFAULT_DEVICE_TREE="rk3288-jerry"
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x80000
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/cm5200_defconfig b/configs/cm5200_defconfig
index 76c7b06..59f663f 100644
--- a/configs/cm5200_defconfig
+++ b/configs/cm5200_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_CM5200=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig
index 645d355..4dca620 100644
--- a/configs/cm_t43_defconfig
+++ b/configs/cm_t43_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_TARGET_CM_T43=y
 CONFIG_DM_GPIO=y
 CONFIG_SPL=y
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_SF=y
diff --git a/configs/cobra5272_defconfig b/configs/cobra5272_defconfig
index 5cb6a80..a56af34 100644
--- a/configs/cobra5272_defconfig
+++ b/configs/cobra5272_defconfig
@@ -1,6 +1,7 @@
 CONFIG_M68K=y
 CONFIG_TARGET_COBRA5272=y
 CONFIG_SYS_PROMPT="COBRA > "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/colibri_pxa270_defconfig b/configs/colibri_pxa270_defconfig
index 3963a50..1942eb6 100644
--- a/configs/colibri_pxa270_defconfig
+++ b/configs/colibri_pxa270_defconfig
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_COLIBRI_PXA270=y
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
index 8a220ac..2665224 100644
--- a/configs/colibri_t20_defconfig
+++ b/configs/colibri_t20_defconfig
@@ -5,6 +5,7 @@ CONFIG_TEGRA20=y
 CONFIG_TARGET_COLIBRI_T20=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri"
 CONFIG_SYS_PROMPT="Colibri T20 # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig
index b121cea..116f089 100644
--- a/configs/colibri_t30_defconfig
+++ b/configs/colibri_t30_defconfig
@@ -5,6 +5,7 @@ CONFIG_TEGRA30=y
 CONFIG_TARGET_COLIBRI_T30=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-colibri"
 CONFIG_SYS_PROMPT="Colibri T30 # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
index c8ab862..b11f4bc 100644
--- a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
+++ b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_CONTROLCENTERD=y
 CONFIG_SYS_EXTRA_OPTIONS="36BIT,SDCARD,DEVELOP"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_TPM=y
diff --git a/configs/controlcenterd_36BIT_SDCARD_defconfig b/configs/controlcenterd_36BIT_SDCARD_defconfig
index 21c0eab..0099265 100644
--- a/configs/controlcenterd_36BIT_SDCARD_defconfig
+++ b/configs/controlcenterd_36BIT_SDCARD_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_CONTROLCENTERD=y
 CONFIG_SYS_EXTRA_OPTIONS="36BIT,SDCARD"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_TPM=y
diff --git a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
index c3a0920..8e7724b 100644
--- a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
+++ b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_CONTROLCENTERD=y
 CONFIG_SYS_EXTRA_OPTIONS="TRAILBLAZER,SPIFLASH,DEVELOP"
+CONFIG_BOOTDELAY=0
 # CONFIG_CMD_BOOTM is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/controlcenterd_TRAILBLAZER_defconfig b/configs/controlcenterd_TRAILBLAZER_defconfig
index 08aae9a..5a8a135 100644
--- a/configs/controlcenterd_TRAILBLAZER_defconfig
+++ b/configs/controlcenterd_TRAILBLAZER_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_CONTROLCENTERD=y
 CONFIG_SYS_EXTRA_OPTIONS="TRAILBLAZER,SPIFLASH"
+CONFIG_BOOTDELAY=0
 # CONFIG_CMD_BOOTM is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig
index 681c979..73a93c5 100644
--- a/configs/dalmore_defconfig
+++ b/configs/dalmore_defconfig
@@ -5,6 +5,7 @@ CONFIG_TEGRA114=y
 CONFIG_TARGET_DALMORE=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra114-dalmore"
 CONFIG_SYS_PROMPT="Tegra114 (Dalmore) # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/dbau1000_defconfig b/configs/dbau1000_defconfig
index 5ffe104..1f5bd46 100644
--- a/configs/dbau1000_defconfig
+++ b/configs/dbau1000_defconfig
@@ -2,6 +2,7 @@ CONFIG_MIPS=y
 CONFIG_TARGET_DBAU1X00=y
 CONFIG_SYS_EXTRA_OPTIONS="DBAU1000"
 CONFIG_SYS_PROMPT="DbAu1xx0 # "
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_SAVEENV is not set
diff --git a/configs/dbau1100_defconfig b/configs/dbau1100_defconfig
index 84e369a..4715aff 100644
--- a/configs/dbau1100_defconfig
+++ b/configs/dbau1100_defconfig
@@ -2,6 +2,7 @@ CONFIG_MIPS=y
 CONFIG_TARGET_DBAU1X00=y
 CONFIG_DBAU1100=y
 CONFIG_SYS_PROMPT="DbAu1xx0 # "
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_SAVEENV is not set
diff --git a/configs/dbau1500_defconfig b/configs/dbau1500_defconfig
index 8a9583b..53d4274 100644
--- a/configs/dbau1500_defconfig
+++ b/configs/dbau1500_defconfig
@@ -2,6 +2,7 @@ CONFIG_MIPS=y
 CONFIG_TARGET_DBAU1X00=y
 CONFIG_DBAU1500=y
 CONFIG_SYS_PROMPT="DbAu1xx0 # "
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_SAVEENV is not set
diff --git a/configs/dbau1550_defconfig b/configs/dbau1550_defconfig
index 333a922..24b8c2c 100644
--- a/configs/dbau1550_defconfig
+++ b/configs/dbau1550_defconfig
@@ -2,6 +2,7 @@ CONFIG_MIPS=y
 CONFIG_TARGET_DBAU1X00=y
 CONFIG_DBAU1550=y
 CONFIG_SYS_PROMPT="DbAu1xx0 # "
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_SAVEENV is not set
diff --git a/configs/dbau1550_el_defconfig b/configs/dbau1550_el_defconfig
index 5970e43..574dccb 100644
--- a/configs/dbau1550_el_defconfig
+++ b/configs/dbau1550_el_defconfig
@@ -3,6 +3,7 @@ CONFIG_TARGET_DBAU1X00=y
 CONFIG_DBAU1550=y
 CONFIG_SYS_LITTLE_ENDIAN=y
 CONFIG_SYS_PROMPT="DbAu1xx0 # "
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_SAVEENV is not set
diff --git a/configs/devconcenter_defconfig b/configs/devconcenter_defconfig
index ecf766e..261fa37 100644
--- a/configs/devconcenter_defconfig
+++ b/configs/devconcenter_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_INTIP=y
 CONFIG_SYS_EXTRA_OPTIONS="DEVCONCENTER"
+CONFIG_BOOTDELAY=5
diff --git a/configs/dlvision-10g_defconfig b/configs/dlvision-10g_defconfig
index 4ed14f8..1770070 100644
--- a/configs/dlvision-10g_defconfig
+++ b/configs/dlvision-10g_defconfig
@@ -3,4 +3,5 @@ CONFIG_4xx=y
 CONFIG_TARGET_DLVISION_10G=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_NFS is not set
diff --git a/configs/dlvision_defconfig b/configs/dlvision_defconfig
index 7982c17..09f07c1 100644
--- a/configs/dlvision_defconfig
+++ b/configs/dlvision_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_DLVISION=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_NFS is not set
diff --git a/configs/e2220-1170_defconfig b/configs/e2220-1170_defconfig
index a60ba97..ab11d9a 100644
--- a/configs/e2220-1170_defconfig
+++ b/configs/e2220-1170_defconfig
@@ -3,6 +3,7 @@ CONFIG_TEGRA=y
 CONFIG_TEGRA210=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra210-e2220-1170"
 CONFIG_SYS_PROMPT="Tegra210 (E2220-1170) # "
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/eb_cpu5282_defconfig b/configs/eb_cpu5282_defconfig
index 52f4a24..4dfc6f0 100644
--- a/configs/eb_cpu5282_defconfig
+++ b/configs/eb_cpu5282_defconfig
@@ -2,5 +2,6 @@ CONFIG_M68K=y
 CONFIG_TARGET_EB_CPU5282=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xFF000000,SYS_MONITOR_BASE=0xFF000400"
 CONFIG_SYS_PROMPT="\nEB+CPU5282> "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/eb_cpu5282_internal_defconfig b/configs/eb_cpu5282_internal_defconfig
index 5af19a0..a8b6c49 100644
--- a/configs/eb_cpu5282_internal_defconfig
+++ b/configs/eb_cpu5282_internal_defconfig
@@ -1,5 +1,6 @@
 CONFIG_M68K=y
 CONFIG_TARGET_EB_CPU5282=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF0000000,SYS_MONITOR_BASE=0xF0000418"
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ebony_defconfig b/configs/ebony_defconfig
index db93555..0d4affa 100644
--- a/configs/ebony_defconfig
+++ b/configs/ebony_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_EBONY=y
+CONFIG_BOOTDELAY=5
diff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig
index 759e7e9..56cb073 100644
--- a/configs/eco5pk_defconfig
+++ b/configs/eco5pk_defconfig
@@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_ECO5PK=y
 CONFIG_SPL=y
 CONFIG_SYS_PROMPT="ECO5-PK # "
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/edb9315a_defconfig b/configs/edb9315a_defconfig
index d0c690d..48bec31 100644
--- a/configs/edb9315a_defconfig
+++ b/configs/edb9315a_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_EDB93XX=y
 CONFIG_SYS_EXTRA_OPTIONS="MK_edb9315a"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_FPGA is not set
diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig
index 2a6a689..a2b1e65 100644
--- a/configs/firefly-rk3288_defconfig
+++ b/configs/firefly-rk3288_defconfig
@@ -6,6 +6,7 @@ CONFIG_TARGET_FIREFLY_RK3288=y
 CONFIG_DEFAULT_DEVICE_TREE="rk3288-firefly"
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x80000
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/fo300_defconfig b/configs/fo300_defconfig
index b8e5c80..8437f67 100644
--- a/configs/fo300_defconfig
+++ b/configs/fo300_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_TQM5200=y
 CONFIG_SYS_EXTRA_OPTIONS="FO300"
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/forfun_q88db_defconfig b/configs/forfun_q88db_defconfig
index 4f89b0d..fbab22c 100644
--- a/configs/forfun_q88db_defconfig
+++ b/configs/forfun_q88db_defconfig
@@ -14,6 +14,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-forfun-q88db"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/fx12mm_defconfig b/configs/fx12mm_defconfig
index da5df04..5490cce 100644
--- a/configs/fx12mm_defconfig
+++ b/configs/fx12mm_defconfig
@@ -3,6 +3,7 @@ CONFIG_4xx=y
 CONFIG_TARGET_FX12MM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000,INIT_TLB=board/xilinx/ppc405-generic/init.o"
 CONFIG_SYS_PROMPT="FX12MM:/# "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
diff --git a/configs/fx12mm_flash_defconfig b/configs/fx12mm_flash_defconfig
index 60eee67..955322e 100644
--- a/configs/fx12mm_flash_defconfig
+++ b/configs/fx12mm_flash_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_FX12MM=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC,INIT_TLB=board/xilinx/ppc405-generic/init.o"
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
diff --git a/configs/ga10h_v1_1_defconfig b/configs/ga10h_v1_1_defconfig
index ec37087..221dd20 100644
--- a/configs/ga10h_v1_1_defconfig
+++ b/configs/ga10h_v1_1_defconfig
@@ -18,6 +18,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-ga10h-v1.1"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/gdppc440etx_defconfig b/configs/gdppc440etx_defconfig
index 2dfebbb..8b16294 100644
--- a/configs/gdppc440etx_defconfig
+++ b/configs/gdppc440etx_defconfig
@@ -3,3 +3,4 @@ CONFIG_4xx=y
 CONFIG_TARGET_GDPPC440ETX=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_BOOTDELAY=5
diff --git a/configs/glacier_defconfig b/configs/glacier_defconfig
index d318f82..710456b 100644
--- a/configs/glacier_defconfig
+++ b/configs/glacier_defconfig
@@ -3,5 +3,6 @@ CONFIG_4xx=y
 CONFIG_TARGET_CANYONLANDS=y
 CONFIG_GLACIER=y
 CONFIG_DEFAULT_DEVICE_TREE="glacier"
+CONFIG_BOOTDELAY=5
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
diff --git a/configs/glacier_ramboot_defconfig b/configs/glacier_ramboot_defconfig
index 98bcaf4..260cad0 100644
--- a/configs/glacier_ramboot_defconfig
+++ b/configs/glacier_ramboot_defconfig
@@ -4,5 +4,6 @@ CONFIG_TARGET_CANYONLANDS=y
 CONFIG_GLACIER=y
 CONFIG_DEFAULT_DEVICE_TREE="glacier"
 CONFIG_SYS_EXTRA_OPTIONS="SYS_RAMBOOT,SYS_TEXT_BASE=0x01000000,SYS_LDSCRIPT=board/amcc/canyonlands/u-boot-ram.lds"
+CONFIG_BOOTDELAY=5
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
diff --git a/configs/gr_cpci_ax2000_defconfig b/configs/gr_cpci_ax2000_defconfig
index f003d77..6f4a92a 100644
--- a/configs/gr_cpci_ax2000_defconfig
+++ b/configs/gr_cpci_ax2000_defconfig
@@ -1,4 +1,5 @@
 CONFIG_SPARC=y
 CONFIG_TARGET_GR_CPCI_AX2000=y
 CONFIG_SYS_TEXT_BASE=0x00000000
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/gr_ep2s60_defconfig b/configs/gr_ep2s60_defconfig
index bbf1808..830e4b6 100644
--- a/configs/gr_ep2s60_defconfig
+++ b/configs/gr_ep2s60_defconfig
@@ -1,4 +1,5 @@
 CONFIG_SPARC=y
 CONFIG_TARGET_GR_EP2S60=y
 CONFIG_SYS_TEXT_BASE=0x00000000
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/gr_xc3s_1500_defconfig b/configs/gr_xc3s_1500_defconfig
index 5c1442d..d320fdd 100644
--- a/configs/gr_xc3s_1500_defconfig
+++ b/configs/gr_xc3s_1500_defconfig
@@ -1,4 +1,5 @@
 CONFIG_SPARC=y
 CONFIG_TARGET_GR_XC3S_1500=y
 CONFIG_SYS_TEXT_BASE=0x00000000
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/grsim_defconfig b/configs/grsim_defconfig
index b83abb6..94b1426 100644
--- a/configs/grsim_defconfig
+++ b/configs/grsim_defconfig
@@ -1,6 +1,7 @@
 CONFIG_SPARC=y
 CONFIG_TARGET_GRSIM=y
 CONFIG_SYS_TEXT_BASE=0x00000000
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_BOOTD is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/grsim_leon2_defconfig b/configs/grsim_leon2_defconfig
index 756a786..d7dc34a 100644
--- a/configs/grsim_leon2_defconfig
+++ b/configs/grsim_leon2_defconfig
@@ -1,6 +1,7 @@
 CONFIG_SPARC=y
 CONFIG_TARGET_GRSIM_LEON2=y
 CONFIG_SYS_TEXT_BASE=0x00000000
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_BOOTD is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/gt90h_v4_defconfig b/configs/gt90h_v4_defconfig
index 210b118..9ad51f3 100644
--- a/configs/gt90h_v4_defconfig
+++ b/configs/gt90h_v4_defconfig
@@ -17,6 +17,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-gt90h-v4"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/h2200_defconfig b/configs/h2200_defconfig
index d112cf1..dc8d77f 100644
--- a/configs/h2200_defconfig
+++ b/configs/h2200_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_H2200=y
 CONFIG_SYS_PROMPT="> "
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_BOOTD is not set
diff --git a/configs/haleakala_defconfig b/configs/haleakala_defconfig
index 81e3398..f099eec 100644
--- a/configs/haleakala_defconfig
+++ b/configs/haleakala_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_KILAUEA=y
 CONFIG_SYS_EXTRA_OPTIONS="HALEAKALA"
+CONFIG_BOOTDELAY=5
diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig
index e688756..f895a3e 100644
--- a/configs/harmony_defconfig
+++ b/configs/harmony_defconfig
@@ -5,6 +5,7 @@ CONFIG_TEGRA20=y
 CONFIG_TARGET_HARMONY=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-harmony"
 CONFIG_SYS_PROMPT="Tegra20 (Harmony) # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/highbank_defconfig b/configs/highbank_defconfig
index 29d251c..a2545fb 100644
--- a/configs/highbank_defconfig
+++ b/configs/highbank_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_HIGHBANK=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds...\nPress <s> to stop or <d> to delay\n"
 CONFIG_AUTOBOOT_KEYED_CTRLC=y
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/hikey_defconfig b/configs/hikey_defconfig
index 70aa708..4224cb3 100644
--- a/configs/hikey_defconfig
+++ b/configs/hikey_defconfig
@@ -1,3 +1,4 @@
 CONFIG_ARM=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/hrcon_defconfig b/configs/hrcon_defconfig
index 6b2b5d3..b4e0097 100644
--- a/configs/hrcon_defconfig
+++ b/configs/hrcon_defconfig
@@ -3,4 +3,5 @@ CONFIG_MPC83xx=y
 CONFIG_TARGET_HRCON=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/i12-tvbox_defconfig b/configs/i12-tvbox_defconfig
index 003b147..1567f19 100644
--- a/configs/i12-tvbox_defconfig
+++ b/configs/i12-tvbox_defconfig
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-i12-tvbox"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21)"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/iNet_3F_defconfig b/configs/iNet_3F_defconfig
index 5fd325a..fb39359 100644
--- a/configs/iNet_3F_defconfig
+++ b/configs/iNet_3F_defconfig
@@ -15,6 +15,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet-3f"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/iNet_3W_defconfig b/configs/iNet_3W_defconfig
index c7a4caf..b3d7c83 100644
--- a/configs/iNet_3W_defconfig
+++ b/configs/iNet_3W_defconfig
@@ -15,6 +15,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet-3w"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/iNet_86VS_defconfig b/configs/iNet_86VS_defconfig
index 3ac86d8..e34bcbf 100644
--- a/configs/iNet_86VS_defconfig
+++ b/configs/iNet_86VS_defconfig
@@ -14,6 +14,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-inet-86vs"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/icon_defconfig b/configs/icon_defconfig
index 771a093..57d2bbc 100644
--- a/configs/icon_defconfig
+++ b/configs/icon_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_ICON=y
+CONFIG_BOOTDELAY=5
diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig
index 59c3411..25cb638 100644
--- a/configs/igep0020_defconfig
+++ b/configs/igep0020_defconfig
@@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_IGEP00X0=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_ONENAND"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/igep0020_nand_defconfig b/configs/igep0020_nand_defconfig
index 7a14ada..8480d3f 100644
--- a/configs/igep0020_nand_defconfig
+++ b/configs/igep0020_nand_defconfig
@@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_IGEP00X0=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_NAND"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig
index e843ea7..1668774 100644
--- a/configs/igep0030_defconfig
+++ b/configs/igep0030_defconfig
@@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_IGEP00X0=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_ONENAND"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/igep0030_nand_defconfig b/configs/igep0030_nand_defconfig
index aceccc6..f0bacc5 100644
--- a/configs/igep0030_nand_defconfig
+++ b/configs/igep0030_nand_defconfig
@@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_IGEP00X0=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_NAND"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig
index c3f0fb8..27c546b 100644
--- a/configs/igep0032_defconfig
+++ b/configs/igep0032_defconfig
@@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_IGEP00X0=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0032,BOOT_ONENAND"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/inet1_defconfig b/configs/inet1_defconfig
index 053ed5d..a228991 100644
--- a/configs/inet1_defconfig
+++ b/configs/inet1_defconfig
@@ -15,6 +15,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet1"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/inet97fv2_defconfig b/configs/inet97fv2_defconfig
index 6d0a0ba..22d3a70 100644
--- a/configs/inet97fv2_defconfig
+++ b/configs/inet97fv2_defconfig
@@ -14,6 +14,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet97fv2"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/inet98v_rev2_defconfig b/configs/inet98v_rev2_defconfig
index cb4c79b..bdddfcf 100644
--- a/configs/inet98v_rev2_defconfig
+++ b/configs/inet98v_rev2_defconfig
@@ -16,6 +16,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-inet-98v-rev2"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/inet9f_rev03_defconfig b/configs/inet9f_rev03_defconfig
index e52e6cd..9b50348 100644
--- a/configs/inet9f_rev03_defconfig
+++ b/configs/inet9f_rev03_defconfig
@@ -14,6 +14,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet9f-rev03"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/integratorap_cm720t_defconfig b/configs/integratorap_cm720t_defconfig
index 5541f8e..458e882 100644
--- a/configs/integratorap_cm720t_defconfig
+++ b/configs/integratorap_cm720t_defconfig
@@ -3,4 +3,5 @@ CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_AP=y
 CONFIG_CM720T=y
 CONFIG_SYS_PROMPT="Integrator-AP # "
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/integratorap_cm920t_defconfig b/configs/integratorap_cm920t_defconfig
index de094b1..6b329c1 100644
--- a/configs/integratorap_cm920t_defconfig
+++ b/configs/integratorap_cm920t_defconfig
@@ -3,4 +3,5 @@ CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_AP=y
 CONFIG_CM920T=y
 CONFIG_SYS_PROMPT="Integrator-AP # "
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/integratorap_cm926ejs_defconfig b/configs/integratorap_cm926ejs_defconfig
index cf75425..96b8e77 100644
--- a/configs/integratorap_cm926ejs_defconfig
+++ b/configs/integratorap_cm926ejs_defconfig
@@ -3,4 +3,5 @@ CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_AP=y
 CONFIG_CM926EJ_S=y
 CONFIG_SYS_PROMPT="Integrator-AP # "
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/integratorap_cm946es_defconfig b/configs/integratorap_cm946es_defconfig
index cd1b1c3..e746dd0 100644
--- a/configs/integratorap_cm946es_defconfig
+++ b/configs/integratorap_cm946es_defconfig
@@ -3,4 +3,5 @@ CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_AP=y
 CONFIG_CM946ES=y
 CONFIG_SYS_PROMPT="Integrator-AP # "
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/integratorcp_cm1136_defconfig b/configs/integratorcp_cm1136_defconfig
index 292a0fb..a5f8e01 100644
--- a/configs/integratorcp_cm1136_defconfig
+++ b/configs/integratorcp_cm1136_defconfig
@@ -3,4 +3,5 @@ CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_CP=y
 CONFIG_CM1136=y
 CONFIG_SYS_PROMPT="Integrator-CP # "
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/integratorcp_cm920t_defconfig b/configs/integratorcp_cm920t_defconfig
index 20cd404..33cae7c 100644
--- a/configs/integratorcp_cm920t_defconfig
+++ b/configs/integratorcp_cm920t_defconfig
@@ -3,4 +3,5 @@ CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_CP=y
 CONFIG_CM920T=y
 CONFIG_SYS_PROMPT="Integrator-CP # "
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/integratorcp_cm926ejs_defconfig b/configs/integratorcp_cm926ejs_defconfig
index 1091be3..f6c8885 100644
--- a/configs/integratorcp_cm926ejs_defconfig
+++ b/configs/integratorcp_cm926ejs_defconfig
@@ -3,4 +3,5 @@ CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_CP=y
 CONFIG_CM926EJ_S=y
 CONFIG_SYS_PROMPT="Integrator-CP # "
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/integratorcp_cm946es_defconfig b/configs/integratorcp_cm946es_defconfig
index a4aeba4..f090fa0 100644
--- a/configs/integratorcp_cm946es_defconfig
+++ b/configs/integratorcp_cm946es_defconfig
@@ -3,4 +3,5 @@ CONFIG_ARCH_INTEGRATOR=y
 CONFIG_ARCH_INTEGRATOR_CP=y
 CONFIG_CM946ES=y
 CONFIG_SYS_PROMPT="Integrator-CP # "
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/intip_defconfig b/configs/intip_defconfig
index 898f544..e815c8f 100644
--- a/configs/intip_defconfig
+++ b/configs/intip_defconfig
@@ -4,3 +4,4 @@ CONFIG_TARGET_INTIP=y
 CONFIG_SYS_EXTRA_OPTIONS="INTIB"
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_BOOTDELAY=5
diff --git a/configs/io64_defconfig b/configs/io64_defconfig
index 52829da..1c06ba4 100644
--- a/configs/io64_defconfig
+++ b/configs/io64_defconfig
@@ -3,3 +3,4 @@ CONFIG_4xx=y
 CONFIG_TARGET_IO64=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_BOOTDELAY=5
diff --git a/configs/io_defconfig b/configs/io_defconfig
index 722d95a..d89a319 100644
--- a/configs/io_defconfig
+++ b/configs/io_defconfig
@@ -3,4 +3,5 @@ CONFIG_4xx=y
 CONFIG_TARGET_IO=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_NFS is not set
diff --git a/configs/iocon_defconfig b/configs/iocon_defconfig
index 89e5cf5..26826e8 100644
--- a/configs/iocon_defconfig
+++ b/configs/iocon_defconfig
@@ -3,4 +3,5 @@ CONFIG_4xx=y
 CONFIG_TARGET_IOCON=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_NFS is not set
diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig
index a353beb..b181264 100644
--- a/configs/ipam390_defconfig
+++ b/configs/ipam390_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_IPAM390=y
 CONFIG_SPL=y
 CONFIG_SYS_PROMPT="U-Boot > "
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ipek01_defconfig b/configs/ipek01_defconfig
index c8ddbc5..e8ee50c 100644
--- a/configs/ipek01_defconfig
+++ b/configs/ipek01_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_IPEK01=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/jesurun_q5_defconfig b/configs/jesurun_q5_defconfig
index 01900ee..2e024a2 100644
--- a/configs/jesurun_q5_defconfig
+++ b/configs/jesurun_q5_defconfig
@@ -8,6 +8,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-jesurun-q5"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(19)"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index 303aeeb..3842480 100644
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -5,6 +5,7 @@ CONFIG_TEGRA124=y
 CONFIG_TARGET_JETSON_TK1=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra124-jetson-tk1"
 CONFIG_SYS_PROMPT="Tegra124 (Jetson TK1) # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/jupiter_defconfig b/configs/jupiter_defconfig
index a3c259f..9b56b12 100644
--- a/configs/jupiter_defconfig
+++ b/configs/jupiter_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_JUPITER=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/katmai_defconfig b/configs/katmai_defconfig
index 8492314..3ff78aa 100644
--- a/configs/katmai_defconfig
+++ b/configs/katmai_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_KATMAI=y
+CONFIG_BOOTDELAY=5
diff --git a/configs/kilauea_defconfig b/configs/kilauea_defconfig
index 0054cc6..2829778 100644
--- a/configs/kilauea_defconfig
+++ b/configs/kilauea_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_KILAUEA=y
 CONFIG_SYS_EXTRA_OPTIONS="KILAUEA"
+CONFIG_BOOTDELAY=5
diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig
index b903f6e..81f4f1c 100644
--- a/configs/km_kirkwood_128m16_defconfig
+++ b/configs/km_kirkwood_128m16_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_128M16"
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig
index 7fc1112..f85ad6e 100644
--- a/configs/km_kirkwood_defconfig
+++ b/configs/km_kirkwood_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD"
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig
index a310fb7..764f970 100644
--- a/configs/km_kirkwood_pci_defconfig
+++ b/configs/km_kirkwood_pci_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_PCI"
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/kmcoge4_defconfig b/configs/kmcoge4_defconfig
index 519b39d..1213617 100644
--- a/configs/kmcoge4_defconfig
+++ b/configs/kmcoge4_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_KMP204X=y
 CONFIG_SYS_EXTRA_OPTIONS="KMCOGE4"
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig
index a8b5275..1ef0ef0 100644
--- a/configs/kmcoge5ne_defconfig
+++ b/configs/kmcoge5ne_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_KM8360=y
 CONFIG_SYS_EXTRA_OPTIONS="KMCOGE5NE"
+CONFIG_BOOTDELAY=2
diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig
index 95c61f1..4b3bfb5 100644
--- a/configs/kmcoge5un_defconfig
+++ b/configs/kmcoge5un_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_COGE5UN"
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig
index 3374ab0..3aa37c9 100644
--- a/configs/kmeter1_defconfig
+++ b/configs/kmeter1_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_KM8360=y
 CONFIG_SYS_EXTRA_OPTIONS="KMETER1"
+CONFIG_BOOTDELAY=2
diff --git a/configs/kmlion1_defconfig b/configs/kmlion1_defconfig
index f948b2b..6d7f6df 100644
--- a/configs/kmlion1_defconfig
+++ b/configs/kmlion1_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_KMP204X=y
 CONFIG_SYS_EXTRA_OPTIONS="KMLION1"
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig
index 158fe39..73aa147 100644
--- a/configs/kmnusa_defconfig
+++ b/configs/kmnusa_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_NUSA"
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig
index 11c53b5..5728252 100644
--- a/configs/kmopti2_defconfig
+++ b/configs/kmopti2_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_TUXX1=y
 CONFIG_SYS_EXTRA_OPTIONS="KMOPTI2"
+CONFIG_BOOTDELAY=2
diff --git a/configs/kmsugp1_defconfig b/configs/kmsugp1_defconfig
index d754ac0..bcbe995 100644
--- a/configs/kmsugp1_defconfig
+++ b/configs/kmsugp1_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_SUGP1"
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig
index fd4bb9a..763634f 100644
--- a/configs/kmsupx5_defconfig
+++ b/configs/kmsupx5_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_TUXX1=y
 CONFIG_SYS_EXTRA_OPTIONS="KMSUPX5"
+CONFIG_BOOTDELAY=2
diff --git a/configs/kmsuv31_defconfig b/configs/kmsuv31_defconfig
index 5f56925..8776dc5 100644
--- a/configs/kmsuv31_defconfig
+++ b/configs/kmsuv31_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_SUV31"
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/kmvect1_defconfig b/configs/kmvect1_defconfig
index 512d12c..b3b18da 100644
--- a/configs/kmvect1_defconfig
+++ b/configs/kmvect1_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_SUVD3=y
 CONFIG_SYS_EXTRA_OPTIONS="KMVECT1"
+CONFIG_BOOTDELAY=2
diff --git a/configs/kwb_defconfig b/configs/kwb_defconfig
index 9caa7bf..4628865 100644
--- a/configs/kwb_defconfig
+++ b/configs/kwb_defconfig
@@ -3,6 +3,7 @@ CONFIG_TARGET_KWB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
 CONFIG_SYS_PROMPT="U-Boot (BuR V2.0)# "
+CONFIG_BOOTDELAY=0
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
index 1546ca5..9b0893e 100644
--- a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
+++ b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021AQDS=y
 CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
diff --git a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
index 750dafa..2c314cb 100644
--- a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
+++ b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS1021ATWR=y
 CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
+CONFIG_BOOTDELAY=0
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
diff --git a/configs/ls2085a_emu_defconfig b/configs/ls2085a_emu_defconfig
index 9c82e17..f3cb094 100644
--- a/configs/ls2085a_emu_defconfig
+++ b/configs/ls2085a_emu_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS2085A_EMU=y
 CONFIG_SYS_EXTRA_OPTIONS="EMU,SYS_FSL_DDR4"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
diff --git a/configs/ls2085a_simu_defconfig b/configs/ls2085a_simu_defconfig
index de9776d..3073a06 100644
--- a/configs/ls2085a_simu_defconfig
+++ b/configs/ls2085a_simu_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_LS2085A_SIMU=y
 CONFIG_SYS_EXTRA_OPTIONS="SIMU"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
diff --git a/configs/ls2085aqds_defconfig b/configs/ls2085aqds_defconfig
index 0c770e4..5019543 100644
--- a/configs/ls2085aqds_defconfig
+++ b/configs/ls2085aqds_defconfig
@@ -5,6 +5,7 @@ CONFIG_DM_SPI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2085a-qds"
 CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_DM=y
diff --git a/configs/ls2085aqds_nand_defconfig b/configs/ls2085aqds_nand_defconfig
index 10eda97..9a7be6b 100644
--- a/configs/ls2085aqds_nand_defconfig
+++ b/configs/ls2085aqds_nand_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_TARGET_LS2085AQDS=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,NAND"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/ls2085ardb_defconfig b/configs/ls2085ardb_defconfig
index 7956533..bf4fd3b 100644
--- a/configs/ls2085ardb_defconfig
+++ b/configs/ls2085ardb_defconfig
@@ -5,6 +5,7 @@ CONFIG_DM_SPI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2085a-rdb"
 CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_DM=y
diff --git a/configs/ls2085ardb_nand_defconfig b/configs/ls2085ardb_nand_defconfig
index 96a0dfd..3369a13 100644
--- a/configs/ls2085ardb_nand_defconfig
+++ b/configs/ls2085ardb_nand_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_TARGET_LS2085ARDB=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,NAND"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
diff --git a/configs/luan_defconfig b/configs/luan_defconfig
index d42b4a9..063f008 100644
--- a/configs/luan_defconfig
+++ b/configs/luan_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_LUAN=y
+CONFIG_BOOTDELAY=5
diff --git a/configs/makalu_defconfig b/configs/makalu_defconfig
index ed9b82d..0bf5e9b 100644
--- a/configs/makalu_defconfig
+++ b/configs/makalu_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_MAKALU=y
+CONFIG_BOOTDELAY=5
diff --git a/configs/marsboard_defconfig b/configs/marsboard_defconfig
index 2c90d36..5fc84ae 100644
--- a/configs/marsboard_defconfig
+++ b/configs/marsboard_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_EMBESTMX6BOARDS=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,ENV_IS_IN_SPI_FLASH"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/mecp5123_defconfig b/configs/mecp5123_defconfig
index 1957f0b..b8d6b7f 100644
--- a/configs/mecp5123_defconfig
+++ b/configs/mecp5123_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC512X=y
 CONFIG_TARGET_MECP5123=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/medcom-wide_defconfig b/configs/medcom-wide_defconfig
index 49e9c06..13554e3 100644
--- a/configs/medcom-wide_defconfig
+++ b/configs/medcom-wide_defconfig
@@ -5,6 +5,7 @@ CONFIG_TEGRA20=y
 CONFIG_TARGET_MEDCOM_WIDE=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-medcom-wide"
 CONFIG_SYS_PROMPT="Tegra20 (Medcom-Wide) # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/mgcoge3ne_defconfig b/configs/mgcoge3ne_defconfig
index 7b795f5..4b59f64 100644
--- a/configs/mgcoge3ne_defconfig
+++ b/configs/mgcoge3ne_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC8260=y
 CONFIG_TARGET_KM82XX=y
 CONFIG_SYS_EXTRA_OPTIONS="MGCOGE3NE"
+CONFIG_BOOTDELAY=2
diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig
index cd5f358..06e32a7 100644
--- a/configs/mgcoge3un_defconfig
+++ b/configs/mgcoge3un_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_MGCOGE3UN"
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/mgcoge_defconfig b/configs/mgcoge_defconfig
index 1fb8dfd..2875e19 100644
--- a/configs/mgcoge_defconfig
+++ b/configs/mgcoge_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC8260=y
 CONFIG_TARGET_KM82XX=y
 CONFIG_SYS_EXTRA_OPTIONS="MGCOGE"
+CONFIG_BOOTDELAY=2
diff --git a/configs/mixtile_loftq_defconfig b/configs/mixtile_loftq_defconfig
index c78053c..97ed63a 100644
--- a/configs/mixtile_loftq_defconfig
+++ b/configs/mixtile_loftq_defconfig
@@ -9,6 +9,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-mixtile-loftq"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPA(21)"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/mk802_a10s_defconfig b/configs/mk802_a10s_defconfig
index 404193d..30486d6 100644
--- a/configs/mk802_a10s_defconfig
+++ b/configs/mk802_a10s_defconfig
@@ -8,6 +8,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-mk802"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/mk802_defconfig b/configs/mk802_defconfig
index 98d9599..3c4114a 100644
--- a/configs/mk802_defconfig
+++ b/configs/mk802_defconfig
@@ -6,6 +6,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mk802"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/mk802ii_defconfig b/configs/mk802ii_defconfig
index bc5feb7..fc79e8b 100644
--- a/configs/mk802ii_defconfig
+++ b/configs/mk802ii_defconfig
@@ -5,6 +5,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mk802ii"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/ml507_defconfig b/configs/ml507_defconfig
index d1e4e30..ffb583c 100644
--- a/configs/ml507_defconfig
+++ b/configs/ml507_defconfig
@@ -3,6 +3,7 @@ CONFIG_4xx=y
 CONFIG_TARGET_ML507=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000,BOOT_FROM_XMD=1,INIT_TLB=board/xilinx/ppc440-generic/init.o"
 CONFIG_SYS_PROMPT="ml507:/# "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
diff --git a/configs/ml507_flash_defconfig b/configs/ml507_flash_defconfig
index 442e0ce..8d3ab3b 100644
--- a/configs/ml507_flash_defconfig
+++ b/configs/ml507_flash_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_ML507=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC,INIT_TLB=board/xilinx/ppc440-generic/init.o"
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
diff --git a/configs/motionpro_defconfig b/configs/motionpro_defconfig
index 4d3f909..270c0c1 100644
--- a/configs/motionpro_defconfig
+++ b/configs/motionpro_defconfig
@@ -4,4 +4,5 @@ CONFIG_TARGET_MOTIONPRO=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
 CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/mpc5121ads_defconfig b/configs/mpc5121ads_defconfig
index e5fe27f..96963ba 100644
--- a/configs/mpc5121ads_defconfig
+++ b/configs/mpc5121ads_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC512X=y
 CONFIG_TARGET_MPC5121ADS=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/mpc5121ads_rev2_defconfig b/configs/mpc5121ads_rev2_defconfig
index 3562353..584460d 100644
--- a/configs/mpc5121ads_rev2_defconfig
+++ b/configs/mpc5121ads_rev2_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC512X=y
 CONFIG_TARGET_MPC5121ADS=y
 CONFIG_SYS_EXTRA_OPTIONS="MPC5121ADS_REV2"
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/mpc8308_p1m_defconfig b/configs/mpc8308_p1m_defconfig
index 8c67eab..de059c2 100644
--- a/configs/mpc8308_p1m_defconfig
+++ b/configs/mpc8308_p1m_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_MPC8308_P1M=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig
index 27f2ecd..4de1b2f 100644
--- a/configs/mt_ventoux_defconfig
+++ b/configs/mt_ventoux_defconfig
@@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_MT_VENTOUX=y
 CONFIG_SPL=y
 CONFIG_SYS_PROMPT="mt_ventoux => "
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/munices_defconfig b/configs/munices_defconfig
index 1c0309a..9b21c67 100644
--- a/configs/munices_defconfig
+++ b/configs/munices_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
 CONFIG_TARGET_MUNICES=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/neo_defconfig b/configs/neo_defconfig
index 77eefe9..9428504 100644
--- a/configs/neo_defconfig
+++ b/configs/neo_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_NEO=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_NFS is not set
diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
index b3d9682..4c98578 100644
--- a/configs/nokia_rx51_defconfig
+++ b/configs/nokia_rx51_defconfig
@@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_NOKIA_RX51=y
 CONFIG_SYS_PROMPT="Nokia RX-51 # "
 CONFIG_AUTOBOOT_KEYED=y
+CONFIG_BOOTDELAY=30
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SAVEENV is not set
diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig
index 1ad862c..cee7f1e 100644
--- a/configs/nyan-big_defconfig
+++ b/configs/nyan-big_defconfig
@@ -5,6 +5,7 @@ CONFIG_TEGRA124=y
 CONFIG_TARGET_NYAN_BIG=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra124-nyan-big"
 CONFIG_SYS_PROMPT="Tegra124 (Nyan-big) # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/ocotea_defconfig b/configs/ocotea_defconfig
index 34518cd..c53f4b2 100644
--- a/configs/ocotea_defconfig
+++ b/configs/ocotea_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_OCOTEA=y
+CONFIG_BOOTDELAY=5
diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig
index 64416b4..64be843 100644
--- a/configs/odroid-xu3_defconfig
+++ b/configs/odroid-xu3_defconfig
@@ -5,6 +5,7 @@ CONFIG_DM_I2C=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5422-odroidxu3"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SYS_PROMPT="ODROID-XU3 # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
index ecfd20c..3feb687 100644
--- a/configs/odroid_defconfig
+++ b/configs/odroid_defconfig
@@ -5,6 +5,7 @@ CONFIG_DM_I2C=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SYS_PROMPT="Odroid # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
diff --git a/configs/omap3_evm_quick_mmc_defconfig b/configs/omap3_evm_quick_mmc_defconfig
index 1b6aa7c..b93a9ca 100644
--- a/configs/omap3_evm_quick_mmc_defconfig
+++ b/configs/omap3_evm_quick_mmc_defconfig
@@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_EVM_QUICK_MMC=y
 CONFIG_SPL=y
 CONFIG_SYS_PROMPT="OMAP3_EVM # "
+CONFIG_BOOTDELAY=0
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_BOOTD is not set
diff --git a/configs/omap3_evm_quick_nand_defconfig b/configs/omap3_evm_quick_nand_defconfig
index 48c2bb1..79db5de 100644
--- a/configs/omap3_evm_quick_nand_defconfig
+++ b/configs/omap3_evm_quick_nand_defconfig
@@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_EVM_QUICK_NAND=y
 CONFIG_SPL=y
 CONFIG_SYS_PROMPT="OMAP3_EVM # "
+CONFIG_BOOTDELAY=0
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_BOOTD is not set
diff --git a/configs/origen_defconfig b/configs/origen_defconfig
index 1c0c8fa..b5a22f2 100644
--- a/configs/origen_defconfig
+++ b/configs/origen_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_ORIGEN=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos4210-origen"
 CONFIG_SPL=y
 CONFIG_SYS_PROMPT="ORIGEN # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
diff --git a/configs/p2371-0000_defconfig b/configs/p2371-0000_defconfig
index 136f6c5..587b0d8 100644
--- a/configs/p2371-0000_defconfig
+++ b/configs/p2371-0000_defconfig
@@ -4,6 +4,7 @@ CONFIG_TEGRA210=y
 CONFIG_TARGET_P2371_0000=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-0000"
 CONFIG_SYS_PROMPT="Tegra210 (P2371-0000) # "
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig
index 8cd2fcc..90aad5e 100644
--- a/configs/p2371-2180_defconfig
+++ b/configs/p2371-2180_defconfig
@@ -4,6 +4,7 @@ CONFIG_TEGRA210=y
 CONFIG_TARGET_P2371_2180=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2371-2180"
 CONFIG_SYS_PROMPT="Tegra210 (P2371-2180) # "
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig
index 5a592e9..d879d33 100644
--- a/configs/p2571_defconfig
+++ b/configs/p2571_defconfig
@@ -4,6 +4,7 @@ CONFIG_TEGRA210=y
 CONFIG_TARGET_P2571=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2571"
 CONFIG_SYS_PROMPT="Tegra210 (P2571) # "
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig
index 4d066a0..b90ad20 100644
--- a/configs/paz00_defconfig
+++ b/configs/paz00_defconfig
@@ -5,6 +5,7 @@ CONFIG_TEGRA20=y
 CONFIG_TARGET_PAZ00=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-paz00"
 CONFIG_SYS_PROMPT="Tegra20 (Paz00) MOD # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/pb1000_defconfig b/configs/pb1000_defconfig
index f24cd07..41515db 100644
--- a/configs/pb1000_defconfig
+++ b/configs/pb1000_defconfig
@@ -2,6 +2,7 @@ CONFIG_MIPS=y
 CONFIG_TARGET_PB1X00=y
 CONFIG_SYS_EXTRA_OPTIONS="PB1000"
 CONFIG_SYS_PROMPT="Pb1x00 # "
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_SAVEENV is not set
diff --git a/configs/pdm360ng_defconfig b/configs/pdm360ng_defconfig
index 3997f59..7a74c3a 100644
--- a/configs/pdm360ng_defconfig
+++ b/configs/pdm360ng_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC512X=y
 CONFIG_TARGET_PDM360NG=y
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig
index ce3ac22..4a280cd 100644
--- a/configs/peach-pi_defconfig
+++ b/configs/peach-pi_defconfig
@@ -5,6 +5,7 @@ CONFIG_DM_I2C=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5800-peach-pi"
 CONFIG_SPL=y
 CONFIG_SYS_PROMPT="Peach-Pi # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig
index 9ee81bb..b148d33 100644
--- a/configs/peach-pit_defconfig
+++ b/configs/peach-pit_defconfig
@@ -5,6 +5,7 @@ CONFIG_DM_I2C=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5420-peach-pit"
 CONFIG_SPL=y
 CONFIG_SYS_PROMPT="Peach-Pit # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/plutux_defconfig b/configs/plutux_defconfig
index 7ee2ea2..79dd180 100644
--- a/configs/plutux_defconfig
+++ b/configs/plutux_defconfig
@@ -5,6 +5,7 @@ CONFIG_TEGRA20=y
 CONFIG_TARGET_PLUTUX=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-plutux"
 CONFIG_SYS_PROMPT="Tegra20 (Plutux) # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/portl2_defconfig b/configs/portl2_defconfig
index 3ff9ebb..343d349 100644
--- a/configs/portl2_defconfig
+++ b/configs/portl2_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
 CONFIG_SYS_EXTRA_OPTIONS="KM_PORTL2"
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_SPI_FLASH=y
diff --git a/configs/pov_protab2_ips9_defconfig b/configs/pov_protab2_ips9_defconfig
index 241a084..90b2ed7 100644
--- a/configs/pov_protab2_ips9_defconfig
+++ b/configs/pov_protab2_ips9_defconfig
@@ -15,6 +15,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-pov-protab2-ips9"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/pr1_defconfig b/configs/pr1_defconfig
index 03a3286..09a1ca0 100644
--- a/configs/pr1_defconfig
+++ b/configs/pr1_defconfig
@@ -1,6 +1,7 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_PR1=y
 CONFIG_SYS_PROMPT="pr1>"
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/q8_a13_tablet_defconfig b/configs/q8_a13_tablet_defconfig
index 519fdf3..83263ff 100644
--- a/configs/q8_a13_tablet_defconfig
+++ b/configs/q8_a13_tablet_defconfig
@@ -16,6 +16,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-q8-tablet"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/q8_a23_tablet_800x480_defconfig b/configs/q8_a23_tablet_800x480_defconfig
index a971433..4c2a660 100644
--- a/configs/q8_a23_tablet_800x480_defconfig
+++ b/configs/q8_a23_tablet_800x480_defconfig
@@ -17,6 +17,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-q8-tablet"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/q8_a33_tablet_1024x600_defconfig b/configs/q8_a33_tablet_1024x600_defconfig
index f5c696f..ba923f9 100644
--- a/configs/q8_a33_tablet_1024x600_defconfig
+++ b/configs/q8_a33_tablet_1024x600_defconfig
@@ -17,6 +17,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-q8-tablet"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/q8_a33_tablet_800x480_defconfig b/configs/q8_a33_tablet_800x480_defconfig
index fb29c6a..8705a7c 100644
--- a/configs/q8_a33_tablet_800x480_defconfig
+++ b/configs/q8_a33_tablet_800x480_defconfig
@@ -17,6 +17,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-q8-tablet"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/qemu_mips64_defconfig b/configs/qemu_mips64_defconfig
index 4187430..a67c6e7 100644
--- a/configs/qemu_mips64_defconfig
+++ b/configs/qemu_mips64_defconfig
@@ -1,6 +1,7 @@
 CONFIG_MIPS=y
 CONFIG_TARGET_QEMU_MIPS=y
 CONFIG_CPU_MIPS64_R1=y
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/qemu_mips64el_defconfig b/configs/qemu_mips64el_defconfig
index c8bcbb7..7130757 100644
--- a/configs/qemu_mips64el_defconfig
+++ b/configs/qemu_mips64el_defconfig
@@ -2,6 +2,7 @@ CONFIG_MIPS=y
 CONFIG_TARGET_QEMU_MIPS=y
 CONFIG_SYS_LITTLE_ENDIAN=y
 CONFIG_CPU_MIPS64_R1=y
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/qemu_mips_defconfig b/configs/qemu_mips_defconfig
index 337ecea..4d36447 100644
--- a/configs/qemu_mips_defconfig
+++ b/configs/qemu_mips_defconfig
@@ -1,5 +1,6 @@
 CONFIG_MIPS=y
 CONFIG_TARGET_QEMU_MIPS=y
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/qemu_mipsel_defconfig b/configs/qemu_mipsel_defconfig
index bfb3bcc..c9b4818 100644
--- a/configs/qemu_mipsel_defconfig
+++ b/configs/qemu_mipsel_defconfig
@@ -1,6 +1,7 @@
 CONFIG_MIPS=y
 CONFIG_TARGET_QEMU_MIPS=y
 CONFIG_SYS_LITTLE_ENDIAN=y
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/r7-tv-dongle_defconfig b/configs/r7-tv-dongle_defconfig
index 4353353..ab26e27 100644
--- a/configs/r7-tv-dongle_defconfig
+++ b/configs/r7-tv-dongle_defconfig
@@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-r7-tv-dongle"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/rainier_defconfig b/configs/rainier_defconfig
index 1713592..d096dc7 100644
--- a/configs/rainier_defconfig
+++ b/configs/rainier_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_SEQUOIA=y
 CONFIG_SYS_EXTRA_OPTIONS="RAINIER"
+CONFIG_BOOTDELAY=5
diff --git a/configs/rainier_ramboot_defconfig b/configs/rainier_ramboot_defconfig
index ba22d9d..e6f358d 100644
--- a/configs/rainier_ramboot_defconfig
+++ b/configs/rainier_ramboot_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_SEQUOIA=y
 CONFIG_SYS_EXTRA_OPTIONS="RAINIER,SYS_RAMBOOT,SYS_TEXT_BASE=0x01000000,SYS_LDSCRIPT=board/amcc/sequoia/u-boot-ram.lds"
+CONFIG_BOOTDELAY=5
diff --git a/configs/redwood_defconfig b/configs/redwood_defconfig
index ad87d0e..6d7677d 100644
--- a/configs/redwood_defconfig
+++ b/configs/redwood_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_REDWOOD=y
+CONFIG_BOOTDELAY=5
diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig
index a75a726..e0cd01e 100644
--- a/configs/riotboard_defconfig
+++ b/configs/riotboard_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_EMBESTMX6BOARDS=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024,ENV_IS_IN_MMC"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
index c59c64d..3a27640 100644
--- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_BCM283X=y
 CONFIG_TARGET_RPI_2=y
 CONFIG_SYS_PROMPT="U-Boot> "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index bcba148..3814860 100644
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_BCM283X=y
 CONFIG_TARGET_RPI=y
 CONFIG_SYS_PROMPT="U-Boot> "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig
index 55ee836..ade053c 100644
--- a/configs/s5pc210_universal_defconfig
+++ b/configs/s5pc210_universal_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_S5PC210_UNIVERSAL=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos4210-universal_c210"
 CONFIG_SYS_PROMPT="Universal # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index b3a0bfe..d63705a 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -3,6 +3,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sandbox"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/sbc8349_PCI_33_defconfig b/configs/sbc8349_PCI_33_defconfig
index c03a807..f206986 100644
--- a/configs/sbc8349_PCI_33_defconfig
+++ b/configs/sbc8349_PCI_33_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_SBC8349=y
 CONFIG_SYS_EXTRA_OPTIONS="PCI,PCI_33M"
+CONFIG_BOOTDELAY=6
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/sbc8349_PCI_66_defconfig b/configs/sbc8349_PCI_66_defconfig
index 030c2d6..8778aff 100644
--- a/configs/sbc8349_PCI_66_defconfig
+++ b/configs/sbc8349_PCI_66_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_SBC8349=y
 CONFIG_SYS_EXTRA_OPTIONS="PCI,PCI_66M"
+CONFIG_BOOTDELAY=6
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/sbc8349_defconfig b/configs/sbc8349_defconfig
index 01392aa..031fd16 100644
--- a/configs/sbc8349_defconfig
+++ b/configs/sbc8349_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_SBC8349=y
+CONFIG_BOOTDELAY=6
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/sbc8548_PCI_33_PCIE_defconfig b/configs/sbc8548_PCI_33_PCIE_defconfig
index b6e8766..624da66 100644
--- a/configs/sbc8548_PCI_33_PCIE_defconfig
+++ b/configs/sbc8548_PCI_33_PCIE_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_SBC8548=y
 CONFIG_SYS_EXTRA_OPTIONS="PCI,33,PCIE"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/sbc8548_PCI_33_defconfig b/configs/sbc8548_PCI_33_defconfig
index f3c4ced..35d0d90 100644
--- a/configs/sbc8548_PCI_33_defconfig
+++ b/configs/sbc8548_PCI_33_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_SBC8548=y
 CONFIG_SYS_EXTRA_OPTIONS="PCI,33"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/sbc8548_PCI_66_PCIE_defconfig b/configs/sbc8548_PCI_66_PCIE_defconfig
index bb0ad95..260aa0a 100644
--- a/configs/sbc8548_PCI_66_PCIE_defconfig
+++ b/configs/sbc8548_PCI_66_PCIE_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_SBC8548=y
 CONFIG_SYS_EXTRA_OPTIONS="PCI,66,PCIE"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/sbc8548_PCI_66_defconfig b/configs/sbc8548_PCI_66_defconfig
index d601416..86a8b16 100644
--- a/configs/sbc8548_PCI_66_defconfig
+++ b/configs/sbc8548_PCI_66_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_SBC8548=y
 CONFIG_SYS_EXTRA_OPTIONS="PCI,66"
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/sbc8548_defconfig b/configs/sbc8548_defconfig
index 3e3b507..1321da2 100644
--- a/configs/sbc8548_defconfig
+++ b/configs/sbc8548_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_SBC8548=y
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/sbc8641d_defconfig b/configs/sbc8641d_defconfig
index b67c7c0..b9d3880 100644
--- a/configs/sbc8641d_defconfig
+++ b/configs/sbc8641d_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC86xx=y
 CONFIG_TARGET_SBC8641D=y
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index e9418cb..fba90e1 100644
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -5,6 +5,7 @@ CONFIG_TEGRA20=y
 CONFIG_TARGET_SEABOARD=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-seaboard"
 CONFIG_SYS_PROMPT="Tegra20 (SeaBoard) # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/sequoia_defconfig b/configs/sequoia_defconfig
index bbaec61..c05a1ef 100644
--- a/configs/sequoia_defconfig
+++ b/configs/sequoia_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_SEQUOIA=y
 CONFIG_SYS_EXTRA_OPTIONS="SEQUOIA"
+CONFIG_BOOTDELAY=5
diff --git a/configs/sequoia_ramboot_defconfig b/configs/sequoia_ramboot_defconfig
index 5b2c6f4..f6a3822 100644
--- a/configs/sequoia_ramboot_defconfig
+++ b/configs/sequoia_ramboot_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_SEQUOIA=y
 CONFIG_SYS_EXTRA_OPTIONS="SEQUOIA,SYS_RAMBOOT,SYS_TEXT_BASE=0x01000000,SYS_LDSCRIPT=board/amcc/sequoia/u-boot-ram.lds"
+CONFIG_BOOTDELAY=5
diff --git a/configs/smdk2410_defconfig b/configs/smdk2410_defconfig
index bb80d55..6bbef09 100644
--- a/configs/smdk2410_defconfig
+++ b/configs/smdk2410_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SMDK2410=y
 CONFIG_SYS_PROMPT="SMDK2410 # "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index 601622f..f31d7a1 100644
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -5,6 +5,7 @@ CONFIG_DM_I2C=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250"
 CONFIG_SPL=y
 CONFIG_SYS_PROMPT="SMDK5250 # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig
index 4cfd3cd..daa94dd 100644
--- a/configs/smdk5420_defconfig
+++ b/configs/smdk5420_defconfig
@@ -5,6 +5,7 @@ CONFIG_DM_I2C=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5420-smdk5420"
 CONFIG_SPL=y
 CONFIG_SYS_PROMPT="SMDK5420 # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/smdkv310_defconfig b/configs/smdkv310_defconfig
index 9f612c9..f03b802 100644
--- a/configs/smdkv310_defconfig
+++ b/configs/smdkv310_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_SMDKV310=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos4210-smdkv310"
 CONFIG_SPL=y
 CONFIG_SYS_PROMPT="SMDKV310 # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index e3d9fc1..9d40240 100644
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -5,6 +5,7 @@ CONFIG_DM_I2C=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-snow"
 CONFIG_SPL=y
 CONFIG_SYS_PROMPT="snow # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/spring_defconfig b/configs/spring_defconfig
index 563ba9f..8a623a7 100644
--- a/configs/spring_defconfig
+++ b/configs/spring_defconfig
@@ -5,6 +5,7 @@ CONFIG_DM_I2C=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos5250-spring"
 CONFIG_SPL=y
 CONFIG_SYS_PROMPT="spring # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/sunxi_Gemei_G9_defconfig b/configs/sunxi_Gemei_G9_defconfig
index f28d709..98299ad 100644
--- a/configs/sunxi_Gemei_G9_defconfig
+++ b/configs/sunxi_Gemei_G9_defconfig
@@ -12,6 +12,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-gemei-g9"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig
index e477b0e..7d005af 100644
--- a/configs/suvd3_defconfig
+++ b/configs/suvd3_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_SUVD3=y
 CONFIG_SYS_EXTRA_OPTIONS="SUVD3"
+CONFIG_BOOTDELAY=2
diff --git a/configs/sycamore_defconfig b/configs/sycamore_defconfig
index 844e67f..b55b079 100644
--- a/configs/sycamore_defconfig
+++ b/configs/sycamore_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_WALNUT=y
+CONFIG_BOOTDELAY=5
diff --git a/configs/t3corp_defconfig b/configs/t3corp_defconfig
index c61508a..6cad36a 100644
--- a/configs/t3corp_defconfig
+++ b/configs/t3corp_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_T3CORP=y
+CONFIG_BOOTDELAY=5
diff --git a/configs/taihu_defconfig b/configs/taihu_defconfig
index ac83725..2a2eb7b 100644
--- a/configs/taihu_defconfig
+++ b/configs/taihu_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_TAIHU=y
+CONFIG_BOOTDELAY=5
diff --git a/configs/taishan_defconfig b/configs/taishan_defconfig
index e956c6f..f8052c1 100644
--- a/configs/taishan_defconfig
+++ b/configs/taishan_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_TAISHAN=y
+CONFIG_BOOTDELAY=5
diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig
index 0385d31..8f4e08a 100644
--- a/configs/tec-ng_defconfig
+++ b/configs/tec-ng_defconfig
@@ -5,6 +5,7 @@ CONFIG_TEGRA30=y
 CONFIG_TARGET_TEC_NG=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-tec-ng"
 CONFIG_SYS_PROMPT="Tegra30 (TEC-NG) # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/tec_defconfig b/configs/tec_defconfig
index b4f5c3d..9aee0bf 100644
--- a/configs/tec_defconfig
+++ b/configs/tec_defconfig
@@ -5,6 +5,7 @@ CONFIG_TEGRA20=y
 CONFIG_TARGET_TEC=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-tec"
 CONFIG_SYS_PROMPT="Tegra20 (TEC) # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig
index 969ba86..5355eda 100644
--- a/configs/trats2_defconfig
+++ b/configs/trats2_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_TRATS2=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos4412-trats2"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SYS_PROMPT="Trats2 # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
diff --git a/configs/trats_defconfig b/configs/trats_defconfig
index 7d0f59e..aadb086 100644
--- a/configs/trats_defconfig
+++ b/configs/trats_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_TRATS=y
 CONFIG_DEFAULT_DEVICE_TREE="exynos4210-trats"
 CONFIG_SYS_PROMPT="Trats # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig
index bc30837..6d49d19 100644
--- a/configs/tricorder_defconfig
+++ b/configs/tricorder_defconfig
@@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_TRICORDER=y
 CONFIG_SPL=y
 CONFIG_SYS_PROMPT="OMAP3 Tricorder # "
+CONFIG_BOOTDELAY=0
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/tricorder_flash_defconfig b/configs/tricorder_flash_defconfig
index 4619fc9..ecfbc14 100644
--- a/configs/tricorder_flash_defconfig
+++ b/configs/tricorder_flash_defconfig
@@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_TRICORDER=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="FLASHCARD"
+CONFIG_BOOTDELAY=0
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig
index 482806f..8e6c4a0 100644
--- a/configs/trimslice_defconfig
+++ b/configs/trimslice_defconfig
@@ -5,6 +5,7 @@ CONFIG_TEGRA20=y
 CONFIG_TARGET_TRIMSLICE=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-trimslice"
 CONFIG_SYS_PROMPT="Tegra20 (TrimSlice) # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/tseries_mmc_defconfig b/configs/tseries_mmc_defconfig
index 61808f2..0dad250 100644
--- a/configs/tseries_mmc_defconfig
+++ b/configs/tseries_mmc_defconfig
@@ -3,6 +3,7 @@ CONFIG_TARGET_TSERIES=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT"
 CONFIG_SYS_PROMPT="U-Boot (BuR V2.0)# "
+CONFIG_BOOTDELAY=0
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/tseries_nand_defconfig b/configs/tseries_nand_defconfig
index c7fee15..86211b9 100644
--- a/configs/tseries_nand_defconfig
+++ b/configs/tseries_nand_defconfig
@@ -3,6 +3,7 @@ CONFIG_TARGET_TSERIES=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND"
 CONFIG_SYS_PROMPT="U-Boot (BuR V2.0)# "
+CONFIG_BOOTDELAY=0
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/tseries_spi_defconfig b/configs/tseries_spi_defconfig
index cb379b8..fa2b6f8 100644
--- a/configs/tseries_spi_defconfig
+++ b/configs/tseries_spi_defconfig
@@ -3,6 +3,7 @@ CONFIG_TARGET_TSERIES=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,SPI_BOOT,EMMC_BOOT"
 CONFIG_SYS_PROMPT="U-Boot (BuR V2.0)# "
+CONFIG_BOOTDELAY=0
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig
index d4a422c..ad28b9a 100644
--- a/configs/tuge1_defconfig
+++ b/configs/tuge1_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_TUXX1=y
 CONFIG_SYS_EXTRA_OPTIONS="TUGE1"
+CONFIG_BOOTDELAY=2
diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig
index c8db21a..7ecb615 100644
--- a/configs/tuxx1_defconfig
+++ b/configs/tuxx1_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_TUXX1=y
 CONFIG_SYS_EXTRA_OPTIONS="TUXX1"
+CONFIG_BOOTDELAY=2
diff --git a/configs/twister_defconfig b/configs/twister_defconfig
index b817a55..74a96c9 100644
--- a/configs/twister_defconfig
+++ b/configs/twister_defconfig
@@ -3,6 +3,7 @@ CONFIG_OMAP34XX=y
 CONFIG_TARGET_TWISTER=y
 CONFIG_SPL=y
 CONFIG_SYS_PROMPT="twister => "
+CONFIG_BOOTDELAY=10
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/usbarmory_defconfig b/configs/usbarmory_defconfig
index fe36611..70e9ddd 100644
--- a/configs/usbarmory_defconfig
+++ b/configs/usbarmory_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX5=y
 CONFIG_TARGET_USBARMORY=y
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/v5fx30teval_defconfig b/configs/v5fx30teval_defconfig
index 3e2ce7d..b18c175 100644
--- a/configs/v5fx30teval_defconfig
+++ b/configs/v5fx30teval_defconfig
@@ -3,6 +3,7 @@ CONFIG_4xx=y
 CONFIG_TARGET_V5FX30TEVAL=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000,BOOT_FROM_XMD=1,INIT_TLB=board/xilinx/ppc440-generic/init.o"
 CONFIG_SYS_PROMPT="v5fx30t:/# "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
diff --git a/configs/v5fx30teval_flash_defconfig b/configs/v5fx30teval_flash_defconfig
index b9b05e8..4f8b16d 100644
--- a/configs/v5fx30teval_flash_defconfig
+++ b/configs/v5fx30teval_flash_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_V5FX30TEVAL=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC,INIT_TLB=board/xilinx/ppc440-generic/init.o"
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
diff --git a/configs/vct_platinum_defconfig b/configs/vct_platinum_defconfig
index 0c30ae9..092d67a 100644
--- a/configs/vct_platinum_defconfig
+++ b/configs/vct_platinum_defconfig
@@ -2,5 +2,6 @@ CONFIG_MIPS=y
 CONFIG_TARGET_VCT=y
 CONFIG_VCT_PLATINUM=y
 CONFIG_SYS_PROMPT="$ "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/vct_platinum_onenand_defconfig b/configs/vct_platinum_onenand_defconfig
index e26c2f6..a0dbfac 100644
--- a/configs/vct_platinum_onenand_defconfig
+++ b/configs/vct_platinum_onenand_defconfig
@@ -3,6 +3,7 @@ CONFIG_TARGET_VCT=y
 CONFIG_VCT_PLATINUM=y
 CONFIG_VCT_ONENAND=y
 CONFIG_SYS_PROMPT="$ "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/vct_platinum_onenand_small_defconfig b/configs/vct_platinum_onenand_small_defconfig
index 33ce32a..1145c58 100644
--- a/configs/vct_platinum_onenand_small_defconfig
+++ b/configs/vct_platinum_onenand_small_defconfig
@@ -4,6 +4,7 @@ CONFIG_VCT_PLATINUM=y
 CONFIG_VCT_ONENAND=y
 CONFIG_VCT_SMALL_IMAGE=y
 CONFIG_SYS_PROMPT="$ "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/vct_platinum_small_defconfig b/configs/vct_platinum_small_defconfig
index ceb61e1..d56baf3 100644
--- a/configs/vct_platinum_small_defconfig
+++ b/configs/vct_platinum_small_defconfig
@@ -3,6 +3,7 @@ CONFIG_TARGET_VCT=y
 CONFIG_VCT_PLATINUM=y
 CONFIG_VCT_SMALL_IMAGE=y
 CONFIG_SYS_PROMPT="$ "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_CRC32 is not set
diff --git a/configs/vct_platinumavc_defconfig b/configs/vct_platinumavc_defconfig
index 103434c..7857054 100644
--- a/configs/vct_platinumavc_defconfig
+++ b/configs/vct_platinumavc_defconfig
@@ -2,6 +2,7 @@ CONFIG_MIPS=y
 CONFIG_TARGET_VCT=y
 CONFIG_VCT_PLATINUMAVC=y
 CONFIG_SYS_PROMPT="VCT# "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
diff --git a/configs/vct_platinumavc_onenand_defconfig b/configs/vct_platinumavc_onenand_defconfig
index e387b82..72ca734 100644
--- a/configs/vct_platinumavc_onenand_defconfig
+++ b/configs/vct_platinumavc_onenand_defconfig
@@ -3,6 +3,7 @@ CONFIG_TARGET_VCT=y
 CONFIG_VCT_PLATINUMAVC=y
 CONFIG_VCT_ONENAND=y
 CONFIG_SYS_PROMPT="$ "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/vct_platinumavc_onenand_small_defconfig b/configs/vct_platinumavc_onenand_small_defconfig
index 1958fcd..3caf30b 100644
--- a/configs/vct_platinumavc_onenand_small_defconfig
+++ b/configs/vct_platinumavc_onenand_small_defconfig
@@ -4,6 +4,7 @@ CONFIG_VCT_PLATINUMAVC=y
 CONFIG_VCT_ONENAND=y
 CONFIG_VCT_SMALL_IMAGE=y
 CONFIG_SYS_PROMPT="$ "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/vct_platinumavc_small_defconfig b/configs/vct_platinumavc_small_defconfig
index 0ac2def..dbc784b 100644
--- a/configs/vct_platinumavc_small_defconfig
+++ b/configs/vct_platinumavc_small_defconfig
@@ -3,6 +3,7 @@ CONFIG_TARGET_VCT=y
 CONFIG_VCT_PLATINUMAVC=y
 CONFIG_VCT_SMALL_IMAGE=y
 CONFIG_SYS_PROMPT="$ "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_CRC32 is not set
diff --git a/configs/vct_premium_defconfig b/configs/vct_premium_defconfig
index 2ae4975..a364981 100644
--- a/configs/vct_premium_defconfig
+++ b/configs/vct_premium_defconfig
@@ -2,5 +2,6 @@ CONFIG_MIPS=y
 CONFIG_TARGET_VCT=y
 CONFIG_VCT_PREMIUM=y
 CONFIG_SYS_PROMPT="$ "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/configs/vct_premium_onenand_defconfig b/configs/vct_premium_onenand_defconfig
index 9768dbc..6951905 100644
--- a/configs/vct_premium_onenand_defconfig
+++ b/configs/vct_premium_onenand_defconfig
@@ -3,6 +3,7 @@ CONFIG_TARGET_VCT=y
 CONFIG_VCT_PREMIUM=y
 CONFIG_VCT_ONENAND=y
 CONFIG_SYS_PROMPT="$ "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/vct_premium_onenand_small_defconfig b/configs/vct_premium_onenand_small_defconfig
index 471a005..fea9a2f 100644
--- a/configs/vct_premium_onenand_small_defconfig
+++ b/configs/vct_premium_onenand_small_defconfig
@@ -4,6 +4,7 @@ CONFIG_VCT_PREMIUM=y
 CONFIG_VCT_ONENAND=y
 CONFIG_VCT_SMALL_IMAGE=y
 CONFIG_SYS_PROMPT="$ "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/vct_premium_small_defconfig b/configs/vct_premium_small_defconfig
index 68c0d9a..633e707 100644
--- a/configs/vct_premium_small_defconfig
+++ b/configs/vct_premium_small_defconfig
@@ -3,6 +3,7 @@ CONFIG_TARGET_VCT=y
 CONFIG_VCT_PREMIUM=y
 CONFIG_VCT_SMALL_IMAGE=y
 CONFIG_SYS_PROMPT="$ "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_CRC32 is not set
diff --git a/configs/ve8313_defconfig b/configs/ve8313_defconfig
index 627bb3c..caabacd 100644
--- a/configs/ve8313_defconfig
+++ b/configs/ve8313_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_VE8313=y
+CONFIG_BOOTDELAY=6
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig
index fd27d70..3ffb3c1 100644
--- a/configs/venice2_defconfig
+++ b/configs/venice2_defconfig
@@ -5,6 +5,7 @@ CONFIG_TEGRA124=y
 CONFIG_TARGET_VENICE2=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra124-venice2"
 CONFIG_SYS_PROMPT="Tegra124 (Venice2) # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig
index dc142a9..a1e30e9 100644
--- a/configs/ventana_defconfig
+++ b/configs/ventana_defconfig
@@ -5,6 +5,7 @@ CONFIG_TEGRA20=y
 CONFIG_TARGET_VENTANA=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-ventana"
 CONFIG_SYS_PROMPT="Tegra20 (Ventana) # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/vexpress_ca15_tc2_defconfig b/configs/vexpress_ca15_tc2_defconfig
index 0ea72f2..3cf5313 100644
--- a/configs/vexpress_ca15_tc2_defconfig
+++ b/configs/vexpress_ca15_tc2_defconfig
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_VEXPRESS_CA15_TC2=y
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_BOOTD is not set
 CONFIG_CMD_BOOTZ=y
diff --git a/configs/vexpress_ca5x2_defconfig b/configs/vexpress_ca5x2_defconfig
index c6ee9e8..fec7a37 100644
--- a/configs/vexpress_ca5x2_defconfig
+++ b/configs/vexpress_ca5x2_defconfig
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_VEXPRESS_CA5X2=y
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_BOOTD is not set
 CONFIG_CMD_BOOTZ=y
diff --git a/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig
index 1703e65..00666ee 100644
--- a/configs/vexpress_ca9x4_defconfig
+++ b/configs/vexpress_ca9x4_defconfig
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_VEXPRESS_CA9X4=y
+CONFIG_BOOTDELAY=2
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_BOOTD is not set
 CONFIG_CMD_BOOTZ=y
diff --git a/configs/vme8349_defconfig b/configs/vme8349_defconfig
index 117a154..672ecd9 100644
--- a/configs/vme8349_defconfig
+++ b/configs/vme8349_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
 CONFIG_TARGET_VME8349=y
+CONFIG_BOOTDELAY=6
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/walnut_defconfig b/configs/walnut_defconfig
index 844e67f..b55b079 100644
--- a/configs/walnut_defconfig
+++ b/configs/walnut_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_WALNUT=y
+CONFIG_BOOTDELAY=5
diff --git a/configs/whistler_defconfig b/configs/whistler_defconfig
index fdf9236..db83564 100644
--- a/configs/whistler_defconfig
+++ b/configs/whistler_defconfig
@@ -5,6 +5,7 @@ CONFIG_TEGRA20=y
 CONFIG_TARGET_WHISTLER=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-whistler"
 CONFIG_SYS_PROMPT="Tegra20 (Whistler) # "
+CONFIG_BOOTDELAY=2
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
diff --git a/configs/wtk_defconfig b/configs/wtk_defconfig
index 7d4f754..7e3bf59 100644
--- a/configs/wtk_defconfig
+++ b/configs/wtk_defconfig
@@ -2,4 +2,5 @@ CONFIG_PPC=y
 CONFIG_8xx=y
 CONFIG_TARGET_TQM823L=y
 CONFIG_SYS_EXTRA_OPTIONS="LCD,SHARP_LQ065T9DR51U"
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/xilinx-ppc405-generic_defconfig b/configs/xilinx-ppc405-generic_defconfig
index 53fafc3..f170bfc 100644
--- a/configs/xilinx-ppc405-generic_defconfig
+++ b/configs/xilinx-ppc405-generic_defconfig
@@ -3,6 +3,7 @@ CONFIG_4xx=y
 CONFIG_TARGET_XILINX_PPC405_GENERIC=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000"
 CONFIG_SYS_PROMPT="xlx-ppc405:/# "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
diff --git a/configs/xilinx-ppc405-generic_flash_defconfig b/configs/xilinx-ppc405-generic_flash_defconfig
index 37084fb..6f17ebb 100644
--- a/configs/xilinx-ppc405-generic_flash_defconfig
+++ b/configs/xilinx-ppc405-generic_flash_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_XILINX_PPC405_GENERIC=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC"
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
diff --git a/configs/xilinx-ppc440-generic_defconfig b/configs/xilinx-ppc440-generic_defconfig
index 79be48a..600656a 100644
--- a/configs/xilinx-ppc440-generic_defconfig
+++ b/configs/xilinx-ppc440-generic_defconfig
@@ -3,6 +3,7 @@ CONFIG_4xx=y
 CONFIG_TARGET_XILINX_PPC440_GENERIC=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000,BOOT_FROM_XMD=1"
 CONFIG_SYS_PROMPT="board:/# "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
diff --git a/configs/xilinx-ppc440-generic_flash_defconfig b/configs/xilinx-ppc440-generic_flash_defconfig
index 6299033..3502537 100644
--- a/configs/xilinx-ppc440-generic_flash_defconfig
+++ b/configs/xilinx-ppc440-generic_flash_defconfig
@@ -2,6 +2,7 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_XILINX_PPC440_GENERIC=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC"
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig
index 770c797..8161fe0 100644
--- a/configs/xilinx_zynqmp_ep_defconfig
+++ b/configs/xilinx_zynqmp_ep_defconfig
@@ -4,6 +4,7 @@ CONFIG_ZYNQMP_USB=y
 CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-ep"
 CONFIG_SYS_PROMPT="ZynqMP> "
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
diff --git a/configs/yellowstone_defconfig b/configs/yellowstone_defconfig
index 7b1a630..e67a512 100644
--- a/configs/yellowstone_defconfig
+++ b/configs/yellowstone_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_YOSEMITE=y
 CONFIG_SYS_EXTRA_OPTIONS="YELLOWSTONE"
+CONFIG_BOOTDELAY=5
diff --git a/configs/yosemite_defconfig b/configs/yosemite_defconfig
index 00ec425..49c61aa 100644
--- a/configs/yosemite_defconfig
+++ b/configs/yosemite_defconfig
@@ -2,3 +2,4 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_YOSEMITE=y
 CONFIG_SYS_EXTRA_OPTIONS="YOSEMITE"
+CONFIG_BOOTDELAY=5
diff --git a/configs/yucca_defconfig b/configs/yucca_defconfig
index 6c8e20a..cdf1988 100644
--- a/configs/yucca_defconfig
+++ b/configs/yucca_defconfig
@@ -1,3 +1,4 @@
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_YUCCA=y
+CONFIG_BOOTDELAY=5
diff --git a/configs/zmx25_defconfig b/configs/zmx25_defconfig
index f853308..ed8694c 100644
--- a/configs/zmx25_defconfig
+++ b/configs/zmx25_defconfig
@@ -5,4 +5,5 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="boot in %d s\n"
 CONFIG_AUTOBOOT_DELAY_STR="delaygs"
 CONFIG_AUTOBOOT_STOP_STR="stopgs"
+CONFIG_BOOTDELAY=5
 # CONFIG_CMD_SETEXPR is not set
diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
index da1baf8..0aec0e2 100644
--- a/include/config_distro_defaults.h
+++ b/include/config_distro_defaults.h
@@ -58,7 +58,6 @@
 
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_BOOTDELAY     2
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_MENU
 #define CONFIG_DOS_PARTITION
diff --git a/include/config_fsl_secboot.h b/include/config_fsl_secboot.h
index fc6788a..133beba 100644
--- a/include/config_fsl_secboot.h
+++ b/include/config_fsl_secboot.h
@@ -95,12 +95,7 @@
 #define CONFIG_SECBOOT_CMD	CONFIG_BS_COPY_ENV \
 				CONFIG_BS_COPY_CMD \
 				CONFIG_SECBOOT
-/*
- * We don't want boot delay for secure boot flow
- * before autoboot starts
- */
-#undef CONFIG_BOOTDELAY
-#define CONFIG_BOOTDELAY	0
+
 #undef CONFIG_BOOTCOMMAND
 #define CONFIG_BOOTCOMMAND		CONFIG_SECBOOT_CMD
 
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index 1e458f4..4570471 100644
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -830,8 +830,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
 
 #define __USB_PHY_TYPE	ulpi
diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h
index a7c9277..1922046 100644
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -428,7 +428,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 804493e..04a7688 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -667,7 +667,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 6c39b1e..11657e0 100644
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -544,8 +544,6 @@
 /* default location for tftp and bootm */
 #define CONFIG_LOADADDR		1000000
 
-#define CONFIG_BOOTDELAY	-1	/* -1 disables auto-boot */
-
 #define CONFIG_BAUDRATE		115200
 
 #define CONFIG_DEF_HWCONFIG	fsl_ddr:ecc=on
diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h
index 638a586..9250755 100644
--- a/include/configs/CPCI2DP.h
+++ b/include/configs/CPCI2DP.h
@@ -28,7 +28,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 9c25751..ba7f026 100644
--- a/include/configs/CPCI4052.h
+++ b/include/configs/CPCI4052.h
@@ -32,7 +32,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 5e15dd9..10f8fab 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -64,7 +64,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 d1cadc0..d2fb36d 100644
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -88,7 +88,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 1472672..1063493 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -83,7 +83,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 ddb5cda..92d6859 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -17,8 +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 7f5ee8a..38c093d 100644
--- a/include/configs/M5253EVBE.h
+++ b/include/configs/M5253EVBE.h
@@ -18,8 +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 006f2d8..7000b9f 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -61,8 +61,6 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_ELF
 
-
-#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 116e8e2..35f3a5b 100644
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -111,7 +111,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 eff0aa6..5fcc261 100644
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -73,7 +73,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 a48ae6b..3b44746 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -84,7 +84,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 e806b7a..23fd5db 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -78,7 +78,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 1df98f7..58572ad 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -78,7 +78,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 db0ddcd..98c12ad 100644
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -84,8 +84,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 " \
 				"mtdparts=NAND:1M(u-boot)ro,7M(kernel)ro," \
diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index de747a4..a48acbf 100644
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -65,7 +65,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 06da5f0..4c5aa3c 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -72,7 +72,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 e30b645..6c3f1a0 100644
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -122,7 +122,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 051c940..05b1dc4 100644
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -117,7 +117,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 cb21b73..5005e38 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -112,7 +112,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 4150d5a..5a3ce69 100644
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -537,8 +537,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"							\
 	"consoledev=ttyS0\0"						\
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index d558db7..33c3ed2 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -667,7 +667,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 cbe10af..4dab6ad 100644
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -617,7 +617,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 7547c12..69b28c5 100644
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -504,7 +504,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 9805df7..838a01f 100644
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -583,7 +583,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 57547a4..96e3850 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -749,7 +749,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 834786d..cc13aee 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -751,8 +751,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" \
 	" nfsroot=" __stringify(CONFIG_SERVERIP) ":" CONFIG_ROOTPATH	\
diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index cebd175..bd53c70 100644
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -678,7 +678,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 5c6ad19..5573197 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -698,7 +698,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 1312438..a764439 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -733,7 +733,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 a42c936..7ae5cf5 100644
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -416,7 +416,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 8942aae..abb4fef 100644
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -434,7 +434,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 67fac70..4e4e145 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -463,7 +463,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 842afe1..21c9347 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -558,7 +558,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 2e8db5a..e5aedd4 100644
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -430,7 +430,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 fabe6bf..b14e714 100644
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -456,7 +456,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 7a2131b..f4125ac 100644
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -455,7 +455,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 9e38724..73c4ae1 100644
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -549,7 +549,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 f3334ad..bea5443 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -674,7 +674,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 9a487e0..a8fd083 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -530,7 +530,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 f20ee79..c4fc220 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -692,7 +692,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 f1af928..4e53918 100644
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@@ -17,7 +17,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 8ac7000..41a3d87 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -889,7 +889,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 06b293f..1ac9792 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -746,8 +746,6 @@
 
 #define CONFIG_LOADADDR		1000000
 
-#define CONFIG_BOOTDELAY	10	/* -1 disables auto-boot */
-
 #define CONFIG_BAUDRATE	115200
 
 #define	CONFIG_EXTRA_ENV_SETTINGS				\
diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h
index e61db18..f70763d 100644
--- a/include/configs/P1023RDB.h
+++ b/include/configs/P1023RDB.h
@@ -332,8 +332,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
 
 /* Qman/Bman */
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 5468495..46a0dce 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -706,8 +706,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
 
 #define __USB_PHY_TYPE	utmi
diff --git a/include/configs/PATI.h b/include/configs/PATI.h
index 5d0e422..b6ee397 100644
--- a/include/configs/PATI.h
+++ b/include/configs/PATI.h
@@ -48,12 +48,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 c9d08e6..41115da 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -103,8 +103,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 3a71ff8..5c88b3b 100644
--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.h
@@ -134,7 +134,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 5712298..0bb8625 100644
--- a/include/configs/PMC405DE.h
+++ b/include/configs/PMC405DE.h
@@ -22,7 +22,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 17bd180..bb673b0 100644
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -233,8 +233,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 92f51f6..20a6b78 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -898,7 +898,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 324f710..abdb061 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -900,7 +900,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 1f46160..9e77eb9 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -780,8 +780,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
 
 #define __USB_PHY_TYPE	utmi
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 5b61b56..7a62ad9 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -861,8 +861,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
 
 #define __USB_PHY_TYPE	utmi
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 23ca0cf..4c3561e 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -850,7 +850,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 ef42b88..0a758b2 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -804,7 +804,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 4edb3cb..045827d 100644
--- a/include/configs/T4240QDS.h
+++ b/include/configs/T4240QDS.h
@@ -557,8 +557,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 d43f6b7..3eb7c9e 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -765,8 +765,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 5a59b80..e2ee8bf 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -211,11 +211,6 @@
 #   define CONFIG_SYS_LOWBOOT		1	/* Boot low */
 #endif
 
-/*
- * Autobooting
- */
-#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds */
-
 #define CONFIG_PREBOOT	"echo;" \
 	"echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
 	"echo"
diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h
index 9b9217e..bd38ff0 100644
--- a/include/configs/TQM823L.h
+++ b/include/configs/TQM823L.h
@@ -38,8 +38,6 @@
 
 #define	CONFIG_BOOTCOUNT_LIMIT
 
-#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds	*/
-
 #define CONFIG_BOARD_TYPES	1	/* support board types		*/
 
 #define CONFIG_PREBOOT	"echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h
index 5240e0f..8ff072c 100644
--- a/include/configs/TQM823M.h
+++ b/include/configs/TQM823M.h
@@ -36,8 +36,6 @@
 
 #define	CONFIG_BOOTCOUNT_LIMIT
 
-#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds	*/
-
 #define CONFIG_BOARD_TYPES	1	/* support board types		*/
 
 #define CONFIG_PREBOOT	"echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 4164303..b4ab348 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -498,7 +498,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 edadf55..7c80605 100644
--- a/include/configs/TQM850L.h
+++ b/include/configs/TQM850L.h
@@ -31,8 +31,6 @@
 
 #define	CONFIG_BOOTCOUNT_LIMIT
 
-#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds	*/
-
 #define CONFIG_BOARD_TYPES	1	/* support board types		*/
 
 #define CONFIG_PREBOOT	"echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h
index 166bb2c..f0d3c67 100644
--- a/include/configs/TQM850M.h
+++ b/include/configs/TQM850M.h
@@ -31,8 +31,6 @@
 
 #define	CONFIG_BOOTCOUNT_LIMIT
 
-#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds	*/
-
 #define CONFIG_BOARD_TYPES	1	/* support board types		*/
 
 #define CONFIG_PREBOOT	"echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h
index 8b16ad2..a322c33 100644
--- a/include/configs/TQM855L.h
+++ b/include/configs/TQM855L.h
@@ -31,8 +31,6 @@
 
 #define	CONFIG_BOOTCOUNT_LIMIT
 
-#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds	*/
-
 #define CONFIG_BOARD_TYPES	1	/* support board types		*/
 
 #define CONFIG_PREBOOT	"echo;"	\
diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h
index 8a05fa4..9db9c22 100644
--- a/include/configs/TQM855M.h
+++ b/include/configs/TQM855M.h
@@ -31,8 +31,6 @@
 
 #define	CONFIG_BOOTCOUNT_LIMIT
 
-#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds	*/
-
 #define CONFIG_BOARD_TYPES	1	/* support board types		*/
 
 #define CONFIG_PREBOOT	"echo;"	\
diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h
index bf3a25b..3fc40a8 100644
--- a/include/configs/TQM860L.h
+++ b/include/configs/TQM860L.h
@@ -31,8 +31,6 @@
 
 #define	CONFIG_BOOTCOUNT_LIMIT
 
-#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds	*/
-
 #define CONFIG_BOARD_TYPES	1	/* support board types		*/
 
 #define CONFIG_PREBOOT	"echo;"	\
diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h
index 47e5c6c..b8685cf 100644
--- a/include/configs/TQM860M.h
+++ b/include/configs/TQM860M.h
@@ -31,8 +31,6 @@
 
 #define	CONFIG_BOOTCOUNT_LIMIT
 
-#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds	*/
-
 #define CONFIG_BOARD_TYPES	1	/* support board types		*/
 
 #define CONFIG_PREBOOT	"echo;"	\
diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h
index fa892a9..5acbdb7 100644
--- a/include/configs/TQM862L.h
+++ b/include/configs/TQM862L.h
@@ -34,8 +34,6 @@
 
 #define	CONFIG_BOOTCOUNT_LIMIT
 
-#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds	*/
-
 #define CONFIG_BOARD_TYPES	1	/* support board types		*/
 
 #define CONFIG_PREBOOT	"echo;"	\
diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h
index 13319f2..c14b413 100644
--- a/include/configs/TQM862M.h
+++ b/include/configs/TQM862M.h
@@ -34,8 +34,6 @@
 
 #define	CONFIG_BOOTCOUNT_LIMIT
 
-#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds	*/
-
 #define CONFIG_BOARD_TYPES	1	/* support board types		*/
 
 #define CONFIG_PREBOOT	"echo;"	\
diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h
index 0e378f2..15c56a6 100644
--- a/include/configs/TQM866M.h
+++ b/include/configs/TQM866M.h
@@ -45,8 +45,6 @@
 
 #define CONFIG_BOOTCOUNT_LIMIT
 
-#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds	*/
-
 #define CONFIG_BOARD_TYPES	1	/* support board types		*/
 
 #define CONFIG_PREBOOT	"echo;" \
diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h
index 76ddef5..df62658 100644
--- a/include/configs/TQM885D.h
+++ b/include/configs/TQM885D.h
@@ -41,8 +41,6 @@
 
 #define CONFIG_BOOTCOUNT_LIMIT
 
-#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds	*/
-
 #define CONFIG_BOARD_TYPES	1	/* support board types		*/
 
 #define CONFIG_PREBOOT	"echo;" \
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index 629be99..72ed12f 100644
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -626,7 +626,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"							\
@@ -756,7 +755,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"							\
@@ -846,7 +844,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 5b2e092..089b0c5 100644
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -124,7 +124,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 ddd6377..072c86d 100644
--- a/include/configs/VOM405.h
+++ b/include/configs/VOM405.h
@@ -28,7 +28,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 fc4595b..82c7afd 100644
--- a/include/configs/a3m071.h
+++ b/include/configs/a3m071.h
@@ -336,7 +336,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 1be78fd..0cf3108 100644
--- a/include/configs/a4m072.h
+++ b/include/configs/a4m072.h
@@ -113,11 +113,6 @@
 #define CONFIG_SYS_LOWBOOT32		1
 #endif
 
-/*
- * Autobooting
- */
-#define CONFIG_BOOTDELAY	2	/* autoboot after 2 seconds */
-
 #define CONFIG_SYS_AUTOLOAD	"n"
 
 #undef	CONFIG_BOOTARGS
diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h
index f05d9ec..9f265a8 100644
--- a/include/configs/ac14xx.h
+++ b/include/configs/ac14xx.h
@@ -478,8 +478,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;"	\
 	"echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h
index 849b08e..987df2d 100644
--- a/include/configs/adp-ag101p.h
+++ b/include/configs/adp-ag101p.h
@@ -98,8 +98,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 f655e69..9ff428a 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
 #ifndef CONFIG_FIT
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index 654b778..6b69d53 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -165,8 +165,6 @@
 #define CONFIG_JFFS2_PART_SIZE		0xf980000	/* sz of jffs2 part */
 
 /* Environment information */
-#define CONFIG_BOOTDELAY	10
-
 #define CONFIG_BOOTFILE		"uImage"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index 7049091..8229e50 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -177,8 +177,6 @@
 #define CONFIG_JFFS2_PART_SIZE		0xf980000	/* sz of jffs2 part */
 
 /* Environment information */
-#define CONFIG_BOOTDELAY	10
-
 #define CONFIG_BOOTFILE		"uImage"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h
index 37dac7d..0fe3ffb 100644
--- a/include/configs/amcc-common.h
+++ b/include/configs/amcc-common.h
@@ -71,7 +71,6 @@
 /*
  * Miscellaneous configurable options
  */
-#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/amcore.h b/include/configs/amcore.h
index bbab8b2..f63a20b 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/ap325rxa.h b/include/configs/ap325rxa.h
index 03810c3..969a098 100644
--- a/include/configs/ap325rxa.h
+++ b/include/configs/ap325rxa.h
@@ -21,7 +21,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 4bcfb4c..40a12e1 100644
--- a/include/configs/ap_sh4a_4a.h
+++ b/include/configs/ap_sh4a_4a.h
@@ -24,7 +24,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 49fbcac..3d7ac49 100644
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -164,7 +164,6 @@
 
 #define CONFIG_OF_LIBFDT
 
-#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 2bbef55..8ead6ca 100644
--- a/include/configs/apx4devkit.h
+++ b/include/configs/apx4devkit.h
@@ -104,7 +104,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 a342d7e..db0aaa2 100644
--- a/include/configs/arcangel4.h
+++ b/include/configs/arcangel4.h
@@ -58,7 +58,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 2265f3e..7d702f1 100644
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -520,7 +520,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 1f4188f..96cea23 100644
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -26,7 +26,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 1c3a1c9..ed21e9b 100644
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -151,21 +151,6 @@
 
 /* Define user parameters that have to be customized most likely */
 
-/* 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
diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
index 7e48be6..2bfb345 100644
--- a/include/configs/at91-sama5_common.h
+++ b/include/configs/at91-sama5_common.h
@@ -35,8 +35,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 c6337a8..8c74df6 100644
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -177,11 +177,6 @@
 #define CONFIG_SYS_MONITOR_BASE		CONFIG_SYS_FLASH_BASE
 #define CONFIG_SYS_MONITOR_LEN		SZ_256K
 
-/*
- * Boot option
- */
-#define CONFIG_BOOTDELAY		3
-
 /* default load address */
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_SDRAM_BASE + SZ_16M
 #define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index f84ae71..e268361 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -65,8 +65,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 4d260e9..80adf83 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -73,8 +73,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 fb8af44..da06496 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -80,8 +80,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 c5182ba..ea1f227 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -63,8 +63,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 f45c717..e7a882a 100644
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -54,8 +54,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 519ba11..ea1577a 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -70,8 +70,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 55358d6..b2e04c8 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -51,8 +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/atngw100.h b/include/configs/atngw100.h
index c436fef..3ab4e4a 100644
--- a/include/configs/atngw100.h
+++ b/include/configs/atngw100.h
@@ -62,8 +62,6 @@
 #define CONFIG_BOOTCOMMAND						\
 	"fsload; bootm"
 
-#define CONFIG_BOOTDELAY		1
-
 /*
  * After booting the board for the first time, new ethernet addresses
  * should be generated and assigned to the environment variables
diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h
index 3935811..6ce8b91 100644
--- a/include/configs/atngw100mkii.h
+++ b/include/configs/atngw100mkii.h
@@ -81,8 +81,6 @@
 #define CONFIG_BOOTCOMMAND						\
 	"fsload 0x10400000 /uImage; bootm"
 
-#define CONFIG_BOOTDELAY		1
-
 /*
  * After booting the board for the first time, new ethernet addresses
  * should be generated and assigned to the environment variables
diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index 8cd7c35..f12049b 100644
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -79,8 +79,6 @@
 #define CONFIG_BOOTCOMMAND						\
 	"fsload; bootm $(fileaddr)"
 
-#define CONFIG_BOOTDELAY		1
-
 /*
  * After booting the board for the first time, new ethernet addresses
  * should be generated and assigned to the environment variables
diff --git a/include/configs/axs101.h b/include/configs/axs101.h
index 7cb8853..a22689a 100644
--- a/include/configs/axs101.h
+++ b/include/configs/axs101.h
@@ -146,7 +146,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 36637ae..dad1dad 100644
--- a/include/configs/bct-brettl2.h
+++ b/include/configs/bct-brettl2.h
@@ -126,7 +126,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 fce6fc2..54fc325 100644
--- a/include/configs/bf525-ucr2.h
+++ b/include/configs/bf525-ucr2.h
@@ -87,7 +87,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 6674d28..8483c3c 100644
--- a/include/configs/bf537-minotaur.h
+++ b/include/configs/bf537-minotaur.h
@@ -139,12 +139,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
 # define CONFIG_CMD_DHCP
 # define CONFIG_CMD_PING
diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h
index 15d912e..b7d7781 100644
--- a/include/configs/bf537-srv1.h
+++ b/include/configs/bf537-srv1.h
@@ -138,12 +138,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
 # define CONFIG_CMD_DHCP
 # define CONFIG_CMD_PING
diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h
index 7b2faf2..d83ba1d 100644
--- a/include/configs/bfin_adi_common.h
+++ b/include/configs/bfin_adi_common.h
@@ -119,13 +119,6 @@
 /*
  * Env Settings
  */
-#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
 # define CONFIG_BOOTCOMMAND	"run ramboot"
 #endif
diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h
index 041182c..f7267f6 100644
--- a/include/configs/bg0900.h
+++ b/include/configs/bg0900.h
@@ -63,7 +63,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 c0197ca..3a72fc4 100644
--- a/include/configs/blackstamp.h
+++ b/include/configs/blackstamp.h
@@ -119,7 +119,6 @@
 #define CONFIG_CMD_SF
 #define CONFIG_CMD_ELF
 
-#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 4752b07..1258f03 100644
--- a/include/configs/blackvme.h
+++ b/include/configs/blackvme.h
@@ -162,7 +162,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 959f9a9..3df1a67 100644
--- a/include/configs/br4.h
+++ b/include/configs/br4.h
@@ -128,7 +128,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 c8b15fb..2c9490f 100644
--- a/include/configs/calimain.h
+++ b/include/configs/calimain.h
@@ -217,7 +217,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 36cd50b..8ffe13a 100644
--- a/include/configs/canmb.h
+++ b/include/configs/canmb.h
@@ -70,11 +70,6 @@
 #   error "CONFIG_SYS_TEXT_BASE must be 0xFE000000"
 #endif
 
-/*
- * Autobooting
- */
-#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds */
-
 #define CONFIG_PREBOOT	"echo;"	\
 	"echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
 	"echo"
diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h
index 4607d9f..dcf3085 100644
--- a/include/configs/cm5200.h
+++ b/include/configs/cm5200.h
@@ -72,10 +72,6 @@
 /* display image timestamps */
 #define CONFIG_TIMESTAMP	1
 
-/*
- * 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 d6257d4..794ed19 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -157,7 +157,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 9327a13..dc91f62 100644
--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@@ -164,7 +164,6 @@
 							/* devices */
 
 /* Environment information */
-#define CONFIG_BOOTDELAY		3
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index c4d3b94..b6ed078 100644
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -109,7 +109,6 @@
 #undef CONFIG_SPL_GPIO_SUPPORT
 #undef CONFIG_SPL_NAND_SUPPORT
 #undef CONFIG_SPL_BOARD_INIT
-#undef CONFIG_BOOTDELAY
 #include <config_distro_defaults.h>
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 #undef CONFIG_CMD_IMLS
diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h
index 95a5a60..ed09526 100644
--- a/include/configs/cm_t54.h
+++ b/include/configs/cm_t54.h
@@ -107,9 +107,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 8e70d8c..2107aeb 100644
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -151,14 +151,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 */
-
-
 /* 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/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index 4efc9c5..3d94567 100644
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -38,7 +38,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 e5abaf1..5f815ec 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -105,7 +105,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 9a1f6d0..c75cea5 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -446,7 +446,6 @@
 
 #ifdef CONFIG_TRAILBLAZER
 
-#define CONFIG_BOOTDELAY	0	/* -1 disables auto-boot */
 #define CONFIG_BAUDRATE	115200
 
 #define	CONFIG_EXTRA_ENV_SETTINGS				\
@@ -461,8 +460,6 @@
 
 #define CONFIG_LOADADDR		1000000
 
-#define CONFIG_BOOTDELAY	10	/* -1 disables auto-boot */
-
 #define CONFIG_BAUDRATE	115200
 
 #define	CONFIG_EXTRA_ENV_SETTINGS				\
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 2919220..48e4e11 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -711,8 +711,6 @@
 /* default location for tftp and bootm */
 #define CONFIG_LOADADDR		1000000
 
-#define CONFIG_BOOTDELAY 	10	/* -1 disables auto-boot */
-
 #define CONFIG_BAUDRATE	115200
 
 #ifdef CONFIG_P4080DS
diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index 6da8dc9..c19faa5 100644
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -57,8 +57,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/da850evm.h b/include/configs/da850evm.h
index 1cd11c0..b15a3ef 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -286,7 +286,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 46e3a6c..26a0123 100644
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -37,8 +37,6 @@
 #endif
 #endif
 
-#define CONFIG_BOOTDELAY	2	/* autoboot after 2 seconds	*/
-
 #define CONFIG_BAUDRATE		115200
 
 /* valid baudrates */
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index d3b7620..770e274 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -172,7 +172,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 a7af351..b4ca2ad 100644
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -125,11 +125,6 @@
 #define CONFIG_SYS_LOWBOOT	1
 #endif
 
-/*
- * Autobooting
- */
-#define CONFIG_BOOTDELAY	1
-
 #undef	CONFIG_BOOTARGS
 
 #define CONFIG_EXTRA_ENV_SETTINGS					\
diff --git a/include/configs/draco.h b/include/configs/draco.h
index acefd3e..135e4f4 100644
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -83,8 +83,6 @@
 	CONFIG_ENV_SETTINGS_NAND_V2
 
 #ifndef CONFIG_RESTORE_FLASH
-/* set to negative value for no autoboot */
-#define CONFIG_BOOTDELAY		3
 
 #define CONFIG_BOOTCOMMAND \
 "if dfubutton; then " \
@@ -97,7 +95,6 @@
 
 
 #else
-#define CONFIG_BOOTDELAY		0
 
 #define CONFIG_BOOTCOMMAND			\
 	"setenv autoload no; "			\
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index 2d1f1b3..80f96ca 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -143,7 +143,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 f9ec028..316d80c 100644
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -72,7 +72,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 f23d383..062e319 100644
--- a/include/configs/eco5pk.h
+++ b/include/configs/eco5pk.h
@@ -32,7 +32,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 8e62674..689d428 100644
--- a/include/configs/ecovec.h
+++ b/include/configs/ecovec.h
@@ -42,7 +42,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 6a4c376..c0427c8 100644
--- a/include/configs/edb93xx.h
+++ b/include/configs/edb93xx.h
@@ -28,7 +28,6 @@
 #define CONFIG_SYS_GENERIC_BOARD
 
 /* 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 8b38d7e..bbea072 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -118,9 +118,6 @@
 #define CONFIG_SYS_MAX_FLASH_SECT	11 /* max num of sects on one chip */
 #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
  * have to be in the first 8 MB of memory, since this is
diff --git a/include/configs/espt.h b/include/configs/espt.h
index d854341..01de416 100644
--- a/include/configs/espt.h
+++ b/include/configs/espt.h
@@ -22,7 +22,6 @@
 #define CONFIG_CMD_PING
 #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 b49b903..dc7513d 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -224,7 +224,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 f646fee..0feb2fb 100644
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -88,8 +88,6 @@
 #define CONFIG_CMD_MII
 #define CONFIG_NET_RETRY_COUNT	100
 
-#define CONFIG_BOOTDELAY	3
-
 #define CONFIG_LOADADDR		0x80800000	/* loadaddr env var */
 
 
diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h
index 782746e..cbba5cc 100644
--- a/include/configs/gr_cpci_ax2000.h
+++ b/include/configs/gr_cpci_ax2000.h
@@ -65,11 +65,6 @@
 #define CONFIG_CMD_DIAG
 #define CONFIG_CMD_IRQ
 
-/*
- * Autobooting
- */
-#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds */
-
 #define CONFIG_PREBOOT	"echo;"	\
 	"echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
 	"echo"
diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h
index 5c466f2..6af49b7 100644
--- a/include/configs/gr_ep2s60.h
+++ b/include/configs/gr_ep2s60.h
@@ -70,11 +70,6 @@
 #define CONFIG_SYS_STDIO_DEREGISTER	/* needs stdio_deregister */
 #endif
 
-/*
- * Autobooting
- */
-#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds */
-
 #define CONFIG_PREBOOT	"echo;"	\
 	"echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
 	"echo"
diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h
index e01578c..d9a131c 100644
--- a/include/configs/gr_xc3s_1500.h
+++ b/include/configs/gr_xc3s_1500.h
@@ -46,11 +46,6 @@
 #define CONFIG_CMD_DIAG
 #define CONFIG_CMD_IRQ
 
-/*
- * Autobooting
- */
-#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds */
-
 #define CONFIG_PREBOOT	"echo;"	\
 	"echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
 	"echo"
diff --git a/include/configs/grasshopper.h b/include/configs/grasshopper.h
index 274175b..278a18d 100644
--- a/include/configs/grasshopper.h
+++ b/include/configs/grasshopper.h
@@ -74,8 +74,6 @@
 
 #define CONFIG_BAUDRATE			115200
 
-#define CONFIG_BOOTDELAY		1
-
 /*
  * After booting the board for the first time, new ethernet addresses
  * should be generated and assigned to the environment variables
diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index f54919e..b2e7410 100644
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -53,11 +53,6 @@
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
 
-/*
- * Autobooting
- */
-#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds */
-
 #define CONFIG_PREBOOT	"echo;"	\
 	"echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
 	"echo"
diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index bd2eaa9..3342a79 100644
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -51,11 +51,6 @@
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
 
-/*
- * Autobooting
- */
-#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds */
-
 #define CONFIG_PREBOOT	"echo;"	\
 	"echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
 	"echo"
diff --git a/include/configs/h2200.h b/include/configs/h2200.h
index e8dfa74..11d1435 100644
--- a/include/configs/h2200.h
+++ b/include/configs/h2200.h
@@ -141,7 +141,6 @@
 
 #define CONFIG_CMD_PING
 
-#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 558edfc..ab1bb5e 100644
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -564,8 +564,6 @@ int fpga_gpio_get(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"
 #define CONFIG_BOOTFILE		"uImage"
diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index e60e753..3fe718f 100644
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -27,7 +27,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 526659c..27857db 100644
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@@ -182,8 +182,6 @@
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_PING
 
-#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 3bea71b..02318c9 100644
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -58,8 +58,6 @@
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_I2C
 
-#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 d3034cf..cd70c6a 100644
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -98,11 +98,6 @@
 #   define CONFIG_SYS_LOWBOOT		1
 #endif
 
-/*
- * Autobooting
- */
-#define CONFIG_BOOTDELAY	1	/* autoboot after 1 second */
-
 #define CONFIG_PREBOOT	"echo;" \
 	"echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
 	"echo"
diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index c80e915..6be95f6 100644
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -32,7 +32,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 af69ad9..d0b6af8 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 b1cd7df..699ba6b 100644
--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@@ -228,7 +228,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 3f6f8dd..51c6648 100644
--- a/include/configs/ipek01.h
+++ b/include/configs/ipek01.h
@@ -118,11 +118,6 @@
 
 #define CONFIG_SYS_LOWBOOT	1
 
-/*
- * Autobooting
- */
-#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds */
-
 #define CONFIG_PREBOOT	"echo;"	\
 	"echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
 	"echo"
diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index 5601cb4..348788f 100644
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -93,12 +93,6 @@
 #define CODFIG_CMD_PCI
 #endif
 
-
-/*
- * Autobooting
- */
-#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds */
-
 #define CONFIG_PREBOOT	"echo;"	\
 	"echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
 	"echo"
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index f3248bc..34ba5f6 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -27,7 +27,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 69e1e9c..9f2921d 100644
--- a/include/configs/kwb.h
+++ b/include/configs/kwb.h
@@ -98,7 +98,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 eb50dd3..d4bb89e 100644
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -32,7 +32,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/ls1021aqds.h b/include/configs/ls1021aqds.h
index ab7e04d..3d3a9d5 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -572,8 +572,6 @@ unsigned long get_board_ddr_clk(void);
 
 #define CONFIG_FSL_DEVICE_DISABLE
 
-#define CONFIG_BOOTDELAY		3
-
 #define CONFIG_SYS_QE_FW_ADDR     0x67f40000
 
 #ifdef CONFIG_LPUART
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index c22e1fc..471b797 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -420,8 +420,6 @@
 
 #define CONFIG_FSL_DEVICE_DISABLE
 
-#define CONFIG_BOOTDELAY		3
-
 #ifdef CONFIG_LPUART
 #define CONFIG_EXTRA_ENV_SETTINGS       \
 	"bootargs=root=/dev/ram0 rw console=ttyLP0,115200\0" \
diff --git a/include/configs/ls2085a_common.h b/include/configs/ls2085a_common.h
index 55b909c..71d34e4 100644
--- a/include/configs/ls2085a_common.h
+++ b/include/configs/ls2085a_common.h
@@ -259,7 +259,6 @@ unsigned long long get_qixis_addr(void);
 				" hugepagesz=2m hugepages=16"
 #define CONFIG_BOOTCOMMAND		"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/m28evk.h b/include/configs/m28evk.h
index 29c60b7..aad7ef0 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -151,7 +151,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 8853d8f..0d4b6df 100644
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -241,7 +241,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/manroland/common.h b/include/configs/manroland/common.h
index 941290c..0c0d04d 100644
--- a/include/configs/manroland/common.h
+++ b/include/configs/manroland/common.h
@@ -40,11 +40,6 @@
 
 #define	CONFIG_TIMESTAMP	1	/* Print image info with timestamp */
 
-/*
- * Autobooting
- */
-#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds */
-
 #define CONFIG_PREBOOT	"echo;" \
 	"echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
 	"echo"
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 0f70c47..c277aac 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -168,8 +168,6 @@
 #define CONFIG_JFFS2_PART_SIZE		0xf980000	/* sz of jffs2 part */
 
 /* Environment information */
-#define CONFIG_BOOTDELAY	3
-
 #define CONFIG_BOOTFILE		"uImage"
 
 /* Setup MTD for NAND on the SOM */
diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h
index a8b4b24..f5d4bc4 100644
--- a/include/configs/mecp5123.h
+++ b/include/configs/mecp5123.h
@@ -376,7 +376,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 ab6c910..3fbcd33 100644
--- a/include/configs/meesc.h
+++ b/include/configs/meesc.h
@@ -74,7 +74,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 8ce1c49..c3fea61 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -328,7 +328,6 @@
 /* default load address */
 #define	CONFIG_SYS_LOAD_ADDR	XILINX_RAM_START
 
-#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 3b97d91..4308885 100644
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -68,10 +68,6 @@
 #define CONFIG_PHY_TYPE		0x79c874
 #define CONFIG_RESET_PHY_R	1
 
-/*
- * 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 782b29d..fba84cd 100644
--- a/include/configs/mpc5121ads.h
+++ b/include/configs/mpc5121ads.h
@@ -532,7 +532,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 1b09e70..45a75a3 100644
--- a/include/configs/mpc8308_p1m.h
+++ b/include/configs/mpc8308_p1m.h
@@ -488,8 +488,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"							\
 	"consoledev=ttyS0\0"						\
diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index 12bb3a0..9d9afa2 100644
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@@ -17,7 +17,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 bbd2d6b..b07258e 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 3073db9..29564d7 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 b1b6acd..ecf4f6e 100644
--- a/include/configs/munices.h
+++ b/include/configs/munices.h
@@ -45,7 +45,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 92e5429..1fe9d60 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -55,8 +55,6 @@
 #define CONFIG_BAUDRATE			115200
 #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
 
 #define CONFIG_OF_LIBFDT		/* Device tree support */
diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h
index 529f73b..5c59ace 100644
--- a/include/configs/mx23_olinuxino.h
+++ b/include/configs/mx23_olinuxino.h
@@ -64,7 +64,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 7969ed6..0806cf6 100644
--- a/include/configs/mx23evk.h
+++ b/include/configs/mx23evk.h
@@ -62,7 +62,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 bfe0234..47c0a52 100644
--- a/include/configs/mx25pdk.h
+++ b/include/configs/mx25pdk.h
@@ -127,8 +127,6 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_MII
 
-#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 66e80d7..7c021fa 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -148,7 +148,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 c4513d2..009901a 100644
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -79,8 +79,6 @@
 #define CONFIG_CMD_SPI
 #define CONFIG_CMD_DATE
 
-#define CONFIG_BOOTDELAY	3
-
 #define CONFIG_LOADADDR		0x80800000	/* loadaddr env var */
 
 #define	CONFIG_EXTRA_ENV_SETTINGS					\
diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h
index 9fe859e..3f71779 100644
--- a/include/configs/mx31pdk.h
+++ b/include/configs/mx31pdk.h
@@ -90,8 +90,6 @@
 
 #define CONFIG_BOARD_LATE_INIT
 
-#define CONFIG_BOOTDELAY	1
-
 #define	CONFIG_EXTRA_ENV_SETTINGS					\
 	"bootargs_base=setenv bootargs console=ttymxc0,115200\0"	\
 	"bootargs_nfs=setenv bootargs $(bootargs) root=/dev/nfs "	\
diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index c40917b..06b239c 100644
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -103,8 +103,6 @@
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
 
-#define CONFIG_BOOTDELAY	1
-
 #define CONFIG_LOADADDR		0x80800000	/* loadaddr env var */
 
 /*
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index cb2f445..bf2495d 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -131,8 +131,6 @@
 
 #define CONFIG_CMD_DATE
 
-#define CONFIG_BOOTDELAY	1
-
 #define CONFIG_ETHPRIME		"FEC0"
 
 #define CONFIG_LOADADDR		0x92000000	/* loadaddr env var */
diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h
index b889c25..beba07c 100644
--- a/include/configs/mx53ard.h
+++ b/include/configs/mx53ard.h
@@ -77,8 +77,6 @@
 #define CONFIG_BAUDRATE			115200
 
 /* Command definition */
-#define CONFIG_BOOTDELAY	3
-
 #define CONFIG_ETHPRIME		"smc911x"
 
 /*Support LAN9217*/
diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index 4f304ed..b2387de 100644
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -85,8 +85,6 @@
 #define CONFIG_BAUDRATE			115200
 
 /* Command definition */
-#define CONFIG_BOOTDELAY	3
-
 #define CONFIG_ETHPRIME		"FEC0"
 
 #define CONFIG_LOADADDR		0x70800000	/* loadaddr env var */
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 7a32fef..7e7cc33 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -97,8 +97,6 @@
 /* Command definition */
 #define CONFIG_SUPPORT_RAW_INITRD
 
-#define CONFIG_BOOTDELAY	1
-
 #define CONFIG_ETHPRIME		"FEC0"
 
 #define CONFIG_LOADADDR		0x72000000	/* loadaddr env var */
diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h
index e46f2ee..d5b39e0 100644
--- a/include/configs/mx53smd.h
+++ b/include/configs/mx53smd.h
@@ -71,8 +71,6 @@
 #define CONFIG_BAUDRATE			115200
 
 /* Command definition */
-#define CONFIG_BOOTDELAY	3
-
 #define CONFIG_ETHPRIME		"FEC0"
 
 #define CONFIG_LOADADDR		0x70800000	/* loadaddr env var */
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index 440ff98..abeb4db 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -67,10 +67,6 @@
 #endif
 #define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR
 
-#ifndef CONFIG_BOOTDELAY
-#define CONFIG_BOOTDELAY	3
-#endif
-
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX       1
diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index 972fd4c..b78df42 100644
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -40,10 +40,6 @@
 #define CONFIG_LOADADDR                 0x80800000
 #define CONFIG_SYS_TEXT_BASE            0x87800000
 
-#ifndef CONFIG_BOOTDELAY
-#define CONFIG_BOOTDELAY                3
-#endif
-
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_CONS_INDEX               1
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 915df52..2127ee4 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -386,7 +386,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 435f1a2..cae3b0a 100644
--- a/include/configs/o2dnt-common.h
+++ b/include/configs/o2dnt-common.h
@@ -96,8 +96,6 @@
 #error "CONFIG_SYS_TEXT_BASE value is invalid"
 #endif
 
-#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds */
-
 #define CONFIG_PREBOOT	"run master"
 
 #undef	CONFIG_BOOTARGS
diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h
index 3f777b6..82e0d50 100644
--- a/include/configs/omap3_cairo.h
+++ b/include/configs/omap3_cairo.h
@@ -73,10 +73,6 @@
 #define CONFIG_NAND_OMAP_GPMC
 #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" \
 	"fdt_high=0x87000000\0" \
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 1dd71a8..312c13d 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -114,8 +114,6 @@
  * Default environment
  * -----------------------------------------------------------------------------
  */
-#define CONFIG_BOOTDELAY	3
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x82000000\0" \
 	"usbtty=cdc_acm\0" \
diff --git a/include/configs/omap3_evm_quick_mmc.h b/include/configs/omap3_evm_quick_mmc.h
index 27cd9be..415741c 100644
--- a/include/configs/omap3_evm_quick_mmc.h
+++ b/include/configs/omap3_evm_quick_mmc.h
@@ -57,8 +57,6 @@
  * Default environment
  * -----------------------------------------------------------------------------
  */
-#define CONFIG_BOOTDELAY	0
-
 #define CONFIG_EXTRA_ENV_SETTINGS	\
 	"verify=no\0"			\
 	"silent=1"
diff --git a/include/configs/omap3_evm_quick_nand.h b/include/configs/omap3_evm_quick_nand.h
index 124e8c6..ea3f02a 100644
--- a/include/configs/omap3_evm_quick_nand.h
+++ b/include/configs/omap3_evm_quick_nand.h
@@ -45,8 +45,6 @@
  * Default environment
  * -----------------------------------------------------------------------------
  */
-#define CONFIG_BOOTDELAY	0
-
 #define CONFIG_EXTRA_ENV_SETTINGS	\
 	"verify=no\0"			\
 	"silent=1"
diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h
index 4409103..a81fcd3 100644
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -19,8 +19,6 @@
 #include <configs/ti_omap3_common.h>
 #include <asm/mach-types.h>
 
-#undef CONFIG_BOOTDELAY
-
 /*
  * Display CPU and Board information
  */
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index d9a3aa4..792c434 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -223,7 +223,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 af89e6b..0fa0a1c 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -975,7 +975,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 e9cc274..7bc3aa7 100644
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -497,7 +497,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 516d381..dec5d02 100644
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -31,8 +31,6 @@
 #endif
 #endif
 
-#define CONFIG_BOOTDELAY	2	/* autoboot after 2 seconds	*/
-
 #define CONFIG_BAUDRATE		115200
 
 #define	CONFIG_TIMESTAMP		/* Print image info with timestamp */
diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h
index 4ea617a..6acee69 100644
--- a/include/configs/pcm030.h
+++ b/include/configs/pcm030.h
@@ -74,7 +74,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 9ddbc59..a2adb44 100644
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -126,8 +126,6 @@
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
 #define CONFIG_SYS_I2C_EEPROM_BUS 2
 
-#define CONFIG_BOOTDELAY		3
-
 #define CONFIG_LOADADDR			0x82000000
 
 /* We boot from the gfxRAM area of the OCRAM. */
diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h
index e7413c9..718c330 100644
--- a/include/configs/pdm360ng.h
+++ b/include/configs/pdm360ng.h
@@ -454,8 +454,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;" \
 	"echo"
diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h
index 7257bf4..22cde6b 100644
--- a/include/configs/picosam9g45.h
+++ b/include/configs/picosam9g45.h
@@ -65,8 +65,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 f4f96a7..29c5bb1 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -170,8 +170,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 bd43577..cd2134e 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -184,8 +184,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 09f0744..042bc96 100644
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -59,8 +59,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 f76e023..c365da6 100644
--- a/include/configs/pr1.h
+++ b/include/configs/pr1.h
@@ -129,7 +129,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 d896bca..f73867a 100644
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -94,7 +94,6 @@
 
 #ifndef CONFIG_RESTORE_FLASH
 /* set to negative value for no autoboot */
-#define CONFIG_BOOTDELAY		3
 
 #define CONFIG_BOOTCOMMAND \
 	"if dfubutton; then " \
@@ -120,7 +119,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 a7ec8f5..d183c15 100644
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -17,8 +17,6 @@
 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_MISC_INIT_R
 
-#define CONFIG_BOOTDELAY	10	/* autoboot after 10 seconds */
-
 #define CONFIG_BAUDRATE		115200
 
 #define CONFIG_TIMESTAMP		/* Print image info with timestamp */
diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h
index 4de15bf..91748ad 100644
--- a/include/configs/qemu-mips64.h
+++ b/include/configs/qemu-mips64.h
@@ -17,8 +17,6 @@
 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_MISC_INIT_R
 
-#define CONFIG_BOOTDELAY	10	/* autoboot after 10 seconds */
-
 #define CONFIG_BAUDRATE		115200
 
 #define CONFIG_TIMESTAMP		/* Print image info with timestamp */
diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index f63aadb..1020e7b 100644
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -199,7 +199,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 b1d79fd..26e8214 100644
--- a/include/configs/r0p7734.h
+++ b/include/configs/r0p7734.h
@@ -24,7 +24,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 2d1e56a..c68f88d 100644
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -25,7 +25,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 82a056c..104a79e 100644
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -30,7 +30,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 d9dde9c..052d217 100644
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -88,7 +88,6 @@
 
 #ifndef CONFIG_RESTORE_FLASH
 /* set to negative value for no autoboot */
-#define CONFIG_BOOTDELAY		3
 
 #define CONFIG_BOOTCOMMAND \
 "if dfubutton; then " \
@@ -101,7 +100,6 @@
 
 
 #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 b532d70..c0d17df 100644
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -41,7 +41,6 @@
 #define CONFIG_OF_LIBFDT
 
 #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 622b7c7..284ab12 100644
--- a/include/configs/redwood.h
+++ b/include/configs/redwood.h
@@ -132,8 +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	*/
 #define CONFIG_PHY_RESET_DELAY	1000
diff --git a/include/configs/rpi-common.h b/include/configs/rpi-common.h
index 06836cd..0af4b21 100644
--- a/include/configs/rpi-common.h
+++ b/include/configs/rpi-common.h
@@ -181,6 +181,4 @@
 	ENV_MEM_LAYOUT_SETTINGS \
 	BOOTENV
 
-#define CONFIG_BOOTDELAY 2
-
 #endif
diff --git a/include/configs/rsk7264.h b/include/configs/rsk7264.h
index c60e233..3f9fb7b 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 b4fbc9c..b7f361b 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 78264ba..e432b06 100644
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -86,7 +86,6 @@
 
 #ifndef CONFIG_RESTORE_FLASH
 /* set to negative value for no autoboot */
-#define CONFIG_BOOTDELAY		3
 
 #define CONFIG_BOOTCOMMAND \
 	"if mmc rescan; then " \
@@ -108,7 +107,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 1715678..86b1402 100644
--- a/include/configs/sansa_fuze_plus.h
+++ b/include/configs/sansa_fuze_plus.h
@@ -36,7 +36,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 9d89b2a..109bf16 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -656,7 +656,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 0717156..8a1fa7b 100644
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -597,7 +597,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 00aab6b..03ca273 100644
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -545,7 +545,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 6d35cd3..1f7b032 100644
--- a/include/configs/sc_sps_1.h
+++ b/include/configs/sc_sps_1.h
@@ -62,7 +62,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 f1f9ca8..c25a495 100644
--- a/include/configs/sh7752evb.h
+++ b/include/configs/sh7752evb.h
@@ -29,7 +29,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 d7ed65b..5ba12c4 100644
--- a/include/configs/sh7753evb.h
+++ b/include/configs/sh7753evb.h
@@ -29,7 +29,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 cf514b6..789d026 100644
--- a/include/configs/sh7757lcr.h
+++ b/include/configs/sh7757lcr.h
@@ -29,7 +29,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 7148f1d..3271ac6 100644
--- a/include/configs/sh7763rdp.h
+++ b/include/configs/sh7763rdp.h
@@ -22,7 +22,6 @@
 #define CONFIG_CMD_PING
 #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 2ba0c58..e4b45a0 100644
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -26,7 +26,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 e11c016..ef07169 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -183,7 +183,6 @@
 #endif
 
 /* General Boot Parameter */
-#define CONFIG_BOOTDELAY		3
 #define CONFIG_BOOTCOMMAND		"run flashboot"
 #define CONFIG_BOOT_RETRY_TIME          30
 #define CONFIG_SYS_CBSIZE		512
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index a6bfa76..e748f6f 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -89,7 +89,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 4ec9c65..b7175f3 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -72,8 +72,6 @@
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_MTDPARTS
 
-#define CONFIG_BOOTDELAY	3
-
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 
 #define CONFIG_MTD_DEVICE
diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index 7758b0f..84244d6 100644
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -119,7 +119,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/sniper.h b/include/configs/sniper.h
index a0ee5bd..f989f29 100644
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -282,7 +282,6 @@
  */
 
 #define CONFIG_SYS_LOAD_ADDR	0x82000000
-#define CONFIG_BOOTDELAY	1
 
 #define CONFIG_ANDROID_BOOT_IMAGE
 
diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h
index 3043de2..40881ea 100644
--- a/include/configs/socfpga_arria5_socdk.h
+++ b/include/configs/socfpga_arria5_socdk.h
@@ -34,7 +34,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 7155cfd..fa751b5 100644
--- a/include/configs/socfpga_cyclone5_socdk.h
+++ b/include/configs/socfpga_cyclone5_socdk.h
@@ -34,7 +34,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 3e459d7..ef35adb 100644
--- a/include/configs/socfpga_de0_nano_soc.h
+++ b/include/configs/socfpga_de0_nano_soc.h
@@ -34,7 +34,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)
 #ifdef CONFIG_SOCFPGA_VIRTUAL_TARGET
diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h
index 315e3e8..a70645e 100644
--- a/include/configs/socfpga_mcvevk.h
+++ b/include/configs/socfpga_mcvevk.h
@@ -34,7 +34,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 068a72f..775fd02 100644
--- a/include/configs/socfpga_sockit.h
+++ b/include/configs/socfpga_sockit.h
@@ -34,7 +34,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)
 #ifdef CONFIG_SOCFPGA_VIRTUAL_TARGET
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 50911ae..ed37e2e 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -366,8 +366,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;" \
 	"echo"
diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index edae831..cd710c9 100644
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -112,12 +112,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 19d9cf9..32311fb 100644
--- a/include/configs/stm32f429-discovery.h
+++ b/include/configs/stm32f429-discovery.h
@@ -92,7 +92,6 @@
 	"bootcmd_romfs=setenv bootargs ${bootargs} ${bootargs_romfs};" \
 	"bootm 0x08044000 - 0x08042000\0"
 
-#define CONFIG_BOOTDELAY		3
 #define CONFIG_AUTOBOOT
 
 /*
diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h
index b1b6919..9338cd4 100644
--- a/include/configs/stv0991.h
+++ b/include/configs/stv0991.h
@@ -70,7 +70,6 @@
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CMDLINE_EDITING
 
-#define CONFIG_BOOTDELAY                       3
 #define CONFIG_BOOTCOMMAND                     "go 0x40040000"
 
 #define CONFIG_OF_LIBFDT
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index bd1c07c..17068cc 100644
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -137,7 +137,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 b095d9a..64b732f 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -65,8 +65,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 41c2c72..909bd03 100644
--- a/include/configs/tb100.h
+++ b/include/configs/tb100.h
@@ -87,7 +87,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 4024468..40c6d98 100644
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -80,7 +80,6 @@
 
 #ifndef CONFIG_RESTORE_FLASH
 /* set to negative value for no autoboot */
-#define CONFIG_BOOTDELAY		3
 
 #define CONFIG_BOOTCOMMAND \
 "if dfubutton; then " \
@@ -93,7 +92,6 @@
 
 
 #else
-#define CONFIG_BOOTDELAY		0
 
 #define CONFIG_BOOTCOMMAND			\
 	"setenv autoload no; "			\
diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index ceeb7fe..c381b27 100644
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -41,7 +41,6 @@
 #define CONFIG_CMD_ASKENV
 #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 4c19289..08a686a 100644
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -35,7 +35,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/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 1ebf7bc..690a68e 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -68,11 +68,6 @@
 		"rootfstype=${mmcrootfstype}\0"
 
 /*
- * Default to a quick boot delay.
- */
-#define CONFIG_BOOTDELAY		1
-
-/*
  * DDR information.  If the CONFIG_NR_DRAM_BANKS is not defined,
  * we say (for simplicity) that we have 1 bank, always, even when
  * we have more.  We always start at 0x80000000, and we place the
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index f04b572..94a8b13 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -169,8 +169,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 6f89f03..7719ca0 100644
--- a/include/configs/ts4800.h
+++ b/include/configs/ts4800.h
@@ -101,9 +101,6 @@
 #undef CONFIG_CMD_IMLS
 
 /* Environment variables */
-
-#define CONFIG_BOOTDELAY	1
-
 #define CONFIG_LOADADDR		0x91000000	/* loadaddr env var */
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/tseries.h b/include/configs/tseries.h
index 50ed380..d5e39a5 100644
--- a/include/configs/tseries.h
+++ b/include/configs/tseries.h
@@ -193,7 +193,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 4f5560f..67c0cc3 100644
--- a/include/configs/twister.h
+++ b/include/configs/twister.h
@@ -20,8 +20,6 @@
 #define CONFIG_TAM3517_SW3_SETTINGS
 #define CONFIG_XR16L2751
 
-#define CONFIG_BOOTDELAY	10
-
 #define CONFIG_BOOTFILE		"uImage"
 
 #define CONFIG_HOSTNAME twister
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 9109b7f..74abbcb 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -152,7 +152,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 10a1664..f9172e0 100644
--- a/include/configs/usb_a9263.h
+++ b/include/configs/usb_a9263.h
@@ -48,8 +48,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 3e51b9f..f15a697 100644
--- a/include/configs/v38b.h
+++ b/include/configs/v38b.h
@@ -110,11 +110,6 @@
 #define CONFIG_SYS_LOWBOOT		1
 #define CONFIG_SYS_LOWBOOT16		1
 
-/*
- * Autobooting
- */
-#define CONFIG_BOOTDELAY	3	/* autoboot after 3 seconds */
-
 #define CONFIG_PREBOOT	"echo;"	\
 	"echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
 	"echo"
diff --git a/include/configs/vct.h b/include/configs/vct.h
index 80f6a60..56fa53e 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -255,7 +255,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 a88216c..6d96fad 100644
--- a/include/configs/ve8313.h
+++ b/include/configs/ve8313.h
@@ -479,7 +479,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 6107c64..d57960a 100644
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -203,8 +203,6 @@
 				"fdt addr ${fdt_addr}; fdt resize; " \
 				"booti ${kernel_addr} - ${fdt_addr}"
 
-#define CONFIG_BOOTDELAY		1
-
 #elif CONFIG_TARGET_VEXPRESS64_BASE_FVP
 #define CONFIG_EXTRA_ENV_SETTINGS	\
 				"kernel_name=Image\0"		\
@@ -227,8 +225,6 @@
 				"fdt chosen ${initrd_addr} ${initrd_end}; " \
 				"booti $kernel_addr - $fdt_addr"
 
-#define CONFIG_BOOTDELAY		1
-
 #else
 #error "Unknown board variant"
 #endif
diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index 98f6ae9..bfd320a 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 708adae..059db7d 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -114,8 +114,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C2		/* enable I2C bus 2 */
 #define CONFIG_SYS_SPD_BUS_NUM		0
 
-#define CONFIG_BOOTDELAY		3
-
 #define CONFIG_LOADADDR			0x82000000
 
 /* We boot from the gfxRAM area of the OCRAM. */
diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index bc4a998..0e138f2 100644
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -555,7 +555,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/woodburn_common.h b/include/configs/woodburn_common.h
index fc46565..02a3e69 100644
--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@@ -109,8 +109,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 15ee284..cc8b2ee 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -184,7 +184,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 73ba67c..c3f7603 100644
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -134,8 +134,6 @@
 #define CONFIG_SUPPORT_VFAT
 #define CONFIG_DOS_PARTITION
 
-#define CONFIG_BOOTDELAY			3
-
 #define CONFIG_SYS_HUSH_PARSER			/* Use the HUSH parser	*/
 #define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
diff --git a/include/configs/xfi3.h b/include/configs/xfi3.h
index 0551580..2b4c3a4 100644
--- a/include/configs/xfi3.h
+++ b/include/configs/xfi3.h
@@ -35,7 +35,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 309d68d..5c4031c 100644
--- a/include/configs/xilinx-ppc.h
+++ b/include/configs/xilinx-ppc.h
@@ -42,7 +42,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 da87188..0a0a8ae 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -158,7 +158,6 @@
 				"earlycon=cdns,mmio,0xff000000,${baudrate}n8"
 #define CONFIG_PREBOOT		"run bootargs"
 #define CONFIG_BOOTCOMMAND	"run $modeboot"
-#define CONFIG_BOOTDELAY	5
 
 #define CONFIG_BOARD_LATE_INIT
 
diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h
index 4fafb5a..0668142 100644
--- a/include/configs/xpedite1000.h
+++ b/include/configs/xpedite1000.h
@@ -210,7 +210,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_FIT		1
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index b5d1126..eb55e50 100644
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -557,7 +557,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_FIT		1
diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h
index 34a124c..a8ef138 100644
--- a/include/configs/xpedite520x.h
+++ b/include/configs/xpedite520x.h
@@ -340,7 +340,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_FIT		1
diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h
index 0d24234..22310d3 100644
--- a/include/configs/xpedite537x.h
+++ b/include/configs/xpedite537x.h
@@ -412,7 +412,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_FIT		1
diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h
index f30d199..83d3ce1 100644
--- a/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@ -397,7 +397,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_FIT		1
diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index 81b9ce4..07fefe0 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -147,8 +147,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 e7ab50a..7e303ad 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -231,7 +231,6 @@
 		DFU_ALT_INFO
 
 #define CONFIG_BOOTCOMMAND		"run $modeboot"
-#define CONFIG_BOOTDELAY		3 /* -1 to Disable autoboot */
 #define CONFIG_SYS_LOAD_ADDR		0 /* default? */
 
 /* Miscellaneous configurable options */
-- 
2.4.9

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [U-Boot] [PATCH 1/2] Kconfig: add CONFIG_BOOTDELAY
  2015-10-08 19:10 ` [U-Boot] [PATCH 1/2] Kconfig: add CONFIG_BOOTDELAY Igor Grinberg
@ 2015-10-09  9:36   ` Simon Glass
  2015-10-12 18:52     ` Igor Grinberg
  0 siblings, 1 reply; 6+ messages in thread
From: Simon Glass @ 2015-10-09  9:36 UTC (permalink / raw)
  To: u-boot

Hi Igor,

On 8 October 2015 at 20:10, Igor Grinberg <grinberg@compulab.co.il> wrote:
> Add CONFIG_BOOTDELAY to the Kconfig.
> Default it to 3 seconds according to the majority of configs.
>
> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>  common/Kconfig | 10 ++++++++++
>  1 file changed, 10 insertions(+)
>
> diff --git a/common/Kconfig b/common/Kconfig
> index d98eb19..e13d255 100644
> --- a/common/Kconfig
> +++ b/common/Kconfig
> @@ -100,6 +100,16 @@ config AUTOBOOT_STOP_STR_SHA256
>           string / password matches a values that is encypted via
>           a SHA256 hash and saved in the environment.
>
> +config BOOTDELAY
> +       int "Seconds to delay before autobooting"
> +       default 3
> +       help
> +         Delay before automatically booting the default image;
> +         set to -1 to disable autoboot.
> +         set to -2 to autoboot with no delay and not check for abort
> +         (even when CONFIG_ZERO_BOOTDELAY_CHECK is defined).
> +         See doc/README.autoboot for additional information.
> +
>  endmenu
>
>  comment "Commands"
> --
> 2.4.9
>

It's great that you are taking on these difficult ones.

IMO we should split this config into a few parts:

- enabling the boot-delay feature
- setting the boot-delay time
- whether to allow abort
- whether to allow abort even when boot delay is 0

The way it is written -2 sounds like a weird case that would be better
merged with the last one above.

Regards,
Simon

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [U-Boot] [PATCH 1/2] Kconfig: add CONFIG_BOOTDELAY
  2015-10-09  9:36   ` Simon Glass
@ 2015-10-12 18:52     ` Igor Grinberg
  2015-10-12 18:57       ` Simon Glass
  0 siblings, 1 reply; 6+ messages in thread
From: Igor Grinberg @ 2015-10-12 18:52 UTC (permalink / raw)
  To: u-boot

Hi Simon,

On 10/09/15 12:36, Simon Glass wrote:
> Hi Igor,
> 
> On 8 October 2015 at 20:10, Igor Grinberg <grinberg@compulab.co.il> wrote:
>> Add CONFIG_BOOTDELAY to the Kconfig.
>> Default it to 3 seconds according to the majority of configs.
>>
>> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
>> Cc: Simon Glass <sjg@chromium.org>
>> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
>> ---
>>  common/Kconfig | 10 ++++++++++
>>  1 file changed, 10 insertions(+)
>>
>> diff --git a/common/Kconfig b/common/Kconfig
>> index d98eb19..e13d255 100644
>> --- a/common/Kconfig
>> +++ b/common/Kconfig
>> @@ -100,6 +100,16 @@ config AUTOBOOT_STOP_STR_SHA256
>>           string / password matches a values that is encypted via
>>           a SHA256 hash and saved in the environment.
>>
>> +config BOOTDELAY
>> +       int "Seconds to delay before autobooting"
>> +       default 3
>> +       help
>> +         Delay before automatically booting the default image;
>> +         set to -1 to disable autoboot.
>> +         set to -2 to autoboot with no delay and not check for abort
>> +         (even when CONFIG_ZERO_BOOTDELAY_CHECK is defined).
>> +         See doc/README.autoboot for additional information.
>> +
>>  endmenu
>>
>>  comment "Commands"
>> --
>> 2.4.9
>>
> 
> It's great that you are taking on these difficult ones.

Thanks...

> 
> IMO we should split this config into a few parts:
> 
> - enabling the boot-delay feature
> - setting the boot-delay time
> - whether to allow abort
> - whether to allow abort even when boot delay is 0
> 
> The way it is written -2 sounds like a weird case that would be better
> merged with the last one above.

I completely agree with you. This is indeed the better way, AFAICS.
Although, I'm not sure I can work on this right now.
How about having it currently the way above and adjusting it later
(when one/me has the time to do it)?


-- 
Regards,
Igor.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [U-Boot] [PATCH 1/2] Kconfig: add CONFIG_BOOTDELAY
  2015-10-12 18:52     ` Igor Grinberg
@ 2015-10-12 18:57       ` Simon Glass
  0 siblings, 0 replies; 6+ messages in thread
From: Simon Glass @ 2015-10-12 18:57 UTC (permalink / raw)
  To: u-boot

Hi Igor,

On 12 October 2015 at 12:52, Igor Grinberg <grinberg@compulab.co.il> wrote:
> Hi Simon,
>
> On 10/09/15 12:36, Simon Glass wrote:
>> Hi Igor,
>>
>> On 8 October 2015 at 20:10, Igor Grinberg <grinberg@compulab.co.il> wrote:
>>> Add CONFIG_BOOTDELAY to the Kconfig.
>>> Default it to 3 seconds according to the majority of configs.
>>>
>>> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
>>> Cc: Simon Glass <sjg@chromium.org>
>>> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
>>> ---
>>>  common/Kconfig | 10 ++++++++++
>>>  1 file changed, 10 insertions(+)
>>>
>>> diff --git a/common/Kconfig b/common/Kconfig
>>> index d98eb19..e13d255 100644
>>> --- a/common/Kconfig
>>> +++ b/common/Kconfig
>>> @@ -100,6 +100,16 @@ config AUTOBOOT_STOP_STR_SHA256
>>>           string / password matches a values that is encypted via
>>>           a SHA256 hash and saved in the environment.
>>>
>>> +config BOOTDELAY
>>> +       int "Seconds to delay before autobooting"
>>> +       default 3
>>> +       help
>>> +         Delay before automatically booting the default image;
>>> +         set to -1 to disable autoboot.
>>> +         set to -2 to autoboot with no delay and not check for abort
>>> +         (even when CONFIG_ZERO_BOOTDELAY_CHECK is defined).
>>> +         See doc/README.autoboot for additional information.
>>> +
>>>  endmenu
>>>
>>>  comment "Commands"
>>> --
>>> 2.4.9
>>>
>>
>> It's great that you are taking on these difficult ones.
>
> Thanks...
>
>>
>> IMO we should split this config into a few parts:
>>
>> - enabling the boot-delay feature
>> - setting the boot-delay time
>> - whether to allow abort
>> - whether to allow abort even when boot delay is 0
>>
>> The way it is written -2 sounds like a weird case that would be better
>> merged with the last one above.
>
> I completely agree with you. This is indeed the better way, AFAICS.
> Although, I'm not sure I can work on this right now.
> How about having it currently the way above and adjusting it later
> (when one/me has the time to do it)?

I suspect it would be better to wait. The problem is that moving a
broken/painful config to Kconfig is not really a step forward. It just
makes more work for someone later I think. It is probably better to do
it right from the start.

Regards,
Simon

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2015-10-12 18:57 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-08 19:10 [U-Boot] [PATCH 0/2] config: move CONFIG_BOOTDELAY to defconfig Igor Grinberg
2015-10-08 19:10 ` [U-Boot] [PATCH 1/2] Kconfig: add CONFIG_BOOTDELAY Igor Grinberg
2015-10-09  9:36   ` Simon Glass
2015-10-12 18:52     ` Igor Grinberg
2015-10-12 18:57       ` Simon Glass
2015-10-08 19:10 ` [U-Boot] [PATCH 2/2] config: move CONFIG_BOOTDELAY to defconfig Igor Grinberg

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.