X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=common%2Fmenu.c;h=e81c074f36c60a92e8223eed055e5b022c697ad8;hb=f32abd0c1a0079a0455a051559addab54af8c597;hp=ba393adc32cbf1e3c26f1e6dfcc8f247fd43691a;hpb=778c3cbd857f4abe54773f399204dd86ffe6516c;p=karo-tx-uboot.git

diff --git a/common/menu.c b/common/menu.c
index ba393adc32..e81c074f36 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <cli.h>
 #include <malloc.h>
 #include <errno.h>
 #include <linux/list.h>
@@ -104,12 +105,9 @@ static inline void *menu_item_destroy(struct menu *m,
 	return NULL;
 }
 
-void __menu_display_statusline(struct menu *m)
+__weak void menu_display_statusline(struct menu *m)
 {
-	return;
 }
-void menu_display_statusline(struct menu *m)
-	__attribute__ ((weak, alias("__menu_display_statusline")));
 
 /*
  * Display a menu so the user can make a choice of an item. First display its
@@ -196,8 +194,9 @@ static inline int menu_interactive_choice(struct menu *m, void **choice)
 		menu_display(m);
 
 		if (!m->item_choice) {
-			readret = readline_into_buffer("Enter choice: ", cbuf,
-					m->timeout / 10);
+			readret = cli_readline_into_buffer("Enter choice: ",
+							   cbuf,
+							   m->timeout / 10);
 
 			if (readret >= 0) {
 				choice_item = menu_item_by_key(m, cbuf);