X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=common%2Fmenu.c;h=c53030f3653d9605062926cb4454b92705757ed6;hb=3fda4ef39557c070558d51c4ea4562c370c3f96d;hp=94afeb290098dc4b1356496ade659d1985fcd143;hpb=dab5e3469d294a4e1ffed8407d296a78e02cc01f;p=karo-tx-uboot.git

diff --git a/common/menu.c b/common/menu.c
index 94afeb2900..c53030f365 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -105,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
@@ -205,6 +202,9 @@ static inline int menu_interactive_choice(struct menu *m, void **choice)
 				choice_item = menu_item_by_key(m, cbuf);
 				if (!choice_item)
 					printf("%s not found\n", cbuf);
+			} else if (readret == -1)  {
+				printf("<INTERRUPT>\n");
+				return -EINTR;
 			} else {
 				return menu_default_choice(m, choice);
 			}
@@ -350,7 +350,7 @@ int menu_item_add(struct menu *m, char *item_key, void *item_data)
  * make it obvious what the key for each entry is.
  *
  * item_choice - If not NULL, will be called when asking the user to choose an
- * item. Returns a key string corresponding to the choosen item or NULL if
+ * item. Returns a key string corresponding to the chosen item or NULL if
  * no item has been selected.
  *
  * item_choice_data - Will be passed as the argument to the item_choice function