diff options
author | Stefan Roese <sr@denx.de> | 2015-05-18 14:08:23 +0200 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-06-08 17:32:16 -0400 |
commit | d126e016493dc84a87db4ce87db4c5a94ee29e9a (patch) | |
tree | f9eb404ba50886cccd39f18ea28a27464e4ff95b /include/configs/CPCI4052.h | |
parent | 2d908fa084a5b5e10a3726e80b42d2ce5100d079 (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 'include/configs/CPCI4052.h')
-rw-r--r-- | include/configs/CPCI4052.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index ceddd7accc..c20ecbd06d 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -141,12 +141,6 @@ #define CONFIG_VERSION_VARIABLE 1 /* include version env variable */ -#define CONFIG_AUTOBOOT_KEYED 1 -#define CONFIG_AUTOBOOT_PROMPT \ - "Press SPACE to abort autoboot in %d seconds\n", bootdelay -#undef CONFIG_AUTOBOOT_DELAY_STR -#define CONFIG_AUTOBOOT_STOP_STR " " - #define CONFIG_SYS_RX_ETH_BUFFER 16 /* use 16 rx buffer on 405 emac */ /*----------------------------------------------------------------------- |