summaryrefslogtreecommitdiffstats
path: root/include/configs/calimain.h
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 /include/configs/calimain.h
parent3191d8408053674c1b9bb79a82e3973add48830c (diff)
downloadtalos-obmc-uboot-bb597c0eeb7ee2f6e983577d993c76a30dd3c2b4.tar.gz
talos-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 'include/configs/calimain.h')
-rw-r--r--include/configs/calimain.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/calimain.h b/include/configs/calimain.h
index 506ad882c8..3b10360b5e 100644
--- a/include/configs/calimain.h
+++ b/include/configs/calimain.h
@@ -214,7 +214,6 @@
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_BOOTARGS ""
#define CONFIG_BOOTCOMMAND "run checkupdate; run checkbutton;"
-#define CONFIG_BOOTDELAY 0
#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */
#define CONFIG_BOOT_RETRY_TIME 60 /* continue boot after 60 s inactivity */
#define CONFIG_RESET_TO_RETRY
OpenPOWER on IntegriCloud