[U-Boot] [PATCH v3 0/6] autoboot cleanups
1/6 moves CONFIG_BOOTDELAY for a new SOCFPGA board.
The rest of this series are clean-ups of autoboot code.
Masahiro Yamada (6): ARM: socfpga: move CONFIG_BOOTDELAY to Kconfig for IS1 board doc: bootdelay: drop explanation about CONFIG_BOOTDELAY from README autoboot: remove CONFIG_ZERO_BOOTDELAY_CHECK autoboot: rename abortboot_{keyed, normal} to __abortboot autoboot: move CONFIG_SILENT_CONSOLE handling autoboot: move bootdelay >= 0 check to abortboot()
README | 17 -------- common/Kconfig | 4 +- common/autoboot.c | 49 ++++++++-------------- configs/brppt1_mmc_defconfig | 2 +- configs/brppt1_nand_defconfig | 2 +- configs/brppt1_spi_defconfig | 2 +- configs/brxre1_defconfig | 2 +- configs/cairo_defconfig | 2 +- .../controlcenterd_TRAILBLAZER_DEVELOP_defconfig | 2 +- configs/controlcenterd_TRAILBLAZER_defconfig | 2 +- configs/omap3_evm_quick_mmc_defconfig | 2 +- configs/omap3_evm_quick_nand_defconfig | 2 +- configs/socfpga_is1_defconfig | 4 +- doc/README.autoboot | 8 ---- include/configs/CPCI2DP.h | 2 - include/configs/CPCI4052.h | 2 - include/configs/MIP405.h | 1 - include/configs/PIP405.h | 1 - include/configs/PLU405.h | 1 - include/configs/PMC405DE.h | 1 - include/configs/PMC440.h | 1 - include/configs/VCMA9.h | 1 - include/configs/VOM405.h | 1 - include/configs/a3m071.h | 1 - include/configs/amcc-common.h | 1 - include/configs/apf27.h | 1 - include/configs/calimain.h | 1 - include/configs/cm_t35.h | 2 - include/configs/cm_t3517.h | 2 - include/configs/cm_t43.h | 1 - include/configs/devkit3250.h | 1 - include/configs/digsy_mtc.h | 1 - include/configs/dlvision-10g.h | 2 - include/configs/exynos-common.h | 2 - include/configs/gdppc440etx.h | 2 - include/configs/hrcon.h | 2 - include/configs/intip.h | 2 - include/configs/io.h | 2 - include/configs/io64.h | 2 - include/configs/iocon.h | 2 - include/configs/legoev3.h | 1 - include/configs/meesc.h | 2 - include/configs/omap3_logic.h | 1 - include/configs/pcm030.h | 5 --- include/configs/r7780mp.h | 3 -- include/configs/s5p_goni.h | 2 - include/configs/smdk2410.h | 1 - include/configs/smdkc100.h | 3 -- include/configs/snapper9260.h | 1 - include/configs/snapper9g45.h | 1 - include/configs/socfpga_is1.h | 1 - include/configs/spear-common.h | 1 - include/configs/strider.h | 2 - include/configs/theadorable.h | 1 - include/configs/tricorder.h | 1 - include/configs/uniphier.h | 2 - include/configs/vinco.h | 1 - include/configs/work_92105.h | 2 - include/configs/x600.h | 1 - include/configs/xilinx-ppc.h | 1 - 60 files changed, 30 insertions(+), 141 deletions(-)
This recently added board missed the tree-wide migration of CONFIG_BOOTDELAY.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com Acked-by: Pavel Machek pavel@denx.de Reviewed-by: Heiko Schocher hs@denx.de ---
Changes in v3: None Changes in v2: None
configs/socfpga_is1_defconfig | 4 +--- include/configs/socfpga_is1.h | 1 - 2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/configs/socfpga_is1_defconfig b/configs/socfpga_is1_defconfig index 7d43c72..658770b 100644 --- a/configs/socfpga_is1_defconfig +++ b/configs/socfpga_is1_defconfig @@ -9,14 +9,13 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_is1" CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_FIT=y +CONFIG_BOOTDELAY=3 CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y -# CONFIG_CMD_MEMTEST is not set # CONFIG_CMD_FLASH is not set -# CONFIG_CMD_MMC is not set CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y @@ -36,7 +35,6 @@ CONFIG_SYS_I2C_DW=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y -CONFIG_SPI_FLASH_USE_4K_SECTORS=y CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_SYS_NS16550=y diff --git a/include/configs/socfpga_is1.h b/include/configs/socfpga_is1.h index 6f5dfce..cc07253 100644 --- a/include/configs/socfpga_is1.h +++ b/include/configs/socfpga_is1.h @@ -19,7 +19,6 @@ #define PHYS_SDRAM_1_SIZE 0x10000000
/* Booting Linux */ -#define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTFILE "zImage" #define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE) #define CONFIG_LOADADDR 0x01000000
On 27.06.2016 09:22, Masahiro Yamada wrote:
This recently added board missed the tree-wide migration of CONFIG_BOOTDELAY.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com Acked-by: Pavel Machek pavel@denx.de Reviewed-by: Heiko Schocher hs@denx.de
Reviewed-by: Stefan Roese sr@denx.de
Thanks, Stefan
On Mon, Jun 27, 2016 at 04:22:59PM +0900, Masahiro Yamada wrote:
This recently added board missed the tree-wide migration of CONFIG_BOOTDELAY.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com Acked-by: Pavel Machek pavel@denx.de Reviewed-by: Heiko Schocher hs@denx.de Reviewed-by: Stefan Roese sr@denx.de
Applied to u-boot/master, thanks!
The same information now exists in common/Kconfig. Do not duplicate documentation from the point of view of maintainability.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com Reviewed-by: Simon Glass sjg@chromium.org Reviewed-by: Heiko Schocher hs@denx.de ---
Changes in v3: None Changes in v2: None
README | 17 ----------------- common/Kconfig | 2 ++ 2 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/README b/README index 03bed18..26d5ad2 100644 --- a/README +++ b/README @@ -890,23 +890,6 @@ The following options need to be configured: 'Sane' compilers will generate smaller code if CONFIG_PRE_CON_BUF_SZ is a power of 2
-- Boot Delay: CONFIG_BOOTDELAY - in seconds - 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 these options that - work with CONFIG_BOOTDELAY. None are required. - CONFIG_BOOT_RETRY_TIME - CONFIG_BOOT_RETRY_MIN - CONFIG_AUTOBOOT_KEYED - CONFIG_AUTOBOOT_PROMPT - CONFIG_AUTOBOOT_DELAY_STR - CONFIG_AUTOBOOT_STOP_STR - CONFIG_ZERO_BOOTDELAY_CHECK - CONFIG_RESET_TO_RETRY - - Autoboot Command: CONFIG_BOOTCOMMAND Only needed when CONFIG_BOOTDELAY is enabled; diff --git a/common/Kconfig b/common/Kconfig index ada4ddb..a94c7b9 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -107,6 +107,8 @@ config BOOTDELAY 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 details. + config CONSOLE_RECORD bool "Console recording" help
On Mon, Jun 27, 2016 at 04:23:00PM +0900, Masahiro Yamada wrote:
The same information now exists in common/Kconfig. Do not duplicate documentation from the point of view of maintainability.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com Reviewed-by: Simon Glass sjg@chromium.org Reviewed-by: Heiko Schocher hs@denx.de
Applied to u-boot/master, thanks!
As the help message of CONFIG_BOOTDELAY says, CONFIG_BOOTDELAY=-2 means the autoboot with no delay, with no abort check even if CONFIG_ZERO_BOOTDELAY_CHECK is defined.
To sum up, the autoboot behaves as follows:
[1] CONFIG_BOOTDELAY=0 && CONFIG_ZERO_BOOTDELAY_CHECK=y autoboot with no delay, but you can abort it by key input
[2] CONFIG_BOOTDELAY=0 && CONFIG_ZERO_BOOTDELAY_CHECK=n autoboot with no delay, with no check for abort
[3] CONFIG_BOOTDELAY=-1 disable autoboot
[4] CONFIG_BOOTDELAY=-2 autoboot with no delay, with no check for abort
As you notice, [2] and [4] come to the same result, which means we do not need CONFIG_ZERO_BOOTDELAY_CHECK. We can control all the cases only by CONFIG_BOOTDELAY, like this:
[1] CONFIG_BOOTDELAY=0 autoboot with no delay, but you can abort it by key input
[2] CONFIG_BOOTDELAY=-1 disable autoboot
[3] CONFIG_BOOTDELAY=-2 autoboot with no delay, with no check for abort
This commit converts the logic as follow: CONFIG_BOOTDELAY=0 && CONFIG_ZERO_BOOTDELAY_CHECK=n --> CONFIG_BOOTDELAY=-2
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com Reviewed-by: Stefan Roese sr@denx.de Acked-by: Igor Grinberg grinberg@compulab.co.il Reviewed-by: Simon Glass sjg@chromium.org Acked-by: Vladimir Zapolskiy vz@mleia.com Reviewed-by: Heiko Schocher hs@denx.de Acked-by: Christian Riesch christian.riesch@omicronenergy.com Acked-by: Hannes Schmelzer hannes.schmelzer@br-automation.com ---
Changes in v3: - Tidy up garbages after CONFIG_ZERO_BOOTDELAY_CHECK removes
Changes in v2: None
common/Kconfig | 2 +- common/autoboot.c | 6 +----- configs/brppt1_mmc_defconfig | 2 +- configs/brppt1_nand_defconfig | 2 +- configs/brppt1_spi_defconfig | 2 +- configs/brxre1_defconfig | 2 +- configs/cairo_defconfig | 2 +- configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig | 2 +- configs/controlcenterd_TRAILBLAZER_defconfig | 2 +- configs/omap3_evm_quick_mmc_defconfig | 2 +- configs/omap3_evm_quick_nand_defconfig | 2 +- doc/README.autoboot | 8 -------- include/configs/CPCI2DP.h | 2 -- include/configs/CPCI4052.h | 2 -- include/configs/MIP405.h | 1 - include/configs/PIP405.h | 1 - include/configs/PLU405.h | 1 - include/configs/PMC405DE.h | 1 - include/configs/PMC440.h | 1 - include/configs/VCMA9.h | 1 - include/configs/VOM405.h | 1 - include/configs/a3m071.h | 1 - include/configs/amcc-common.h | 1 - include/configs/apf27.h | 1 - include/configs/calimain.h | 1 - include/configs/cm_t35.h | 2 -- include/configs/cm_t3517.h | 2 -- include/configs/cm_t43.h | 1 - include/configs/devkit3250.h | 1 - include/configs/digsy_mtc.h | 1 - include/configs/dlvision-10g.h | 2 -- include/configs/exynos-common.h | 2 -- include/configs/gdppc440etx.h | 2 -- include/configs/hrcon.h | 2 -- include/configs/intip.h | 2 -- include/configs/io.h | 2 -- include/configs/io64.h | 2 -- include/configs/iocon.h | 2 -- include/configs/legoev3.h | 1 - include/configs/meesc.h | 2 -- include/configs/omap3_logic.h | 1 - include/configs/pcm030.h | 5 ----- include/configs/r7780mp.h | 3 --- include/configs/s5p_goni.h | 2 -- include/configs/smdk2410.h | 1 - include/configs/smdkc100.h | 3 --- include/configs/snapper9260.h | 1 - include/configs/snapper9g45.h | 1 - include/configs/spear-common.h | 1 - include/configs/strider.h | 2 -- include/configs/theadorable.h | 1 - include/configs/tricorder.h | 1 - include/configs/uniphier.h | 2 -- include/configs/vinco.h | 1 - include/configs/work_92105.h | 2 -- include/configs/x600.h | 1 - include/configs/xilinx-ppc.h | 1 - 57 files changed, 11 insertions(+), 93 deletions(-)
diff --git a/common/Kconfig b/common/Kconfig index a94c7b9..aae754b 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -103,9 +103,9 @@ config BOOTDELAY depends on AUTOBOOT help Delay before automatically running bootcmd; + set to 0 to autoboot with no delay, but you can stop it by key input. 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 details.
diff --git a/common/autoboot.c b/common/autoboot.c index 223e062..35deece 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -187,10 +187,8 @@ static int abortboot_keyed(int bootdelay) int abort; uint64_t etime = endtick(bootdelay);
-#ifndef CONFIG_ZERO_BOOTDELAY_CHECK - if (bootdelay == 0) + if (bootdelay < 0) return 0; -#endif
# ifdef CONFIG_AUTOBOOT_PROMPT /* @@ -230,7 +228,6 @@ static int abortboot_normal(int bootdelay) printf("Hit any key to stop autoboot: %2d ", bootdelay); #endif
-#if defined CONFIG_ZERO_BOOTDELAY_CHECK /* * Check if key already pressed * Don't check if bootdelay < 0 @@ -242,7 +239,6 @@ static int abortboot_normal(int bootdelay) abort = 1; /* don't auto boot */ } } -#endif
while ((bootdelay > 0) && (!abort)) { --bootdelay; diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig index f8d9de5..cf2800b 100644 --- a/configs/brppt1_mmc_defconfig +++ b/configs/brppt1_mmc_defconfig @@ -3,7 +3,7 @@ CONFIG_TARGET_BRPPT1=y CONFIG_SPL=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT" -CONFIG_BOOTDELAY=0 +CONFIG_BOOTDELAY=-2 CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig index 85ddbe7..a14a130 100644 --- a/configs/brppt1_nand_defconfig +++ b/configs/brppt1_nand_defconfig @@ -3,7 +3,7 @@ CONFIG_TARGET_BRPPT1=y CONFIG_SPL=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND" -CONFIG_BOOTDELAY=0 +CONFIG_BOOTDELAY=-2 CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig index 37b8bc9..3b04c23 100644 --- a/configs/brppt1_spi_defconfig +++ b/configs/brppt1_spi_defconfig @@ -3,7 +3,7 @@ CONFIG_TARGET_BRPPT1=y CONFIG_SPL=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,SPI_BOOT,EMMC_BOOT" -CONFIG_BOOTDELAY=0 +CONFIG_BOOTDELAY=-2 CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig index 13617d3..2567a40 100644 --- a/configs/brxre1_defconfig +++ b/configs/brxre1_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_BRXRE1=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" -CONFIG_BOOTDELAY=0 +CONFIG_BOOTDELAY=-2 CONFIG_HUSH_PARSER=y # CONFIG_CMD_BOOTD is not set # CONFIG_CMD_BOOTM is not set diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig index 5257312..c529c7c 100644 --- a/configs/cairo_defconfig +++ b/configs/cairo_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_CAIRO=y CONFIG_SPL=y -CONFIG_BOOTDELAY=0 +CONFIG_BOOTDELAY=-2 CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Cairo # " CONFIG_CMD_BOOTZ=y diff --git a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig index b6f14db..efb8ad6 100644 --- a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig +++ b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig @@ -2,7 +2,7 @@ CONFIG_PPC=y CONFIG_MPC85xx=y CONFIG_TARGET_CONTROLCENTERD=y CONFIG_SYS_EXTRA_OPTIONS="TRAILBLAZER,SPIFLASH,DEVELOP" -CONFIG_BOOTDELAY=0 +CONFIG_BOOTDELAY=-2 # 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 2c45aff..45e8b8f 100644 --- a/configs/controlcenterd_TRAILBLAZER_defconfig +++ b/configs/controlcenterd_TRAILBLAZER_defconfig @@ -2,7 +2,7 @@ CONFIG_PPC=y CONFIG_MPC85xx=y CONFIG_TARGET_CONTROLCENTERD=y CONFIG_SYS_EXTRA_OPTIONS="TRAILBLAZER,SPIFLASH" -CONFIG_BOOTDELAY=0 +CONFIG_BOOTDELAY=-2 # CONFIG_CMD_BOOTM is not set # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/omap3_evm_quick_mmc_defconfig b/configs/omap3_evm_quick_mmc_defconfig index 801c959..ebdc105 100644 --- a/configs/omap3_evm_quick_mmc_defconfig +++ b/configs/omap3_evm_quick_mmc_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_EVM_QUICK_MMC=y CONFIG_SPL=y -CONFIG_BOOTDELAY=0 +CONFIG_BOOTDELAY=-2 CONFIG_SYS_PROMPT="OMAP3_EVM # " # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/configs/omap3_evm_quick_nand_defconfig b/configs/omap3_evm_quick_nand_defconfig index 8815fca..52b08b8 100644 --- a/configs/omap3_evm_quick_nand_defconfig +++ b/configs/omap3_evm_quick_nand_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_OMAP34XX=y CONFIG_TARGET_OMAP3_EVM_QUICK_NAND=y CONFIG_SPL=y -CONFIG_BOOTDELAY=0 +CONFIG_BOOTDELAY=-2 CONFIG_SYS_PROMPT="OMAP3_EVM # " # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set diff --git a/doc/README.autoboot b/doc/README.autoboot index 227e3b5..30fd0b0 100644 --- a/doc/README.autoboot +++ b/doc/README.autoboot @@ -132,14 +132,6 @@ What they do provides an escape sequence from the limited "password" strings.
- - CONFIG_ZERO_BOOTDELAY_CHECK - - If this option is defined, you can stop the autoboot process - by hitting a key even in that case when "bootdelay" has been - set to 0. You can set "bootdelay" to a negative value to - prevent the check for console input. - CONFIG_RESET_TO_RETRY
(Only effective when CONFIG_BOOT_RETRY_TIME is also set) diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h index c5c3a84..8010f28 100644 --- a/include/configs/CPCI2DP.h +++ b/include/configs/CPCI2DP.h @@ -98,8 +98,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x100000 /* default load address */ #define CONFIG_SYS_EXTBDINFO 1 /* To use extended board_into (bd_t) */
-#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ - #define CONFIG_VERSION_VARIABLE 1 /* include version env variable */
#define CONFIG_SYS_RX_ETH_BUFFER 16 /* use 16 rx buffer on 405 emac */ diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index db953b9..ffae107 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -121,8 +121,6 @@
#define CONFIG_CMDLINE_EDITING /* add command line history */
-#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ - #define CONFIG_VERSION_VARIABLE 1 /* include version env variable */
#define CONFIG_SYS_RX_ETH_BUFFER 16 /* use 16 rx buffer on 405 emac */ diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index 79027e2..6ef39db 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -99,7 +99,6 @@ #define CONFIG_BAUDRATE 9600 /* STD Baudrate */ /* 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 */
#define CONFIG_BOOTCOMMAND "diskboot 400000 0:1; bootm" /* autoboot command */ #define CONFIG_BOOTARGS "console=ttyS0,9600 root=/dev/hda5" /* boot arguments */ diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index e7c7a99..9203f85 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -91,7 +91,6 @@
/* 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 */
#define CONFIG_BOOTCOMMAND "diskboot 400000 0:1; bootm" /* autoboot command */ #define CONFIG_BOOTARGS "console=ttyS0,9600 root=/dev/hda5" /* boot arguments */ diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h index 558f3e2..c2e067a 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -117,7 +117,6 @@ #define CONFIG_SYS_EXTBDINFO 1 /* To use extended board_into (bd_t) */
#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */
#define CONFIG_VERSION_VARIABLE 1 /* include version env variable */
diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h index 5f17d76..619222f 100644 --- a/include/configs/PMC405DE.h +++ b/include/configs/PMC405DE.h @@ -92,7 +92,6 @@
#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ #define CONFIG_MX_CYCLIC 1 /* enable mdc/mwc commands */ -#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ #define CONFIG_VERSION_VARIABLE 1 /* include version env variable */
/* diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index 868ca84..d3183ff 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -312,7 +312,6 @@
#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ #define CONFIG_MX_CYCLIC 1 /* enable mdc/mwc commands */ -#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ #define CONFIG_VERSION_VARIABLE 1 /* include version env variable */
/*----------------------------------------------------------------------- diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h index 968e1df..a60c7c1 100644 --- a/include/configs/VCMA9.h +++ b/include/configs/VCMA9.h @@ -117,7 +117,6 @@
#define CONFIG_BOOT_RETRY_TIME -1 #define CONFIG_RESET_TO_RETRY -#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_NETMASK 255.255.255.0 #define CONFIG_IPADDR 10.0.0.110 diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h index dde98f6..e87cea8 100644 --- a/include/configs/VOM405.h +++ b/include/configs/VOM405.h @@ -105,7 +105,6 @@ #define CONFIG_SYS_EXTBDINFO 1 /* To use extended board_into (bd_t) */
#define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */
#define CONFIG_VERSION_VARIABLE 1 /* include version env variable */
diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h index 7ec404d..8f17dd1 100644 --- a/include/configs/a3m071.h +++ b/include/configs/a3m071.h @@ -322,7 +322,6 @@ */
#undef CONFIG_BOOTARGS -#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_SYS_AUTOLOAD "n"
diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h index 2666ca6..9bda7fa 100644 --- a/include/configs/amcc-common.h +++ b/include/configs/amcc-common.h @@ -78,7 +78,6 @@ #define CONFIG_CMDLINE_EDITING /* add command line history */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ #define CONFIG_MX_CYCLIC /* enable mdc/mwc commands */ -#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ #define CONFIG_VERSION_VARIABLE /* include version env variable */ #define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup*/
diff --git a/include/configs/apf27.h b/include/configs/apf27.h index f44f71c..51a16eb 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -148,7 +148,6 @@ #define CONFIG_SETUP_MEMORY_TAGS /* send memory definition to kernel */ #define CONFIG_INITRD_TAG /* send initrd params */
-#define CONFIG_ZERO_BOOTDELAY_CHECK #define CONFIG_BOOTFILE __stringify(CONFIG_BOARD_NAME) "-linux.bin" #define CONFIG_BOOTARGS "console=" __stringify(ACFG_CONSOLE_DEV) "," \ __stringify(CONFIG_BAUDRATE) " " MTDPARTS_DEFAULT \ diff --git a/include/configs/calimain.h b/include/configs/calimain.h index 3b10360..9c2b9e8 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -214,7 +214,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_BOOTARGS "" #define CONFIG_BOOTCOMMAND "run checkupdate; run checkbutton;" -#define CONFIG_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/cm_t35.h b/include/configs/cm_t35.h index de1999d..03dc3cc 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -145,8 +145,6 @@ /* devices */
/* Environment information */ -#define CONFIG_ZERO_BOOTDELAY_CHECK - #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x82000000\0" \ "usbtty=cdc_acm\0" \ diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 87e41bf..ea9983b 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -152,8 +152,6 @@ /* devices */
/* Environment information */ -#define CONFIG_ZERO_BOOTDELAY_CHECK - #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x82000000\0" \ "baudrate=115200\0" \ diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index 5076540..9bb975a 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -98,7 +98,6 @@ #undef CONFIG_SPL_NAND_SUPPORT #undef CONFIG_SYS_MONITOR_LEN #undef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR -#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_ENV_SIZE (16 * 1024) #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 73f53d4..22f4322 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -178,7 +178,6 @@ */ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_ZERO_BOOTDELAY_CHECK
#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 1145e37..c6d6d41 100644 --- a/include/configs/digsy_mtc.h +++ b/include/configs/digsy_mtc.h @@ -379,7 +379,6 @@ #define CONFIG_CMDLINE_EDITING 1
#define CONFIG_MX_CYCLIC 1 -#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) diff --git a/include/configs/dlvision-10g.h b/include/configs/dlvision-10g.h index 445a346..521604e 100644 --- a/include/configs/dlvision-10g.h +++ b/include/configs/dlvision-10g.h @@ -27,8 +27,6 @@
#define CONFIG_SYS_CLK_FREQ 33333333 /* external frequency to pll */
-#undef CONFIG_ZERO_BOOTDELAY_CHECK /* ignore keypress on bootdelay==0 */ - /* * Configure PLL */ diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h index 98474d3..38298a2 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -51,8 +51,6 @@ #define CONFIG_EXYNOS_DWMMC #define CONFIG_BOUNCE_BUFFER
-#define CONFIG_ZERO_BOOTDELAY_CHECK - /* PWM */ #define CONFIG_PWM
diff --git a/include/configs/gdppc440etx.h b/include/configs/gdppc440etx.h index 8d79ea8..2845a80 100644 --- a/include/configs/gdppc440etx.h +++ b/include/configs/gdppc440etx.h @@ -33,8 +33,6 @@ #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f*/ #define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */
-#undef CONFIG_ZERO_BOOTDELAY_CHECK /* ignore keypress on bootdelay==0 */ - /* * Base addresses -- Note these are effective addresses where the * actual resources get mapped (not physical addresses) diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index 6a8660b..c5e6828 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -543,8 +543,6 @@ void fpga_control_clear(unsigned int bus, int pin); #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ #define CONFIG_SYS_HZ 1000 /* decrementer freq: 1ms ticks */
-#undef CONFIG_ZERO_BOOTDELAY_CHECK /* ignore keypress on bootdelay==0 */ - #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_CONSOLE_INFO_QUIET diff --git a/include/configs/intip.h b/include/configs/intip.h index f3db077..4984dc1 100644 --- a/include/configs/intip.h +++ b/include/configs/intip.h @@ -48,8 +48,6 @@ #define CONFIG_BOARD_TYPES 1 /* support board types */ #define CFG_ALT_MEMTEST
-#undef CONFIG_ZERO_BOOTDELAY_CHECK /* ignore keypress on bootdelay==0 */ - /* * Base addresses -- Note these are effective addresses where the * actual resources get mapped (not physical addresses) diff --git a/include/configs/io.h b/include/configs/io.h index 0dd7f00..544d044 100644 --- a/include/configs/io.h +++ b/include/configs/io.h @@ -33,8 +33,6 @@ #define PLLMR0_DEFAULT PLLMR0_266_133_66 #define PLLMR1_DEFAULT PLLMR1_266_133_66
-#undef CONFIG_ZERO_BOOTDELAY_CHECK /* ignore keypress on bootdelay==0 */ - /* new uImage format support */ #define CONFIG_FIT_DISABLE_SHA256
diff --git a/include/configs/io64.h b/include/configs/io64.h index 1a6275e..14ffb33 100644 --- a/include/configs/io64.h +++ b/include/configs/io64.h @@ -44,8 +44,6 @@ #define CONFIG_MISC_INIT_R #define CONFIG_LAST_STAGE_INIT
-#undef CONFIG_ZERO_BOOTDELAY_CHECK /* ignore keypress on bootdelay==0 */ - /*----------------------------------------------------------------------- * Base addresses -- Note these are effective addresses where the * actual resources get mapped (not physical addresses) diff --git a/include/configs/iocon.h b/include/configs/iocon.h index 43688c7..d85a76c 100644 --- a/include/configs/iocon.h +++ b/include/configs/iocon.h @@ -35,8 +35,6 @@ #define PLLMR0_DEFAULT PLLMR0_266_133_66 #define PLLMR1_DEFAULT PLLMR1_266_133_66
-#undef CONFIG_ZERO_BOOTDELAY_CHECK /* ignore keypress on bootdelay==0 */ - /* new uImage format support */ #define CONFIG_FIT_DISABLE_SHA256
diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index f52750e..04f593e 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -168,7 +168,6 @@ #define CONFIG_SERIAL_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_SETUP_INITRD_TAG -#define CONFIG_ZERO_BOOTDELAY_CHECK #define CONFIG_BOOTCOMMAND \ "if mmc rescan; then " \ "if run loadbootscr; then " \ diff --git a/include/configs/meesc.h b/include/configs/meesc.h index fbcad4a..df76a20 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -69,8 +69,6 @@ #define CONFIG_USART_ID ATMEL_ID_SYS #define CONFIG_BAUDRATE 115200
-#define CONFIG_ZERO_BOOTDELAY_CHECK - /* * BOOTP options */ diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 3c11e2a..49a8b3f 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -47,7 +47,6 @@ #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG #define CONFIG_CMDLINE_EDITING /* cmd line edit/history */ -#define CONFIG_ZERO_BOOTDELAY_CHECK /* check keypress w/no delay */
/* Hardware drivers */
diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h index 80d5d6c..32f059d 100644 --- a/include/configs/pcm030.h +++ b/include/configs/pcm030.h @@ -67,11 +67,6 @@ Serial console configuration #define MTDPARTS_DEFAULT "mtdparts=physmap-flash.0:256k(ubootl)," \ "1792k(kernel),13312k(jffs2),256k(uboot)ro,256k(oftree),-(space)"
-/*----------------------------------------------------------------------------- -Autobooting ------------------------------------------------------------------------------*/ -#define CONFIG_ZERO_BOOTDELAY_CHECK /* allow stopping of boot process */ - /* even with bootdelay=0 */ #undef CONFIG_BOOTARGS
#define CONFIG_PREBOOT "echo;" \ diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h index c15580c..bc01ae9 100644 --- a/include/configs/r7780mp.h +++ b/include/configs/r7780mp.h @@ -31,9 +31,6 @@ #define CONFIG_BOOTARGS "console=ttySC0,115200" #define CONFIG_ENV_OVERWRITE 1
-/* check for keypress on bootdelay==0 */ -/*#define CONFIG_ZERO_BOOTDELAY_CHECK*/ - #define CONFIG_SYS_TEXT_BASE 0x0FFC0000 #define CONFIG_SYS_SDRAM_BASE (0x08000000) #define CONFIG_SYS_SDRAM_SIZE (128 * 1024 * 1024) diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index afea884..87e51d0 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -94,8 +94,6 @@ ",12m(modem)"\ ",60m(qboot)\0"
-#define CONFIG_ZERO_BOOTDELAY_CHECK - /* partitions definitions */ #define PARTS_CSA "csa-mmc" #define PARTS_BOOTLOADER "u-boot" diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h index f733c35..e328842 100644 --- a/include/configs/smdk2410.h +++ b/include/configs/smdk2410.h @@ -82,7 +82,6 @@ /* autoboot */ #define CONFIG_BOOT_RETRY_TIME -1 #define CONFIG_RESET_TO_RETRY -#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_NETMASK 255.255.255.0 #define CONFIG_IPADDR 10.0.0.110 diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index fe41d17..84a188a 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -71,9 +71,6 @@ #define CONFIG_CMD_ONENAND #define CONFIG_CMD_MTDPARTS
- -#define CONFIG_ZERO_BOOTDELAY_CHECK - #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS
diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index 7981a8d..b33bec9 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -117,7 +117,6 @@
/* Boot options */ #define CONFIG_SYS_LOAD_ADDR 0x23000000 -#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_BOOTP_BOOTFILESIZE #define CONFIG_BOOTP_BOOTPATH diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index 8344f15..fd6c70e 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -95,7 +95,6 @@
/* Boot options */ #define CONFIG_SYS_LOAD_ADDR 0x23000000 -#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_BOOTP_BOOTFILESIZE #define CONFIG_BOOTP_BOOTPATH diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h index 43ba84a..7f6cb93 100644 --- a/include/configs/spear-common.h +++ b/include/configs/spear-common.h @@ -178,7 +178,6 @@ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_MISC_INIT_R -#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_SYS_MEMTEST_START 0x00800000 #define CONFIG_SYS_MEMTEST_END 0x04000000 diff --git a/include/configs/strider.h b/include/configs/strider.h index 36561e0..5fabbad 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -581,8 +581,6 @@ void fpga_control_clear(unsigned int bus, int pin); #define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */ #define CONFIG_SYS_HZ 1000 /* decrementer freq: 1ms ticks */
-#undef CONFIG_ZERO_BOOTDELAY_CHECK /* ignore keypress on bootdelay==0 */ - #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_CONSOLE_INFO_QUIET diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index dda70c5..1caa858 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -64,7 +64,6 @@ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */ -#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ #define CONFIG_SYS_ALT_MEMTEST #define CONFIG_PREBOOT
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index aed3931..127a968 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -46,7 +46,6 @@ #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_SILENT_CONSOLE -#define CONFIG_ZERO_BOOTDELAY_CHECK
/* Clock Defines */ #define V_OSCK 26000000 /* Clock output from T2 */ diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 77057d0..4ebaf84 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -147,8 +147,6 @@ #define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x01000000)
-#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ - /* * Network Configuration */ diff --git a/include/configs/vinco.h b/include/configs/vinco.h index 35fe9de..4ae179c 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -150,6 +150,5 @@ "bootdelay=0\0"
#endif -#define CONFIG_ZERO_BOOTDELAY_CHECK
#endif diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index ba222f9..eae7eba 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -174,8 +174,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG
-#define CONFIG_ZERO_BOOTDELAY_CHECK - #define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTARGS "console=ttyS2,115200n8" #define CONFIG_LOADADDR 0x80008000 diff --git a/include/configs/x600.h b/include/configs/x600.h index 71c0b45..748e331 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -145,7 +145,6 @@ #define CONFIG_MISC_INIT_R #define CONFIG_BOARD_LATE_INIT #define CONFIG_MX_CYCLIC /* enable mdc/mwc commands */ -#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_SYS_MEMTEST_START 0x00800000 #define CONFIG_SYS_MEMTEST_END 0x04000000 diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h index e97e9d0..39c1bd8 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -57,7 +57,6 @@ #define CONFIG_CMDLINE_EDITING /* add command line history */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ #define CONFIG_MX_CYCLIC /* enable mdc/mwc commands */ -#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ #define CONFIG_VERSION_VARIABLE /* include version env variable */ #define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */ #define CONFIG_LOADS_ECHO /* echo on for serial download */
On Mon, Jun 27, 2016 at 04:23:01PM +0900, Masahiro Yamada wrote:
As the help message of CONFIG_BOOTDELAY says, CONFIG_BOOTDELAY=-2 means the autoboot with no delay, with no abort check even if CONFIG_ZERO_BOOTDELAY_CHECK is defined.
To sum up, the autoboot behaves as follows:
[1] CONFIG_BOOTDELAY=0 && CONFIG_ZERO_BOOTDELAY_CHECK=y autoboot with no delay, but you can abort it by key input
[2] CONFIG_BOOTDELAY=0 && CONFIG_ZERO_BOOTDELAY_CHECK=n autoboot with no delay, with no check for abort
[3] CONFIG_BOOTDELAY=-1 disable autoboot
[4] CONFIG_BOOTDELAY=-2 autoboot with no delay, with no check for abort
As you notice, [2] and [4] come to the same result, which means we do not need CONFIG_ZERO_BOOTDELAY_CHECK. We can control all the cases only by CONFIG_BOOTDELAY, like this:
[1] CONFIG_BOOTDELAY=0 autoboot with no delay, but you can abort it by key input
[2] CONFIG_BOOTDELAY=-1 disable autoboot
[3] CONFIG_BOOTDELAY=-2 autoboot with no delay, with no check for abort
This commit converts the logic as follow: CONFIG_BOOTDELAY=0 && CONFIG_ZERO_BOOTDELAY_CHECK=n --> CONFIG_BOOTDELAY=-2
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com Reviewed-by: Stefan Roese sr@denx.de Acked-by: Igor Grinberg grinberg@compulab.co.il Reviewed-by: Simon Glass sjg@chromium.org Acked-by: Vladimir Zapolskiy vz@mleia.com Reviewed-by: Heiko Schocher hs@denx.de Acked-by: Christian Riesch christian.riesch@omicronenergy.com Acked-by: Hannes Schmelzer hannes.schmelzer@br-automation.com
Applied to u-boot/master, thanks!
Because abortboot_keyed() and abortboot_normal() are not compiled at the same time, we can rename both of them to __abortboot(). This allows to drop #ifdef from the caller.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com Reviewed-by: Stefan Roese sr@denx.de Reviewed-by: Simon Glass sjg@chromium.org Reviewed-by: Heiko Schocher hs@denx.de ---
Changes in v3: None Changes in v2: None
common/autoboot.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/common/autoboot.c b/common/autoboot.c index 35deece..eb31c88 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -182,7 +182,7 @@ static int passwd_abort(uint64_t etime) * Watch for 'delay' seconds for autoboot stop or autoboot delay string. * returns: 0 - no key string, allow autoboot 1 - got key string, abort */ -static int abortboot_keyed(int bootdelay) +static int __abortboot(int bootdelay) { int abort; uint64_t etime = endtick(bootdelay); @@ -216,7 +216,7 @@ static int abortboot_keyed(int bootdelay) static int menukey; #endif
-static int abortboot_normal(int bootdelay) +static int __abortboot(int bootdelay) { int abort = 0; unsigned long ts; @@ -274,11 +274,7 @@ static int abortboot_normal(int bootdelay)
static int abortboot(int bootdelay) { -#ifdef CONFIG_AUTOBOOT_KEYED - return abortboot_keyed(bootdelay); -#else - return abortboot_normal(bootdelay); -#endif + return __abortboot(bootdelay); }
static void process_fdt_options(const void *blob)
On Mon, Jun 27, 2016 at 04:23:02PM +0900, Masahiro Yamada wrote:
Because abortboot_keyed() and abortboot_normal() are not compiled at the same time, we can rename both of them to __abortboot(). This allows to drop #ifdef from the caller.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com Reviewed-by: Stefan Roese sr@denx.de Reviewed-by: Simon Glass sjg@chromium.org Reviewed-by: Heiko Schocher hs@denx.de
Applied to u-boot/master, thanks!
Factor out the same code from the callees to the caller.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com Reviewed-by: Stefan Roese sr@denx.de Reviewed-by: Simon Glass sjg@chromium.org Reviewed-by: Heiko Schocher hs@denx.de ---
Changes in v3: None Changes in v2: - Fix build error when CONFIG_SILENT_CONSOLE is enabled
common/autoboot.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/common/autoboot.c b/common/autoboot.c index eb31c88..fb13139 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -202,11 +202,6 @@ static int __abortboot(int bootdelay) if (!abort) debug_bootkeys("key timeout\n");
-#ifdef CONFIG_SILENT_CONSOLE - if (abort) - gd->flags &= ~GD_FLG_SILENT; -#endif - return abort; }
@@ -263,18 +258,22 @@ static int __abortboot(int bootdelay)
putc('\n');
-#ifdef CONFIG_SILENT_CONSOLE - if (abort) - gd->flags &= ~GD_FLG_SILENT; -#endif - return abort; } # endif /* CONFIG_AUTOBOOT_KEYED */
static int abortboot(int bootdelay) { - return __abortboot(bootdelay); + int abort; + + abort = __abortboot(bootdelay); + +#ifdef CONFIG_SILENT_CONSOLE + if (abort) + gd->flags &= ~GD_FLG_SILENT; +#endif + + return abort; }
static void process_fdt_options(const void *blob)
On Mon, Jun 27, 2016 at 04:23:03PM +0900, Masahiro Yamada wrote:
Factor out the same code from the callees to the caller.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com Reviewed-by: Stefan Roese sr@denx.de Reviewed-by: Simon Glass sjg@chromium.org Reviewed-by: Heiko Schocher hs@denx.de
Applied to u-boot/master, thanks!
Move the bootdelay >= 0 check to the caller, which simplifies the callees.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com Reviewed-by: Stefan Roese sr@denx.de Reviewed-by: Simon Glass sjg@chromium.org Reviewed-by: Heiko Schocher hs@denx.de ---
Changes in v3: None Changes in v2: None
common/autoboot.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/common/autoboot.c b/common/autoboot.c index fb13139..c52bad8 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -187,9 +187,6 @@ static int __abortboot(int bootdelay) int abort; uint64_t etime = endtick(bootdelay);
- if (bootdelay < 0) - return 0; - # ifdef CONFIG_AUTOBOOT_PROMPT /* * CONFIG_AUTOBOOT_PROMPT includes the %d for all boards. @@ -219,20 +216,16 @@ static int __abortboot(int bootdelay) #ifdef CONFIG_MENUPROMPT printf(CONFIG_MENUPROMPT); #else - if (bootdelay >= 0) - printf("Hit any key to stop autoboot: %2d ", bootdelay); + printf("Hit any key to stop autoboot: %2d ", bootdelay); #endif
/* * Check if key already pressed - * Don't check if bootdelay < 0 */ - if (bootdelay >= 0) { - if (tstc()) { /* we got a key press */ - (void) getc(); /* consume input */ - puts("\b\b\b 0"); - abort = 1; /* don't auto boot */ - } + if (tstc()) { /* we got a key press */ + (void) getc(); /* consume input */ + puts("\b\b\b 0"); + abort = 1; /* don't auto boot */ }
while ((bootdelay > 0) && (!abort)) { @@ -264,9 +257,10 @@ static int __abortboot(int bootdelay)
static int abortboot(int bootdelay) { - int abort; + int abort = 0;
- abort = __abortboot(bootdelay); + if (bootdelay >= 0) + abort = __abortboot(bootdelay);
#ifdef CONFIG_SILENT_CONSOLE if (abort)
On Mon, Jun 27, 2016 at 04:23:04PM +0900, Masahiro Yamada wrote:
Move the bootdelay >= 0 check to the caller, which simplifies the callees.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com Reviewed-by: Stefan Roese sr@denx.de Reviewed-by: Simon Glass sjg@chromium.org Reviewed-by: Heiko Schocher hs@denx.de
Applied to u-boot/master, thanks!
participants (3)
-
Masahiro Yamada -
Stefan Roese -
Tom Rini