From d126e016493dc84a87db4ce87db4c5a94ee29e9a Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Mon, 18 May 2015 14:08:23 +0200 Subject: 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 Reviewed-by: Simon Glass [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 Cc: Masahiro Yamada --- include/configs/atstk1004.h | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'include/configs/atstk1004.h') diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h index 19f049a519..97a1d3ef14 100644 --- a/include/configs/atstk1004.h +++ b/include/configs/atstk1004.h @@ -79,17 +79,7 @@ #define CONFIG_BOOTCOMMAND \ "mmc rescan; ext2load mmc 0:1 0x10200000 /boot/uImage; bootm" -/* - * Only interrupt autoboot if is pressed. Otherwise, garbage - * data on the serial line may interrupt the boot sequence. - */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT \ - "Press SPACE to abort autoboot in %d seconds\n", bootdelay -#define CONFIG_AUTOBOOT_DELAY_STR "d" -#define CONFIG_AUTOBOOT_STOP_STR " " /* * Command line configuration. -- cgit v1.2.1