|
|
|
|
CONFIG_PPC=y
|
|
|
|
|
CONFIG_SYS_TEXT_BASE=0xf8fc0000
|
|
|
|
|
CONFIG_IDENT_STRING=" controlcenterd trailblazer 0.01"
|
|
|
|
|
CONFIG_MPC85xx=y
|
|
|
|
|
# CONFIG_CMD_ERRATA is not set
|
|
|
|
|
CONFIG_TARGET_CONTROLCENTERD=y
|
|
|
|
|
CONFIG_SYS_EXTRA_OPTIONS="TRAILBLAZER,SPIFLASH"
|
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>
8 years ago
|
|
|
CONFIG_BOOTDELAY=-2
|
|
|
|
|
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
|
|
|
|
|
# CONFIG_MISC_INIT_R is not set
|
|
|
|
|
# CONFIG_DISPLAY_BOARDINFO is not set
|
|
|
|
|
CONFIG_BOARD_EARLY_INIT_F=y
|
|
|
|
|
CONFIG_BOARD_EARLY_INIT_R=y
|
|
|
|
|
CONFIG_LAST_STAGE_INIT=y
|
|
|
|
|
# CONFIG_CMDLINE_EDITING is not set
|
|
|
|
|
# CONFIG_AUTO_COMPLETE is not set
|
|
|
|
|
# CONFIG_SYS_LONGHELP is not set
|
|
|
|
|
# CONFIG_CMD_BOOTM is not set
|
|
|
|
|
CONFIG_CMD_EEPROM=y
|
|
|
|
|
# CONFIG_CMD_FLASH is not set
|
|
|
|
|
CONFIG_CMD_MMC=y
|
|
|
|
|
# CONFIG_CMD_SETEXPR is not set
|
|
|
|
|
CONFIG_MP=y
|
|
|
|
|
# CONFIG_CMD_HASH is not set
|
|
|
|
|
CONFIG_CMD_TPM=y
|
|
|
|
|
# CONFIG_CMD_IRQ is not set
|
|
|
|
|
CONFIG_DOS_PARTITION=y
|
|
|
|
|
CONFIG_DM=y
|
|
|
|
|
CONFIG_FSL_ESDHC=y
|
|
|
|
|
# CONFIG_PCI is not set
|
|
|
|
|
CONFIG_CONS_INDEX=2
|
|
|
|
|
CONFIG_SYS_NS16550=y
|
|
|
|
|
CONFIG_TPM_AUTH_SESSIONS=y
|
|
|
|
|
CONFIG_TPM=y
|
|
|
|
|
CONFIG_SHA1=y
|
