autoboot cleanups

This recently added board missed the tree-wide migration of CONFIG_BOOTDELAY.

Signed-off-by Masahiro Yamada <[email protected]>

This recently added board missed the tree-wide migration of CONFIG_BOOTDELAY.

Signed-off-by Masahiro Yamada <[email protected]>

---

  configs/socfpga_is1_defconfig | 4 +---
  include/configs/socfpga_is1.h | 1 -
  2 files changed, 1 insertion(+), 4 deletions(-)

configs/socfpga_is1_defconfig +1 -3

index 7d43c72..658770b 100644
@@ -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

include/configs/socfpga_is1.h +0 -1

index 6f5dfce..cc07253 100644
@@ -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

The same information now exists in common/Kconfig. Do not duplicate documentation from the point of view of maintainability.

Signed-off-by Masahiro Yamada <[email protected]>

---

 README         | 17 -----------------
 common/Kconfig |  2 ++
 2 files changed, 2 insertions(+), 17 deletions(-)

The same information now exists in common/Kconfig. Do not duplicate documentation from the point of view of maintainability.

Signed-off-by Masahiro Yamada <[email protected]>

---

  README         | 17 -----------------
  common/Kconfig |  2 ++
  2 files changed, 2 insertions(+), 17 deletions(-)

README +0 -17

index 03bed18..26d5ad2 100644
@@ -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;

common/Kconfig +2 -0

index ada4ddb..a94c7b9 100644
@@ -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

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 <[email protected]>

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 <[email protected]>

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 <[email protected]>

---

 common/Kconfig                                       | 2 +-
 common/autoboot.c                                    | 6 +-----
 configs/cairo_defconfig                              | 2 +-
 configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig | 2 +-
 configs/controlcenterd_TRAILBLAZER_defconfig         | 2 +-
 configs/kwb_defconfig                                | 2 +-
 configs/omap3_evm_quick_mmc_defconfig                | 2 +-
 configs/omap3_evm_quick_nand_defconfig               | 2 +-
 configs/tseries_mmc_defconfig                        | 2 +-
 configs/tseries_nand_defconfig                       | 2 +-
 configs/tseries_spi_defconfig                        | 2 +-
 doc/README.autoboot                                  | 8 --------
 include/configs/CPCI2DP.h                            | 1 -
 include/configs/CPCI4052.h                           | 1 -
 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                             | 1 -
 include/configs/cm_t3517.h                           | 1 -
 include/configs/cm_t43.h                             | 1 -
 include/configs/devkit3250.h                         | 1 -
 include/configs/digsy_mtc.h                          | 1 -
 include/configs/dlvision-10g.h                       | 1 -
 include/configs/exynos-common.h                      | 1 -
 include/configs/gdppc440etx.h                        | 1 -
 include/configs/hrcon.h                              | 1 -
 include/configs/intip.h                              | 1 -
 include/configs/io.h                                 | 1 -
 include/configs/io64.h                               | 1 -
 include/configs/iocon.h                              | 1 -
 include/configs/legoev3.h                            | 1 -
 include/configs/meesc.h                              | 1 -
 include/configs/omap3_logic.h                        | 1 -
 include/configs/pcm030.h                             | 1 -
 include/configs/r7780mp.h                            | 1 -
 include/configs/s5p_goni.h                           | 1 -
 include/configs/smdk2410.h                           | 1 -
 include/configs/smdkc100.h                           | 1 -
 include/configs/snapper9260.h                        | 1 -
 include/configs/snapper9g45.h                        | 1 -
 include/configs/spear-common.h                       | 1 -
 include/configs/strider.h                            | 1 -

 include/configs/theadorable.h                        | 1 -
 include/configs/tricorder.h                          | 1 -
 include/configs/uniphier.h                           | 1 -
 include/configs/vinco.h                              | 1 -
 include/configs/work_92105.h                         | 1 -
 include/configs/x600.h                               | 1 -
 include/configs/xilinx-ppc.h                         | 1 -
 57 files changed, 11 insertions(+), 68 deletions(-)

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 <[email protected]>

