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/UCP1020.h | |
| parent | 2d908fa084a5b5e10a3726e80b42d2ce5100d079 (diff) | |
| download | blackbird-obmc-uboot-d126e016493dc84a87db4ce87db4c5a94ee29e9a.tar.gz blackbird-obmc-uboot-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 'include/configs/UCP1020.h')
| -rw-r--r-- | include/configs/UCP1020.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index ec52d6a768..b9bbe340f3 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -626,17 +626,6 @@ /* default location for tftp and bootm */ #define CONFIG_LOADADDR 1000000 -/* - * Autobooting - */ -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_STOP_STR "\x1b" -#define DEBUG_BOOTKEYS 0 -#undef CONFIG_AUTOBOOT_DELAY_STR -#undef CONFIG_BOOTARGS -#define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds, " \ - "press \"<Esc>\" to stop\n", bootdelay - #define CONFIG_BOOTARGS /* the boot command will set bootargs */ #define CONFIG_BAUDRATE 115200 |
