Index: u-boot/board/neo1973/gta02/gta02.c
===================================================================
--- u-boot.orig/board/neo1973/gta02/gta02.c
+++ u-boot/board/neo1973/gta02/gta02.c
@@ -73,6 +73,7 @@
 extern unsigned char booted_from_nor;
 extern int nobootdelay;
 char __cfg_prompt[20] = "GTA02vXX # ";
+int enter_bootmenu = 0;
 
 /*
  * In >GTA02v5, use gta02_revision to test for features, not
@@ -352,7 +353,6 @@
 	char buf[32];
 	int menu_vote = 0; /* <= 0: no, > 0: yes */
 	int seconds = 0;
-	int enter_bootmenu;
 
 	set_revision();
 
@@ -431,7 +431,8 @@
 	neo1973_poweroff();
 
 continue_boot:
-	enter_bootmenu = menu_vote > 0 || booted_from_nor;
+	if (menu_vote > 0 || booted_from_nor)
+		enter_bootmenu = 1;
 	smedia3362_lcm_reset(1);
 	if (!enter_bootmenu && getenv("splashimage"))
 		run_command(getenv("splashimage"), 0);
Index: u-boot/common/env_nand.c
===================================================================
--- u-boot.orig/common/env_nand.c
+++ u-boot/common/env_nand.c
@@ -312,8 +312,11 @@
 #if !defined(ENV_IS_EMBEDDED)
 static void use_default()
 {
+	extern int enter_bootmenu;
+
 	puts ("*** Warning - bad CRC or NAND, using default environment\n\n");
 	default_env();
+	enter_bootmenu = 1;
 }
 #endif