Prepare v2012.04.01

Signed-off-by: Wolfgang Denk <wd@denx.de>
sandbox: Use the new run_command()
2012-04-25 15:22:50 +02:00 · 2012-04-23 22:53:54 +02:00 · 2012-04-23 22:11:18 +02:00 · 2012-04-23 22:10:41 +02:00 · 2012-04-23 22:07:00 +02:00
4 changed files with 14 additions and 9 deletions
--- a/2
+++ b/2
@@ -23,7 +23,7 @@

 VERSION = 2012
 PATCHLEVEL = 04
-SUBLEVEL =
+SUBLEVEL = 01
 EXTRAVERSION =
 ifneq "$(SUBLEVEL)" ""
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -256,6 +256,7 @@ static int create_fdt(bootm_headers_t *images)

 	fdt_chosen(*of_flat_tree, 1);
 	fixup_memory_node(*of_flat_tree);
+	fdt_fixup_ethernet(*of_flat_tree);
 	fdt_initrd(*of_flat_tree, *initrd_start, *initrd_end, 1);

 	return 0;
@@ -317,6 +318,7 @@ static void boot_jump_linux(bootm_headers_t *images)
 	unsigned long machid = gd->bd->bi_arch_number;
 	char *s;
 	void (*kernel_entry)(int zero, int arch, uint params);
+	unsigned long r2;

 	kernel_entry = (void (*)(int, int, uint))images->ep;

@@ -330,7 +332,15 @@ static void boot_jump_linux(bootm_headers_t *images)
 		"...\n", (ulong) kernel_entry);
 	bootstage_mark(BOOTSTAGE_ID_RUN_OS);
 	announce_and_cleanup();
-	kernel_entry(0, machid, gd->bd->bi_boot_params);
+
+#ifdef CONFIG_OF_LIBFDT
+	if (images->ft_len)
+		r2 = (unsigned long)images->ft_addr;
+	else
+#endif
+		r2 = gd->bd->bi_boot_params;
+
+	kernel_entry(0, machid, r2);
 }

 /* Main Entry point for arm bootm implementation
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -90,13 +90,7 @@ int sandbox_main_loop_init(void)

 	/* Execute command if required */
 	if (state->cmd) {
-		/* TODO: redo this when cmd tidy-up series lands */
-#ifdef CONFIG_SYS_HUSH_PARSER
 		run_command(state->cmd, 0);
-#else
-		parse_string_outer(state->cmd, FLAG_PARSE_SEMICOLON |
-				    FLAG_EXIT_FROM_LOOP);
-#endif
 		os_exit(state->exit_type);
 	}

--- a/common/main.c
+++ b/common/main.c
@@ -1338,7 +1338,8 @@ static int builtin_run_command(const char *cmd, int flag)
 			continue;
 		}

-		rc = cmd_process(flag, argc, argv, &repeatable);
+		if (cmd_process(flag, argc, argv, &repeatable))
+			rc = -1;

 		/* Did the user stop this? */
 		if (had_ctrlc ())
Author	SHA1	Message	Date
Wolfgang Denk	415d386877	Prepare v2012.04.01 Signed-off-by: Wolfgang Denk <wd@denx.de>	2012-04-25 15:22:50 +02:00
Simon Glass	61ddce07f8	sandbox: Use the new run_command() Now that run_command() handles both parsers, clean up sandbox to use it. This fixes a build error. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Mike Frysinger <vapier@gentoo.org>	2012-04-23 22:53:54 +02:00
Stephen Warren	9e02a6b8e5	arm: restore fdt_fixup_ethernet call to do_bootm_linux Commit `0a672d4` "arm: Add Prep subcommand support to bootm" re-organized do_bootm_linux for ARM. During the re-organization, the call to fdt_fixup_ethernet() was removed. I assume this was useful, so add it back. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Tom Rini <trini@ti.com>	2012-04-23 22:11:18 +02:00
Stephen Warren	1723997610	arm: fix bootm with device tree Commit `0a672d4` "arm: Add Prep subcommand support to bootm" re-organized do_bootm_linux() for ARM. During the re-organization, the code to pass the device tree to the kernel was removed. Add it back. This restores the ability to boot a kernel using device tree. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Tom Rini <trini@ti.com> Acked-by: Allen Martin <amartin@nvidia.com> Tested-by: Allen Martin <amartin@nvidia.com>	2012-04-23 22:10:41 +02:00
Timo Ketola	030fca5228	Fix the behaviour of the 'run' command If one command fails, 'run' command should terminate and not execute any remaining variables. Signed-off-by: Timo Ketola <timo@exertus.fi> Tested-by: Wolfgang Denk <wd@denx.de> Tested-by: Simon Glass <sjg@chromium.org> Acked-by: Simon Glass <sjg@chromium.org>	2012-04-23 22:07:00 +02:00