]> git.sur5r.net Git - u-boot/commit
autoboot: remove CONFIG_ZERO_BOOTDELAY_CHECK
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Mon, 27 Jun 2016 07:23:01 +0000 (16:23 +0900)
committerTom Rini <trini@konsulko.com>
Fri, 1 Jul 2016 21:42:55 +0000 (17:42 -0400)
commit2fbb8462b0e18893b4b739705db047ffda82d4fc
treeb3ce336b273749c6368e3b191cda8479008b366e
parent9060970f4d89c79212982afbf9148dcbc94dcf75
autoboot: remove CONFIG_ZERO_BOOTDELAY_CHECK

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>
57 files changed:
common/Kconfig
common/autoboot.c
configs/brppt1_mmc_defconfig
configs/brppt1_nand_defconfig
configs/brppt1_spi_defconfig
configs/brxre1_defconfig
configs/cairo_defconfig
configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
configs/controlcenterd_TRAILBLAZER_defconfig
configs/omap3_evm_quick_mmc_defconfig
configs/omap3_evm_quick_nand_defconfig
doc/README.autoboot
include/configs/CPCI2DP.h
include/configs/CPCI4052.h
include/configs/MIP405.h
include/configs/PIP405.h
include/configs/PLU405.h
include/configs/PMC405DE.h
include/configs/PMC440.h
include/configs/VCMA9.h
include/configs/VOM405.h
include/configs/a3m071.h
include/configs/amcc-common.h
include/configs/apf27.h
include/configs/calimain.h
include/configs/cm_t35.h
include/configs/cm_t3517.h
include/configs/cm_t43.h
include/configs/devkit3250.h
include/configs/digsy_mtc.h
include/configs/dlvision-10g.h
include/configs/exynos-common.h
include/configs/gdppc440etx.h
include/configs/hrcon.h
include/configs/intip.h
include/configs/io.h
include/configs/io64.h
include/configs/iocon.h
include/configs/legoev3.h
include/configs/meesc.h
include/configs/omap3_logic.h
include/configs/pcm030.h
include/configs/r7780mp.h
include/configs/s5p_goni.h
include/configs/smdk2410.h
include/configs/smdkc100.h
include/configs/snapper9260.h
include/configs/snapper9g45.h
include/configs/spear-common.h
include/configs/strider.h
include/configs/theadorable.h
include/configs/tricorder.h
include/configs/uniphier.h
include/configs/vinco.h
include/configs/work_92105.h
include/configs/x600.h
include/configs/xilinx-ppc.h