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/calimain.h | |
| parent | 2d908fa084a5b5e10a3726e80b42d2ce5100d079 (diff) | |
| download | u-boot-imx-d126e016493dc84a87db4ce87db4c5a94ee29e9a.zip u-boot-imx-d126e016493dc84a87db4ce87db4c5a94ee29e9a.tar.gz u-boot-imx-d126e016493dc84a87db4ce87db4c5a94ee29e9a.tar.bz2 | |
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/calimain.h')
| -rw-r--r-- | include/configs/calimain.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/calimain.h b/include/configs/calimain.h index 5169b41..8353fc9 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -221,8 +221,6 @@ #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_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_DELAY_STR "\x0d" /* press ENTER to interrupt BOOT */ #define CONFIG_RESET_TO_RETRY /* |