summaryrefslogtreecommitdiffstats
path: root/configs/ls1012ardb_qspi_defconfig
diff options
context:
space:
mode:
authorHeiko Schocher <hs@denx.de>2016-06-07 08:31:14 +0200
committerTom Rini <trini@konsulko.com>2016-06-09 13:53:05 -0400
commitbb597c0eeb7ee2f6e983577d993c76a30dd3c2b4 (patch)
tree7f5c1ebb627cae3a7d7013eaeb68b1fa73e39d82 /configs/ls1012ardb_qspi_defconfig
parent3191d8408053674c1b9bb79a82e3973add48830c (diff)
downloadblackbird-obmc-uboot-bb597c0eeb7ee2f6e983577d993c76a30dd3c2b4.tar.gz
blackbird-obmc-uboot-bb597c0eeb7ee2f6e983577d993c76a30dd3c2b4.zip
common: bootdelay: move CONFIG_BOOTDELAY into a Kconfig option
move CONFIG_BOOTDELAY into a Kconfig option. Used for this purpose the moveconfig.py tool in tools. Signed-off-by: Heiko Schocher <hs@denx.de> Reviewed-by: Tom Rini <trini@konsulko.com> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Diffstat (limited to 'configs/ls1012ardb_qspi_defconfig')
-rw-r--r--configs/ls1012ardb_qspi_defconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/configs/ls1012ardb_qspi_defconfig b/configs/ls1012ardb_qspi_defconfig
index 5c28bd1071..3806412919 100644
--- a/configs/ls1012ardb_qspi_defconfig
+++ b/configs/ls1012ardb_qspi_defconfig
@@ -1,7 +1,6 @@
CONFIG_ARM=y
CONFIG_TARGET_LS1012ARDB=y
# CONFIG_SYS_MALLOC_F is not set
-CONFIG_SPI_FLASH=y
CONFIG_DM_SPI=y
CONFIG_DM_SPI_FLASH=y
CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-rdb"
@@ -10,6 +9,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
+CONFIG_BOOTDELAY=10
CONFIG_HUSH_PARSER=y
CONFIG_CMD_GREPENV=y
CONFIG_CMD_MMC=y
@@ -26,6 +26,7 @@ CONFIG_CMD_FAT=y
CONFIG_OF_CONTROL=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_DM=y
+CONFIG_SPI_FLASH=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
OpenPOWER on IntegriCloud