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 /configs/x600_defconfig | |
| 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 'configs/x600_defconfig')
| -rw-r--r-- | configs/x600_defconfig | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configs/x600_defconfig b/configs/x600_defconfig index 3122a2b..8e22a18 100644 --- a/configs/x600_defconfig +++ b/configs/x600_defconfig @@ -1,6 +1,9 @@ CONFIG_ARM=y CONFIG_TARGET_X600=y CONFIG_NETDEVICES=y -CONFIG_SPL=y CONFIG_CMD_NET=y +CONFIG_SPL=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n" +CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_ETH_DESIGNWARE=y |