---

 include/configs/devkit3250.h                         | 1 -

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 <[email protected]>

---

  common/Kconfig                                       | 2 +-
  common/autoboot.c                                    | 6 +-----
  configs/cairo_defconfig                              | 2 +-
  configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig | 2 +-
  configs/controlcenterd_TRAILBLAZER_defconfig         | 2 +-
  configs/kwb_defconfig                                | 2 +-
  configs/omap3_evm_quick_mmc_defconfig                | 2 +-
  configs/omap3_evm_quick_nand_defconfig               | 2 +-
  configs/tseries_mmc_defconfig                        | 2 +-
  configs/tseries_nand_defconfig                       | 2 +-
  configs/tseries_spi_defconfig                        | 2 +-
  doc/README.autoboot                                  | 8 --------
  include/configs/CPCI2DP.h                            | 1 -
  include/configs/CPCI4052.h                           | 1 -
  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                             | 1 -
  include/configs/cm_t3517.h                           | 1 -
  include/configs/cm_t43.h                             | 1 -
  include/configs/devkit3250.h                         | 1 -
  include/configs/digsy_mtc.h                          | 1 -
  include/configs/dlvision-10g.h                       | 1 -
  include/configs/exynos-common.h                      | 1 -
  include/configs/gdppc440etx.h                        | 1 -
  include/configs/hrcon.h                              | 1 -
  include/configs/intip.h                              | 1 -
  include/configs/io.h                                 | 1 -
  include/configs/io64.h                               | 1 -
  include/configs/iocon.h                              | 1 -
  include/configs/legoev3.h                            | 1 -
  include/configs/meesc.h                              | 1 -
  include/configs/omap3_logic.h                        | 1 -
  include/configs/pcm030.h                             | 1 -
  include/configs/r7780mp.h                            | 1 -
  include/configs/s5p_goni.h                           | 1 -
  include/configs/smdk2410.h                           | 1 -
  include/configs/smdkc100.h                           | 1 -
  include/configs/snapper9260.h                        | 1 -
  include/configs/snapper9g45.h                        | 1 -
  include/configs/spear-common.h                       | 1 -
  include/configs/strider.h                            | 1 -

  include/configs/theadorable.h                        | 1 -
  include/configs/tricorder.h                          | 1 -
  include/configs/uniphier.h                           | 1 -
  include/configs/vinco.h                              | 1 -
  include/configs/work_92105.h                         | 1 -
  include/configs/x600.h                               | 1 -
  include/configs/xilinx-ppc.h                         | 1 -
  57 files changed, 11 insertions(+), 68 deletions(-)

common/Kconfig +1 -1

index a94c7b9..aae754b 100644
@@ -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.
 

common/autoboot.c +1 -5

index 223e062..35deece 100644
@@ -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;

configs/cairo_defconfig +1 -1

index 5257312..c529c7c 100644
@@ -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

configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig +1 -1

index b6f14db..efb8ad6 100644
@@ -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

configs/controlcenterd_TRAILBLAZER_defconfig +1 -1

index 2c45aff..45e8b8f 100644
@@ -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

configs/kwb_defconfig +1 -1

index 790292e..5d97446 100644
@@ -2,7 +2,7 @@ CONFIG_ARM=y
  CONFIG_TARGET_KWB=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

configs/omap3_evm_quick_mmc_defconfig +1 -1

index 801c959..ebdc105 100644
@@ -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

configs/omap3_evm_quick_nand_defconfig +1 -1

index 8815fca..52b08b8 100644
@@ -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

configs/tseries_mmc_defconfig +1 -1

index 337404b..92eb2b7 100644
@@ -3,7 +3,7 @@ CONFIG_TARGET_TSERIES=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

configs/tseries_nand_defconfig +1 -1

index 4dc0296..8b5ae6e 100644
@@ -3,7 +3,7 @@ CONFIG_TARGET_TSERIES=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

configs/tseries_spi_defconfig +1 -1

index 5b52bf6..646e3c8 100644
@@ -3,7 +3,7 @@ CONFIG_TARGET_TSERIES=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

doc/README.autoboot +0 -8

