* Code cleanup:
  - remove trailing white space, trailing empty lines, C++ comments, etc.
  - split cmd_boot.c (separate cmd_bdinfo.c and cmd_load.c)

* Patches by Kenneth Johansson, 25 Jun 2003:
  - major rework of command structure
    (work done mostly by Michal Cendrowski and Joakim Kristiansen)
diff --git a/board/MAI/menu/cmd_menu.c b/board/MAI/menu/cmd_menu.c
index 1788173..4c17c6a 100644
--- a/board/MAI/menu/cmd_menu.c
+++ b/board/MAI/menu/cmd_menu.c
@@ -1,9 +1,16 @@
 #include <common.h>
 #include <command.h>
-#include <cmd_menu.h>
 
 int do_menu( cmd_tbl_t *cmdtp, /*bd_t *bd,*/ int flag, int argc, char *argv[] )
 {
-//    printf("<NOT YET IMPLEMENTED>\n");
-    return 0;
+/*	printf("<NOT YET IMPLEMENTED>\n"); */
+	return 0;
 }
+
+#if defined(CONFIG_AMIGAONEG3SE) && (CONFIG_COMMANDS & CFG_CMD_BSP)
+cmd_tbl_t U_BOOT_CMD(MENU) = MK_CMD_ENTRY(
+	"menu",   1,      1,      do_menu,
+	"menu    - display BIOS setup menu\n",
+	""
+);
+#endif
diff --git a/board/MAI/menu/menu.c b/board/MAI/menu/menu.c
index 3130142..c0c63a8 100644
--- a/board/MAI/menu/menu.c
+++ b/board/MAI/menu/menu.c
@@ -41,9 +41,9 @@
 
     s = getenv("menu_disabled");
     if (s) disabled_attr = atoi(s);
-    
+
     for (i=0; i<MAX_MENU_OPTIONS; i++) odata[i].used = 0;
-    
+
     root_menu = root;
 }
 
diff --git a/board/MAI/menu/menu.h b/board/MAI/menu/menu.h
index e5886b8..8aebb7d 100644
--- a/board/MAI/menu/menu.h
+++ b/board/MAI/menu/menu.h
@@ -48,7 +48,7 @@
  * Text:
  *   A single line/limited number of characters text entry box. Text can be restricted
  *   to a certain charset (digits/hex digits/all/custom). Result is also available as an
- *   int if numeric. 
+ *   int if numeric.
  *
  * Selection:
  *   One-of-many type of selection entry. User may choose on of a set of strings, which
@@ -122,7 +122,7 @@
 
     int num_options;             /* Number of mappings */
     menu_select_option_t **options;
-                                 /* Option list array */
+				 /* Option list array */
 } menu_select_t;
 
 
@@ -133,10 +133,10 @@
 {
     OPTION_PREAMBLE
     menu_routine_callback callback;
-                                 /* routine to be called */ 
+				 /* routine to be called */
     void *user_data;             /* User data, don't care for system */
 } menu_routine_t;
-    
+
 
 #define MENU_CUSTOM_TYPE 5
 typedef void (*menu_custom_draw)(struct menu_custom_s *);