Revert "i.MX28: Enable additional DRAM address bits"

[oweals/u-boot.git] / common / menu.c

diff --git a/common/menu.c b/common/menu.c
index 5e0817c454bdd128390114dacf315066cba43140..aa16c9a199d772f7bd9971e401efdb883bf06895 100644 (file)
--- a/common/menu.c
+++ b/common/menu.c
@@ -113,6 +113,13 @@ static inline void *menu_item_destroy(struct menu *m,
        return NULL;
 }
 
+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
  * title, if any, and then each item in the menu.
@@ -123,6 +130,7 @@ static inline void menu_display(struct menu *m)
                puts(m->title);
                putc('\n');
        }
+       menu_display_statusline(m);
 
        menu_items_iter(m, menu_item_print, NULL);
 }
@@ -222,13 +230,16 @@ static inline int menu_interactive_choice(struct menu *m, void **choice)
 
                menu_display(m);
 
-               readret = readline_into_buffer("Enter choice: ", cbuf);
+               readret = readline_into_buffer("Enter choice: ", cbuf,
+                               m->timeout);
 
                if (readret >= 0) {
                        choice_item = menu_item_by_key(m, cbuf);
 
-                       if (!choice_item)
+                       if (!choice_item) {
                                printf("%s not found\n", cbuf);
+                               m->timeout = 0;
+                       }
                } else {
                        puts("^C\n");
                        return -EINTR;