2015-03-12 12:24:39 +08:00
|
|
|
CONFIG_ARM=y
|
2017-04-25 12:10:11 +08:00
|
|
|
CONFIG_ARCH_OMAP2PLUS=y
|
2016-09-13 13:18:39 +08:00
|
|
|
CONFIG_SPL_GPIO_SUPPORT=y
|
2016-09-13 13:18:41 +08:00
|
|
|
CONFIG_SPL_LIBCOMMON_SUPPORT=y
|
2016-09-13 13:18:43 +08:00
|
|
|
CONFIG_SPL_LIBGENERIC_SUPPORT=y
|
2017-06-10 04:59:17 +08:00
|
|
|
CONFIG_AM33XX=y
|
2017-04-25 12:10:11 +08:00
|
|
|
CONFIG_TARGET_BRPPT1=y
|
2016-09-13 13:18:56 +08:00
|
|
|
CONFIG_SPL_SERIAL_SUPPORT=y
|
2017-03-14 01:48:42 +08:00
|
|
|
CONFIG_SPL_NAND_SUPPORT=y
|
2016-09-13 13:19:02 +08:00
|
|
|
CONFIG_SPL_WATCHDOG_SUPPORT=y
|
2016-02-23 13:55:43 +08:00
|
|
|
CONFIG_OF_BOARD_SETUP=y
|
2017-08-08 05:37:18 +08:00
|
|
|
CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
|
2017-07-24 11:19:39 +08:00
|
|
|
CONFIG_ENV_IS_IN_NAND=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>
2016-06-27 15:23:01 +08:00
|
|
|
CONFIG_BOOTDELAY=-2
|
2016-10-18 10:12:37 +08:00
|
|
|
# CONFIG_CONSOLE_MUX is not set
|
|
|
|
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
|
2016-10-18 10:12:59 +08:00
|
|
|
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
|
2016-10-18 10:13:00 +08:00
|
|
|
CONFIG_SYS_CONSOLE_INFO_QUIET=y
|
2016-09-09 14:12:49 +08:00
|
|
|
CONFIG_VERSION_VARIABLE=y
|
2016-10-09 02:41:44 +08:00
|
|
|
# CONFIG_DISPLAY_CPUINFO is not set
|
2016-10-12 09:33:46 +08:00
|
|
|
# CONFIG_DISPLAY_BOARDINFO is not set
|
2017-01-24 04:31:21 +08:00
|
|
|
CONFIG_ARCH_MISC_INIT=y
|
2016-09-13 13:18:22 +08:00
|
|
|
CONFIG_SPL=y
|
2017-03-14 01:48:42 +08:00
|
|
|
CONFIG_SPL_I2C_SUPPORT=y
|
2017-06-19 21:47:40 +08:00
|
|
|
CONFIG_SPL_POWER_SUPPORT=y
|
2017-03-14 01:48:42 +08:00
|
|
|
CONFIG_SPL_YMODEM_SUPPORT=y
|
2016-02-19 19:09:44 +08:00
|
|
|
CONFIG_HUSH_PARSER=y
|
2016-04-25 05:29:26 +08:00
|
|
|
CONFIG_CMD_BOOTZ=y
|
2015-06-23 05:15:30 +08:00
|
|
|
# CONFIG_CMD_IMI is not set
|
|
|
|
# CONFIG_CMD_IMLS is not set
|
|
|
|
# CONFIG_CMD_XIMG is not set
|
|
|
|
# CONFIG_CMD_EDITENV is not set
|
2014-09-16 15:33:01 +08:00
|
|
|
# CONFIG_CMD_CRC32 is not set
|
2015-06-23 05:15:30 +08:00
|
|
|
# CONFIG_CMD_LOADB is not set
|
|
|
|
# CONFIG_CMD_LOADS is not set
|
|
|
|
# CONFIG_CMD_FLASH is not set
|
2016-02-19 19:09:44 +08:00
|
|
|
CONFIG_CMD_NAND=y
|
|
|
|
CONFIG_CMD_I2C=y
|
|
|
|
CONFIG_CMD_USB=y
|
2015-06-23 05:15:30 +08:00
|
|
|
# CONFIG_CMD_FPGA is not set
|
2015-11-11 21:39:33 +08:00
|
|
|
CONFIG_CMD_GPIO=y
|
2015-06-23 05:15:30 +08:00
|
|
|
# CONFIG_CMD_ITEST is not set
|
|
|
|
# CONFIG_CMD_SETEXPR is not set
|
2016-02-19 19:09:44 +08:00
|
|
|
CONFIG_CMD_DHCP=y
|
2015-06-23 05:15:30 +08:00
|
|
|
# CONFIG_CMD_NFS is not set
|
2016-02-19 19:09:44 +08:00
|
|
|
CONFIG_CMD_PING=y
|
|
|
|
CONFIG_CMD_TIME=y
|
2016-04-25 05:29:26 +08:00
|
|
|
CONFIG_CMD_EXT4=y
|
|
|
|
CONFIG_CMD_EXT4_WRITE=y
|
|
|
|
CONFIG_CMD_FAT=y
|
|
|
|
CONFIG_CMD_FS_GENERIC=y
|
2017-07-23 06:36:16 +08:00
|
|
|
CONFIG_CMD_MTDPARTS=y
|
2016-02-19 19:09:44 +08:00
|
|
|
CONFIG_NETCONSOLE=y
|
2017-01-21 18:48:33 +08:00
|
|
|
# CONFIG_MMC is not set
|
2017-08-02 08:19:59 +08:00
|
|
|
CONFIG_PHYLIB=y
|
2017-08-08 05:37:18 +08:00
|
|
|
CONFIG_NAND=y
|
2015-11-19 21:48:14 +08:00
|
|
|
CONFIG_SYS_NS16550=y
|
2016-02-19 19:09:44 +08:00
|
|
|
CONFIG_USB=y
|
|
|
|
CONFIG_USB_MUSB_HOST=y
|
|
|
|
CONFIG_USB_STORAGE=y
|
2017-04-27 12:27:57 +08:00
|
|
|
CONFIG_SYS_WHITE_ON_BLACK=y
|
2016-10-18 10:12:56 +08:00
|
|
|
CONFIG_LCD=y
|
2017-06-02 23:03:50 +08:00
|
|
|
CONFIG_FAT_WRITE=y
|
2016-03-21 21:47:40 +08:00
|
|
|
CONFIG_OF_LIBFDT=y
|