Make more use of the Kconfig and move CONFIG_BOOTDELAY config option to defconfigs for ti omap/am based boards.
Signed-off-by: Igor Grinberg grinberg@compulab.co.il Cc: Yegor Yefremov yegorslists@googlemail.com Cc: Enric Balletbo i Serra eballetbo@iseebcn.com Cc: Lokesh Vutla lokeshvutla@ti.com Cc: Felipe Balbi balbi@ti.com Cc: Gilles Gameiro gilles@gigadevices.com Cc: "Albert ARIBAUD (3ADEV)" albert.aribaud@3adev.fr Cc: Nikita Kiryanov nikita@compulab.co.il Cc: Dmitry Lifshitz lifshitz@compulab.co.il Cc: Thomas Weber weber@corscience.de Cc: Ash Charles ash@gumstix.com Cc: Vitaly Andrianov vitalya@ti.com Cc: Steve Sakoman sakoman@gmail.com Cc: Grazvydas Ignotas notasas@gmail.com Cc: Nishanth Menon nm@ti.com Cc: Lars Poeschel poeschel@lemonage.de Cc: Lothar Felten lothar.felten@gmail.com --- configs/am335x_baltos_defconfig | 2 ++ configs/am335x_evm_defconfig | 2 ++ configs/am335x_evm_nor_defconfig | 2 ++ configs/am335x_evm_norboot_defconfig | 2 ++ configs/am335x_evm_spiboot_defconfig | 2 ++ configs/am335x_evm_usbspl_defconfig | 2 ++ configs/am335x_gp_evm_defconfig | 2 ++ configs/am335x_igep0033_defconfig | 2 ++ configs/am43xx_evm_defconfig | 2 ++ configs/am43xx_evm_ethboot_defconfig | 2 ++ configs/am43xx_evm_qspiboot_defconfig | 2 ++ configs/am43xx_evm_usbhost_boot_defconfig | 2 ++ configs/beagle_x15_defconfig | 2 ++ configs/birdland_bav335a_defconfig | 2 ++ configs/birdland_bav335b_defconfig | 2 ++ configs/cairo_defconfig | 2 ++ configs/cm_t335_defconfig | 2 ++ configs/cm_t35_defconfig | 2 ++ configs/cm_t43_defconfig | 2 ++ configs/cm_t54_defconfig | 2 ++ configs/devkit8000_defconfig | 2 ++ configs/dra72_evm_defconfig | 2 ++ configs/dra7xx_evm_defconfig | 2 ++ configs/dra7xx_evm_qspiboot_defconfig | 2 ++ configs/dra7xx_evm_uart3_defconfig | 2 ++ configs/duovero_defconfig | 2 ++ configs/igep0020_defconfig | 2 ++ configs/igep0020_nand_defconfig | 2 ++ configs/igep0030_defconfig | 2 ++ configs/igep0030_nand_defconfig | 2 ++ configs/igep0032_defconfig | 2 ++ configs/k2e_evm_defconfig | 2 ++ configs/k2hk_evm_defconfig | 2 ++ configs/k2l_evm_defconfig | 2 ++ configs/omap3_beagle_defconfig | 2 ++ configs/omap3_overo_defconfig | 2 ++ configs/omap3_pandora_defconfig | 2 ++ configs/omap3_zoom1_defconfig | 2 ++ configs/omap4_panda_defconfig | 2 ++ configs/omap4_sdp4430_defconfig | 2 ++ configs/omap5_uevm_defconfig | 2 ++ configs/pcm051_rev1_defconfig | 2 ++ configs/pcm051_rev3_defconfig | 2 ++ configs/pengwyn_defconfig | 2 ++ configs/pepper_defconfig | 2 ++ include/config_distro_defaults.h | 2 ++ include/configs/cm_t35.h | 1 - include/configs/cm_t43.h | 1 - include/configs/cm_t54.h | 3 --- include/configs/omap3_cairo.h | 3 --- include/configs/ti_armv7_common.h | 5 ----- 51 files changed, 92 insertions(+), 13 deletions(-)
diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index 6d0fe07..e7f8f27 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -13,3 +13,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 21a9255..54e5190 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -12,3 +12,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index 30fa585..cacb111 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -12,3 +12,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig index f565851..fe00c82 100644 --- a/configs/am335x_evm_norboot_defconfig +++ b/configs/am335x_evm_norboot_defconfig @@ -8,3 +8,5 @@ CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig index bb4dbc2..e10e3cb 100644 --- a/configs/am335x_evm_spiboot_defconfig +++ b/configs/am335x_evm_spiboot_defconfig @@ -11,3 +11,5 @@ CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index e350e5d..a237dbf 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -12,3 +12,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/am335x_gp_evm_defconfig b/configs/am335x_gp_evm_defconfig index facf419..0496bac 100644 --- a/configs/am335x_gp_evm_defconfig +++ b/configs/am335x_gp_evm_defconfig @@ -15,3 +15,5 @@ CONFIG_RSA=y CONFIG_HUSH_PARSER=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/am335x_igep0033_defconfig b/configs/am335x_igep0033_defconfig index 991a3d2..8489d5d 100644 --- a/configs/am335x_igep0033_defconfig +++ b/configs/am335x_igep0033_defconfig @@ -10,3 +10,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 39c148d..8dd0259 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -11,3 +11,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index 5c696a9..ba0b96e 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -10,3 +10,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig index 0ea07a3..c6b2913 100644 --- a/configs/am43xx_evm_qspiboot_defconfig +++ b/configs/am43xx_evm_qspiboot_defconfig @@ -8,3 +8,5 @@ CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index f00b064..b4ff861 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -10,3 +10,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/beagle_x15_defconfig b/configs/beagle_x15_defconfig index c761fd5..8c7d63a 100644 --- a/configs/beagle_x15_defconfig +++ b/configs/beagle_x15_defconfig @@ -9,3 +9,5 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=3" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig index a33fbbf..6adde6c 100644 --- a/configs/birdland_bav335a_defconfig +++ b/configs/birdland_bav335a_defconfig @@ -10,3 +10,5 @@ CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig index 0eae440..5f4b2ca 100644 --- a/configs/birdland_bav335b_defconfig +++ b/configs/birdland_bav335b_defconfig @@ -10,3 +10,5 @@ CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig index 95edf0d..3ace5aa 100644 --- a/configs/cairo_defconfig +++ b/configs/cairo_defconfig @@ -12,3 +12,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=0 diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig index 7dd6e09..0df5b78 100644 --- a/configs/cm_t335_defconfig +++ b/configs/cm_t335_defconfig @@ -9,3 +9,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=3 diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig index 0a5e03a..8b4891f 100644 --- a/configs/cm_t35_defconfig +++ b/configs/cm_t35_defconfig @@ -4,6 +4,8 @@ CONFIG_TARGET_CM_T35=y CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="CM-T3x # " +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=3 CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig index 9ee6c1f..2db596e 100644 --- a/configs/cm_t43_defconfig +++ b/configs/cm_t43_defconfig @@ -12,3 +12,5 @@ CONFIG_DM_GPIO=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=3 diff --git a/configs/cm_t54_defconfig b/configs/cm_t54_defconfig index c840c15..ae5b276 100644 --- a/configs/cm_t54_defconfig +++ b/configs/cm_t54_defconfig @@ -10,3 +10,5 @@ CONFIG_SYS_PROMPT="CM-T54 # " CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=3 diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index 99bf124..a7cefa0 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -10,3 +10,5 @@ CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/dra72_evm_defconfig b/configs/dra72_evm_defconfig index 6e54760..a3d3f5f 100644 --- a/configs/dra72_evm_defconfig +++ b/configs/dra72_evm_defconfig @@ -18,3 +18,5 @@ CONFIG_DM_GPIO=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index 0bc92de..8125933 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -13,3 +13,5 @@ CONFIG_SPI_FLASH_BAR=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/dra7xx_evm_qspiboot_defconfig b/configs/dra7xx_evm_qspiboot_defconfig index 6812bd8..cb89293 100644 --- a/configs/dra7xx_evm_qspiboot_defconfig +++ b/configs/dra7xx_evm_qspiboot_defconfig @@ -13,3 +13,5 @@ CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/dra7xx_evm_uart3_defconfig b/configs/dra7xx_evm_uart3_defconfig index b603c5c..4e7d6d6 100644 --- a/configs/dra7xx_evm_uart3_defconfig +++ b/configs/dra7xx_evm_uart3_defconfig @@ -14,3 +14,5 @@ CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/duovero_defconfig b/configs/duovero_defconfig index d0aed0e..7e511b1 100644 --- a/configs/duovero_defconfig +++ b/configs/duovero_defconfig @@ -10,3 +10,5 @@ CONFIG_SYS_PROMPT="duovero # " CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig index bb961b8..96051d0 100644 --- a/configs/igep0020_defconfig +++ b/configs/igep0020_defconfig @@ -9,3 +9,5 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_ONENAND" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/igep0020_nand_defconfig b/configs/igep0020_nand_defconfig index b0c9dff..9e0fbe4 100644 --- a/configs/igep0020_nand_defconfig +++ b/configs/igep0020_nand_defconfig @@ -10,3 +10,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig index 84b0ad3..3e6688f 100644 --- a/configs/igep0030_defconfig +++ b/configs/igep0030_defconfig @@ -9,3 +9,5 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_ONENAND" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/igep0030_nand_defconfig b/configs/igep0030_nand_defconfig index da2f08b..ce6a1f9 100644 --- a/configs/igep0030_nand_defconfig +++ b/configs/igep0030_nand_defconfig @@ -10,3 +10,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index 1c39ca7..decfc9b 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -9,3 +9,5 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0032,BOOT_ONENAND" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig index 66fb304..a619ebf 100644 --- a/configs/k2e_evm_defconfig +++ b/configs/k2e_evm_defconfig @@ -10,3 +10,5 @@ CONFIG_SYS_PROMPT="K2E EVM # " CONFIG_SPI_FLASH=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig index db41afb..0af7b31 100644 --- a/configs/k2hk_evm_defconfig +++ b/configs/k2hk_evm_defconfig @@ -10,3 +10,5 @@ CONFIG_SYS_PROMPT="K2HK EVM # " CONFIG_SPI_FLASH=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig index ded5e1a..7d14ad4 100644 --- a/configs/k2l_evm_defconfig +++ b/configs/k2l_evm_defconfig @@ -10,3 +10,5 @@ CONFIG_SYS_PROMPT="K2L EVM # " CONFIG_SPI_FLASH=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index 2a5b387..c70138b 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -9,3 +9,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig index 58aef94..2febe18 100644 --- a/configs/omap3_overo_defconfig +++ b/configs/omap3_overo_defconfig @@ -13,3 +13,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig index f38560b..02460c5 100644 --- a/configs/omap3_pandora_defconfig +++ b/configs/omap3_pandora_defconfig @@ -13,3 +13,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/omap3_zoom1_defconfig b/configs/omap3_zoom1_defconfig index ff3a5b7..5612daa 100644 --- a/configs/omap3_zoom1_defconfig +++ b/configs/omap3_zoom1_defconfig @@ -10,3 +10,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig index 51d4016..1d0286c 100644 --- a/configs/omap4_panda_defconfig +++ b/configs/omap4_panda_defconfig @@ -9,3 +9,5 @@ CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/omap4_sdp4430_defconfig b/configs/omap4_sdp4430_defconfig index faec951..4147b50 100644 --- a/configs/omap4_sdp4430_defconfig +++ b/configs/omap4_sdp4430_defconfig @@ -10,3 +10,5 @@ CONFIG_HUSH_PARSER=y # CONFIG_CMD_NFS is not set CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig index 6eccb2c..2044ad0 100644 --- a/configs/omap5_uevm_defconfig +++ b/configs/omap5_uevm_defconfig @@ -8,3 +8,5 @@ CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig index 10b9c4e..60e9e7f 100644 --- a/configs/pcm051_rev1_defconfig +++ b/configs/pcm051_rev1_defconfig @@ -9,3 +9,5 @@ CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig index bc0dfba..8d5db36 100644 --- a/configs/pcm051_rev3_defconfig +++ b/configs/pcm051_rev3_defconfig @@ -9,3 +9,5 @@ CONFIG_SPI_FLASH=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index ac63654..397d80c 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -8,3 +8,5 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/configs/pepper_defconfig b/configs/pepper_defconfig index bdaf904..400d843 100644 --- a/configs/pepper_defconfig +++ b/configs/pepper_defconfig @@ -8,3 +8,5 @@ CONFIG_SYS_PROMPT="pepper# " CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_I2C=y +CONFIG_AUTOBOOT_BOOTDELAY=y +CONFIG_BOOTDELAY=1 diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h index e12dc4e..b7828b5 100644 --- a/include/config_distro_defaults.h +++ b/include/config_distro_defaults.h @@ -62,7 +62,9 @@
#define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE +#ifndef CONFIG_BOOTDELAY #define CONFIG_BOOTDELAY 2 +#endif #define CONFIG_SYS_LONGHELP #define CONFIG_MENU #define CONFIG_DOS_PARTITION diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index d98ee40..e68d033 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -155,7 +155,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..0aba379 100644 --- a/include/configs/cm_t54.h +++ b/include/configs/cm_t54.h @@ -107,15 +107,12 @@ #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 \ DEFAULT_LINUX_BOOT_ENV \ "baudrate=115200\0" \ - "bootdelay=3\0" \ "autoload=no\0" \ "bootscr=bootscr.img\0" \ "fdtfile=omap5-sbc-t54.dtb\0" \ diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index 3f777b6..aaa7572 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -73,9 +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" \ diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 6924508..118381b 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -59,11 +59,6 @@ "bootm_size=0x10000000\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