[U-Boot,v2,10/18] autoboot: Drop unused CONFIG_MENUPROMPT
diff mbox series

Message ID 20190721025128.30351-11-sjg@chromium.org
State Accepted
Delegated to: Tom Rini
Headers show
Series
  • autoboot: Tidy up autoboot code
Related show

Commit Message

Simon Glass July 21, 2019, 2:51 a.m. UTC
This is not defined by any board. We could use CONFIG_AUTOBOOT_PROMPT
instead perhaps, but this depends on CONFIG_AUTOBOOT_KEYED which is not
used for the single-key case.

So let's just remove CONFIG_MENUPROMPT.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

Changes in v2: None

 common/autoboot.c            | 4 ----
 scripts/config_whitelist.txt | 1 -
 2 files changed, 5 deletions(-)

Patch
diff mbox series

diff --git a/common/autoboot.c b/common/autoboot.c
index 012dd5797e..a6071ab839 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -233,11 +233,7 @@  static int abortboot_single_key(int bootdelay)
 	int abort = 0;
 	unsigned long ts;
 
-#ifdef CONFIG_MENUPROMPT
-	printf(CONFIG_MENUPROMPT);
-#else
 	printf("Hit any key to stop autoboot: %2d ", bootdelay);
-#endif
 
 	/*
 	 * Check if key already pressed
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 7e6c9e3016..bd05b9c4da 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1142,7 +1142,6 @@  CONFIG_MEM_HOLE_16M
 CONFIG_MEM_INIT_VALUE
 CONFIG_MEM_REMAP
 CONFIG_MENUKEY
-CONFIG_MENUPROMPT
 CONFIG_MENU_SHOW
 CONFIG_MFG_ENV_SETTINGS
 CONFIG_MIIM_ADDRESS