|
|
|
CONFIG_ARM=y
|
|
|
|
CONFIG_ARCH_OMAP2PLUS=y
|
|
|
|
CONFIG_SYS_TEXT_BASE=0x80100000
|
|
|
|
CONFIG_TARGET_OMAP3_CAIRO=y
|
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>
9 years ago
|
|
|
CONFIG_BOOTDELAY=-2
|
|
|
|
CONFIG_SYS_CONSOLE_INFO_QUIET=y
|
|
|
|
CONFIG_VERSION_VARIABLE=y
|
|
|
|
CONFIG_SPL=y
|
|
|
|
CONFIG_SPL_MTD_SUPPORT=y
|
|
|
|
CONFIG_SPL_OS_BOOT=y
|
|
|
|
CONFIG_HUSH_PARSER=y
|
|
|
|
CONFIG_SYS_PROMPT="Cairo # "
|
|
|
|
CONFIG_CMD_BOOTZ=y
|
|
|
|
# CONFIG_CMD_IMI is not set
|
|
|
|
CONFIG_CMD_SPL=y
|
|
|
|
CONFIG_CMD_SPL_NAND_OFS=0x240000
|
|
|
|
CONFIG_CMD_ASKENV=y
|
|
|
|
# CONFIG_CMD_FLASH is not set
|
|
|
|
# CONFIG_CMD_FPGA is not set
|
|
|
|
CONFIG_CMD_GPIO=y
|
|
|
|
CONFIG_CMD_I2C=y
|
|
|
|
CONFIG_CMD_MMC=y
|
|
|
|
CONFIG_CMD_NAND=y
|
|
|
|
CONFIG_CMD_NAND_LOCK_UNLOCK=y
|
|
|
|
CONFIG_CMD_PART=y
|
|
|
|
CONFIG_CMD_SPI=y
|
|
|
|
# CONFIG_CMD_NET is not set
|
|
|
|
CONFIG_CMD_DHCP=y
|
|
|
|
CONFIG_CMD_MII=y
|
|
|
|
CONFIG_CMD_PING=y
|
|
|
|
CONFIG_CMD_EXT2=y
|
|
|
|
CONFIG_CMD_EXT4=y
|
|
|
|
CONFIG_CMD_EXT4_WRITE=y
|
|
|
|
CONFIG_CMD_FAT=y
|
|
|
|
CONFIG_CMD_FS_GENERIC=y
|
|
|
|
CONFIG_CMD_MTDPARTS=y
|
|
|
|
CONFIG_ISO_PARTITION=y
|
|
|
|
CONFIG_EFI_PARTITION=y
|
|
|
|
CONFIG_ENV_IS_IN_NAND=y
|
|
|
|
CONFIG_MMC_OMAP_HS=y
|
|
|
|
CONFIG_NAND=y
|
|
|
|
CONFIG_SPL_NAND_SIMPLE=y
|
|
|
|
CONFIG_SYS_NS16550=y
|
|
|
|
CONFIG_OMAP3_SPI=y
|
|
|
|
CONFIG_FAT_WRITE=y
|
|
|
|
CONFIG_OF_LIBFDT=y
|