[U-Boot] [PATCH 10/18] autoboot: Drop unused CONFIG_MENUPROMPT

Simon Glass sjg at chromium.org
Sun May 5 21:53:34 UTC 2019


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 at chromium.org>
---

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

diff --git a/common/autoboot.c b/common/autoboot.c
index 012dd5797e1..a6071ab8391 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 787cefc1507..fc77e0de3fa 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1199,7 +1199,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
-- 
2.21.0.1020.gf2820cf01a-goog



More information about the U-Boot mailing list