[U-Boot] [PATCH 3/6] autoboot: remove CONFIG_ZERO_BOOTDELAY_CHECK

Simon Glass sjg at chromium.org
Tue Jun 21 18:05:59 CEST 2016


On 20 June 2016 at 23:32, Masahiro Yamada <yamada.masahiro at socionext.com> 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 at socionext.com>
> ---
>
>  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(-)

Reviewed-by: Simon Glass <sjg at chromium.org>


More information about the U-Boot mailing list