summaryrefslogtreecommitdiffstats
path: root/configs/calimain_defconfig
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2015-05-18 14:08:23 +0200
committerTom Rini <trini@konsulko.com>2015-06-08 17:32:16 -0400
commitd126e016493dc84a87db4ce87db4c5a94ee29e9a (patch)
treef9eb404ba50886cccd39f18ea28a27464e4ff95b /configs/calimain_defconfig
parent2d908fa084a5b5e10a3726e80b42d2ce5100d079 (diff)
downloadu-boot-d126e016493dc84a87db4ce87db4c5a94ee29e9a.tar.gz
u-boot-d126e016493dc84a87db4ce87db4c5a94ee29e9a.tar.xz
u-boot-d126e016493dc84a87db4ce87db4c5a94ee29e9a.zip
autoboot.c: Move config options to Kconfig
This patch moves the following config options to Kconfig: CONFIG_AUTOBOOT_KEYED CONFIG_AUTOBOOT_PROMPT CONFIG_AUTOBOOT_DELAY_STR CONFIG_AUTOBOOT_STOP_STR AUTOBOOT_KEYED_CTRLC Signed-off-by: Stefan Roese <sr@denx.de> Reviewed-by: Simon Glass <sjg@chromium.org> [trini: Drop ip04 and pm9263 configs/ additions, those boards previously set CONFIG_AUTOBOOT_PROMPT but never used it, re-run savedefconfig over all boards that did change. Make digsy_mtc_* string include seconds to match others and not warn. ] Signed-off-by: Tom Rini <trini@konsulko.com> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'configs/calimain_defconfig')
-rw-r--r--configs/calimain_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/configs/calimain_defconfig b/configs/calimain_defconfig
index a601b0381d..b1c5fa933c 100644
--- a/configs/calimain_defconfig
+++ b/configs/calimain_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_CALIMAIN=y
CONFIG_CMD_NET=y
+CONFIG_AUTOBOOT_KEYED=y
+CONFIG_AUTOBOOT_STOP_STR="\x0b"