index 227e3b5..30fd0b0 100644
@@ -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)

include/configs/CPCI2DP.h +0 -1

index c5c3a84..fb30c70 100644
@@ -98,7 +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 */
 

include/configs/CPCI4052.h +0 -1

index db953b9..e5d4b0c 100644
@@ -121,7 +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 */
 

include/configs/MIP405.h +0 -1

index 79027e2..6ef39db 100644
@@ -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 */

include/configs/PIP405.h +0 -1

index e7c7a99..9203f85 100644
@@ -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 */

include/configs/PLU405.h +0 -1

index 558f3e2..c2e067a 100644
@@ -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 */
 

include/configs/PMC405DE.h +0 -1

index 5f17d76..619222f 100644
@@ -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 */
 
  /*

include/configs/PMC440.h +0 -1

index 868ca84..d3183ff 100644
@@ -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 */
 
  /*-----------------------------------------------------------------------

include/configs/VCMA9.h +0 -1

index 968e1df..a60c7c1 100644
@@ -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

include/configs/VOM405.h +0 -1

index dde98f6..e87cea8 100644
@@ -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 */
 

include/configs/a3m071.h +0 -1

index 7ec404d..8f17dd1 100644
@@ -322,7 +322,6 @@
   */
 
  #undef  CONFIG_BOOTARGS
-#define CONFIG_ZERO_BOOTDELAY_CHECK
 
  #define CONFIG_SYS_AUTOLOAD	"n"
 

include/configs/amcc-common.h +0 -1

index 2666ca6..9bda7fa 100644
@@ -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*/
 

include/configs/apf27.h +0 -1

index f44f71c..51a16eb 100644
@@ -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 \

include/configs/calimain.h +0 -1

index 3b10360..9c2b9e8 100644
@@ -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
 

include/configs/cm_t35.h +0 -1

index de1999d..695066b 100644
@@ -145,7 +145,6 @@
  							/* devices */
 
  /* Environment information */
-#define CONFIG_ZERO_BOOTDELAY_CHECK
 
  #define CONFIG_EXTRA_ENV_SETTINGS \
  	"loadaddr=0x82000000\0" \

include/configs/cm_t3517.h +0 -1

index 87e41bf..78fde3e 100644
@@ -152,7 +152,6 @@
  							/* devices */
 
  /* Environment information */
-#define CONFIG_ZERO_BOOTDELAY_CHECK
 
  #define CONFIG_EXTRA_ENV_SETTINGS \
  	"loadaddr=0x82000000\0" \

include/configs/cm_t43.h +0 -1

index 5076540..9bb975a 100644
@@ -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

include/configs/devkit3250.h +0 -1

index 73f53d4..22f4322 100644
@@ -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"

include/configs/digsy_mtc.h +0 -1

index 1145e37..c6d6d41 100644
@@ -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)

include/configs/dlvision-10g.h +0 -1

index 445a346..c5c2f4d 100644
@@ -27,7 +27,6 @@
 
  #define CONFIG_SYS_CLK_FREQ	33333333 /* external frequency to pll   */
 
-#undef CONFIG_ZERO_BOOTDELAY_CHECK     /* ignore keypress on bootdelay==0 */
 
  /*
   * Configure PLL

include/configs/exynos-common.h +0 -1

index 98474d3..ef3d210 100644
@@ -51,7 +51,6 @@
  #define CONFIG_EXYNOS_DWMMC
  #define CONFIG_BOUNCE_BUFFER
 
-#define CONFIG_ZERO_BOOTDELAY_CHECK
 
  /* PWM */
  #define CONFIG_PWM

include/configs/gdppc440etx.h +0 -1

index 8d79ea8..2e947fe 100644
@@ -33,7 +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

include/configs/hrcon.h +0 -1

index 6a8660b..2368bfe 100644
@@ -543,7 +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 */
 

include/configs/intip.h +0 -1

index f3db077..1fece9f 100644
@@ -48,7 +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

include/configs/io.h +0 -1

index 0dd7f00..b2a600a 100644
@@ -33,7 +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

include/configs/io64.h +0 -1

