[new uImage] Respect autostart setting in linux bootm

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Marian Balakowicz <m8@semihalf.com>

lib_arm/bootm.c

diff --git a/lib_arm/bootm.c b/lib_arm/bootm.c
index e1a9ee2..77d35fc 100644
--- a/lib_arm/bootm.c
+++ b/lib_arm/bootm.c
@@ -133,6 +133,9 @@
 	setup_end_tag (bd);
 #endif
 
+	if (!images->autostart)
+		return ;
+
 	/* we assume that the kernel is in place */
 	printf ("\nStarting kernel ...\n\n");
 

lib_avr32/bootm.c

diff --git a/lib_avr32/bootm.c b/lib_avr32/bootm.c
index 69a69df..918e4cf 100644
--- a/lib_avr32/bootm.c
+++ b/lib_avr32/bootm.c
@@ -214,6 +214,9 @@
 	params = setup_ethernet_tags(params);
 	setup_end_tag(params);
 
+	if (!images->autostart)
+		return ;
+
 	printf("\nStarting kernel at %p (params at %p)...\n\n",
 	       theKernel, params_start);
 

lib_blackfin/bootm.c

diff --git a/lib_blackfin/bootm.c b/lib_blackfin/bootm.c
index 26ac88b..33979a9 100644
--- a/lib_blackfin/bootm.c
+++ b/lib_blackfin/bootm.c
@@ -53,6 +53,9 @@
 	char	*cmdline;
 	ulong	ep = 0;
 
+	if (!images->autostart)
+		return ;
+
 #ifdef SHARED_RESOURCES
 	swap_to(FLASH);
 #endif

lib_i386/bootm.c

diff --git a/lib_i386/bootm.c b/lib_i386/bootm.c
index aea58d1..89a423c 100644
--- a/lib_i386/bootm.c
+++ b/lib_i386/bootm.c
@@ -72,6 +72,9 @@
 
 	}
 
+	if (!images->autostart)
+		return ;
+
 #ifdef DEBUG
 	printf ("## Transferring control to Linux (at address %08x) ...\n",
 		(u32)base_ptr);

lib_m68k/bootm.c

diff --git a/lib_m68k/bootm.c b/lib_m68k/bootm.c
index eca044e..e12d1d4 100644
--- a/lib_m68k/bootm.c
+++ b/lib_m68k/bootm.c
@@ -127,6 +127,8 @@
 
 	show_boot_progress (15);
 
+	if (!images->autostart)
+		return;
 	/*
 	 * Linux Kernel Parameters (passing board info data):
 	 *   r3: ptr to board info data
@@ -140,7 +142,8 @@
 	return ;
 
 error:
-	do_reset (cmdtp, flag, argc, argv);
+	if (images->autostart)
+		do_reset (cmdtp, flag, argc, argv);
 	return ;
 }
 

lib_microblaze/bootm.c

diff --git a/lib_microblaze/bootm.c b/lib_microblaze/bootm.c
index 5881df6..99c4533 100644
--- a/lib_microblaze/bootm.c
+++ b/lib_microblaze/bootm.c
@@ -63,5 +63,8 @@
 		(ulong) theKernel);
 #endif
 
+	if (!images->autostart)
+		return ;
+
 	theKernel (commandline);
 }

lib_mips/bootm.c

diff --git a/lib_mips/bootm.c b/lib_mips/bootm.c
index 998aa22..39869c1 100644
--- a/lib_mips/bootm.c
+++ b/lib_mips/bootm.c
@@ -106,6 +106,9 @@
 	sprintf (env_buf, "0x%X", (uint) (gd->bd->bi_flashsize));
 	linux_env_set ("flash_size", env_buf);
 
+	if (!images->autostart)
+		return ;
+
 	/* we assume that the kernel is in place */
 	printf ("\nStarting kernel ...\n\n");
 

lib_nios2/bootm.c

diff --git a/lib_nios2/bootm.c b/lib_nios2/bootm.c
index 70d2bb0..4b940cb 100644
--- a/lib_nios2/bootm.c
+++ b/lib_nios2/bootm.c
@@ -46,6 +46,9 @@
 	}
 	void (*kernel)(void) = (void (*)(void))ep;
 
+	if (!images->autostart)
+		return ;
+
 	/* For now we assume the Microtronix linux ... which only
 	 * needs to be called ;-)
 	 */

lib_ppc/bootm.c

diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c
index 59cc2a4..1afef46 100644
--- a/lib_ppc/bootm.c
+++ b/lib_ppc/bootm.c
@@ -242,6 +242,8 @@
 #if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500)
 	unlock_ram_in_cache();
 #endif
+	if (!images->autostart)
+		return ;
 
 #if defined(CONFIG_OF_LIBFDT)
 	if (of_flat_tree) {	/* device tree; boot new style */
@@ -270,7 +272,8 @@
 	return ;
 
 error:
-	do_reset (cmdtp, flag, argc, argv);
+	if (images->autostart)
+		do_reset (cmdtp, flag, argc, argv);
 	return ;
 }
 

lib_sh/bootm.c

diff --git a/lib_sh/bootm.c b/lib_sh/bootm.c
index de5c9ea..8055841 100644
--- a/lib_sh/bootm.c
+++ b/lib_sh/bootm.c
@@ -79,6 +79,9 @@
 	}
 	void (*kernel) (void) = (void (*)(void))ep;
 
+	if (!images->autostart)
+		return ;
+
 	/* Setup parameters */
 	memset(PARAM, 0, 0x1000);	/* Clear zero page */
 	strcpy(COMMAND_LINE, bootargs);