summaryrefslogtreecommitdiff
path: root/configs/CPCI4052_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/CPCI4052_defconfig
parent2d908fa084a5b5e10a3726e80b42d2ce5100d079 (diff)
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/CPCI4052_defconfig')
-rw-r--r--configs/CPCI4052_defconfig5
1 files changed, 4 insertions, 1 deletions
diff --git a/configs/CPCI4052_defconfig b/configs/CPCI4052_defconfig
index 1eff08299e..93ab5b0ac0 100644
--- a/configs/CPCI4052_defconfig
+++ b/configs/CPCI4052_defconfig
@@ -1,4 +1,7 @@
CONFIG_PPC=y
+CONFIG_CMD_NET=y
CONFIG_4xx=y
CONFIG_TARGET_CPCI4052=y
-CONFIG_CMD_NET=y
+CONFIG_AUTOBOOT_KEYED=y
+CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
+CONFIG_AUTOBOOT_STOP_STR=" "