index 1a6275e..7bb4f3d 100644
@@ -44,7 +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

include/configs/iocon.h +0 -1

index 43688c7..5ed6749 100644
@@ -35,7 +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

include/configs/legoev3.h +0 -1

index f52750e..04f593e 100644
@@ -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 " \

include/configs/meesc.h +0 -1

index fbcad4a..5e8ba47 100644
@@ -69,7 +69,6 @@
  #define CONFIG_USART_ID			ATMEL_ID_SYS
  #define CONFIG_BAUDRATE			115200
 
-#define CONFIG_ZERO_BOOTDELAY_CHECK
 
  /*
   * BOOTP options

include/configs/omap3_logic.h +0 -1

index 3c11e2a..49a8b3f 100644
@@ -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 */
 

include/configs/pcm030.h +0 -1

index 80d5d6c..a3fc49a 100644
@@ -70,7 +70,6 @@ Serial console configuration
  /*-----------------------------------------------------------------------------
  Autobooting
  -----------------------------------------------------------------------------*/
-#define CONFIG_ZERO_BOOTDELAY_CHECK	/* allow stopping of boot process */
  					/* even with bootdelay=0 */
  #undef	CONFIG_BOOTARGS
 

include/configs/r7780mp.h +0 -1

index c15580c..90bbd2b 100644
@@ -32,7 +32,6 @@
  #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)

include/configs/s5p_goni.h +0 -1

index afea884..a06de29 100644
@@ -94,7 +94,6 @@
  				",12m(modem)"\
  				",60m(qboot)\0"
 
-#define CONFIG_ZERO_BOOTDELAY_CHECK
 
  /* partitions definitions */
  #define PARTS_CSA			"csa-mmc"

include/configs/smdk2410.h +0 -1

index f733c35..e328842 100644
@@ -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

include/configs/smdkc100.h +0 -1

index fe41d17..b553630 100644
@@ -72,7 +72,6 @@
  #define CONFIG_CMD_MTDPARTS
 
 
-#define CONFIG_ZERO_BOOTDELAY_CHECK
 
  #define CONFIG_MTD_DEVICE
  #define CONFIG_MTD_PARTITIONS

include/configs/snapper9260.h +0 -1

index 7981a8d..b33bec9 100644
@@ -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

include/configs/snapper9g45.h +0 -1

index 8344f15..fd6c70e 100644
@@ -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

include/configs/spear-common.h +0 -1

index 43ba84a..7f6cb93 100644
@@ -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

include/configs/strider.h +0 -1

index 36561e0..be8d165 100644
@@ -581,7 +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 */
 

include/configs/theadorable.h +0 -1

index dda70c5..1caa858 100644
@@ -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
 

include/configs/tricorder.h +0 -1

index aed3931..127a968 100644
@@ -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 */

include/configs/uniphier.h +0 -1

index 77057d0..47fe2a4 100644
@@ -147,7 +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

include/configs/vinco.h +0 -1

index 35fe9de..4ae179c 100644
@@ -150,6 +150,5 @@
  	"bootdelay=0\0"
 
  #endif
-#define CONFIG_ZERO_BOOTDELAY_CHECK
 
  #endif

include/configs/work_92105.h +0 -1

index ba222f9..7c99ef6 100644
@@ -174,7 +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"

include/configs/x600.h +0 -1

index 71c0b45..748e331 100644
@@ -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

include/configs/xilinx-ppc.h +0 -1

index e97e9d0..39c1bd8 100644
@@ -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  */

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 <[email protected]>

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 <[email protected]>

---

 common/Kconfig                                       | 2 +-
 common/autoboot.c                                    | 6 +-----
 configs/cairo_defconfig                              | 2 +-
 configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig | 2 +-
 configs/controlcenterd_TRAILBLAZER_defconfig         | 2 +-
 configs/kwb_defconfig                                | 2 +-
 configs/omap3_evm_quick_mmc_defconfig                | 2 +-
 configs/omap3_evm_quick_nand_defconfig               | 2 +-
 configs/tseries_mmc_defconfig                        | 2 +-
 configs/tseries_nand_defconfig                       | 2 +-
 configs/tseries_spi_defconfig                        | 2 +-
 doc/README.autoboot                                  | 8 --------
 include/configs/CPCI2DP.h                            | 1 -
 include/configs/CPCI4052.h                           | 1 -
 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                             | 1 -
 include/configs/cm_t3517.h                           | 1 -
 include/configs/cm_t43.h                             | 1 -
 include/configs/devkit3250.h                         | 1 -
 include/configs/digsy_mtc.h                          | 1 -
 include/configs/dlvision-10g.h                       | 1 -
 include/configs/exynos-common.h                      | 1 -
 include/configs/gdppc440etx.h                        | 1 -
 include/configs/hrcon.h                              | 1 -
 include/configs/intip.h                              | 1 -
 include/configs/io.h                                 | 1 -
 include/configs/io64.h                               | 1 -
 include/configs/iocon.h                              | 1 -
 include/configs/legoev3.h                            | 1 -
 include/configs/meesc.h                              | 1 -
 include/configs/omap3_logic.h                        | 1 -
 include/configs/pcm030.h                             | 1 -
 include/configs/r7780mp.h                            | 1 -
 include/configs/s5p_goni.h                           | 1 -
 include/configs/smdk2410.h                           | 1 -
 include/configs/smdkc100.h                           | 1 -
 include/configs/snapper9260.h                        | 1 -
 include/configs/snapper9g45.h                        | 1 -
 include/configs/spear-common.h                       | 1 -
 include/configs/strider.h                            | 1 -

 include/configs/theadorable.h                        | 1 -
 include/configs/tricorder.h                          | 1 -
 include/configs/uniphier.h                           | 1 -
 include/configs/vinco.h                              | 1 -
 include/configs/work_92105.h                         | 1 -
 include/configs/x600.h                               | 1 -
 include/configs/xilinx-ppc.h                         | 1 -
 57 files changed, 11 insertions(+), 68 deletions(-)

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 <[email protected]>

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 <[email protected]>

---

 common/autoboot.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

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 <[email protected]>

---

  common/autoboot.c | 10 +++-------
  1 file changed, 3 insertions(+), 7 deletions(-)

common/autoboot.c +3 -7

index 35deece..eb31c88 100644
@@ -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)

Factor out the same code from the callees to the caller.

Signed-off-by Masahiro Yamada <[email protected]>

Factor out the same code from the callees to the caller.

Signed-off-by Masahiro Yamada <[email protected]>

---

 common/autoboot.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

Factor out the same code from the callees to the caller.

Signed-off-by Masahiro Yamada <[email protected]>

---

  common/autoboot.c | 21 ++++++++++-----------
  1 file changed, 10 insertions(+), 11 deletions(-)

common/autoboot.c +10 -11

index eb31c88..2d19104 100644
@@ -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 ret;
+
+	ret = __abortboot(bootdelay);
+
+#ifdef CONFIG_SILENT_CONSOLE
+	if (abort)
+		gd->flags &= ~GD_FLG_SILENT;
+#endif
+
+	return ret;
  }
 
  static void process_fdt_options(const void *blob)

Move the bootdelay >= 0 check to the caller, which simplifies the callees.

Signed-off-by Masahiro Yamada <[email protected]>

Hi Masahiro,

Quoted 5 lines · Masahiro Yamada

Move the bootdelay >= 0 check to the caller, which simplifies the callees.

Signed-off-by Masahiro Yamada <[email protected]>

Reviewed-by Stefan Roese <[email protected]>

Move the bootdelay >= 0 check to the caller, which simplifies the callees.

Signed-off-by Masahiro Yamada <[email protected]>

---

  common/autoboot.c | 22 ++++++++--------------
  1 file changed, 8 insertions(+), 14 deletions(-)

common/autoboot.c +8 -14

index 2d19104..528919f 100644
@@ -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 ret;
+	int ret = 0;
 
-	ret = __abortboot(bootdelay);
+	if (bootdelay >= 0)
+		ret = __abortboot(bootdelay);
 
  #ifdef CONFIG_SILENT_CONSOLE
  	if (abort)