From: Simon Glass <sjg@chromium.org>
Date: Sun, 26 Feb 2012 22:38:50 +0000 (-0500)
Subject: sandbox: allow processing before main loop
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ab4e07eb71ca1913e5291316565c9d073987de85;p=project%2Fbcm63xx%2Fu-boot.git

sandbox: allow processing before main loop

In order to pass command line arguments to sandbox we need to be able
to act on them. So take control back at the end of board_init_r() from
where we can call the main loop or do something else.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index 2b66eeddbb..4a84486c1e 100644
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -22,6 +22,11 @@
 #include <common.h>
 #include <asm/state.h>
 
+int sandbox_main_loop_init(void)
+{
+	return 0;
+}
+
 int main(int argc, char *argv[])
 {
 	int err;
diff --git a/arch/sandbox/include/asm/u-boot-sandbox.h b/arch/sandbox/include/asm/u-boot-sandbox.h
index 236b4ee287..99e950b805 100644
--- a/arch/sandbox/include/asm/u-boot-sandbox.h
+++ b/arch/sandbox/include/asm/u-boot-sandbox.h
@@ -35,4 +35,7 @@
 int board_init(void);
 int dram_init(void);
 
+/* start.c */
+int sandbox_main_loop_init(void);
+
 #endif	/* _U_BOOT_SANDBOX_H_ */
diff --git a/arch/sandbox/lib/board.c b/arch/sandbox/lib/board.c
index 6d464d6ae8..25a8d02fd7 100644
--- a/arch/sandbox/lib/board.c
+++ b/arch/sandbox/lib/board.c
@@ -269,6 +269,8 @@ void board_init_r(gd_t *id, ulong dest_addr)
 	post_run(NULL, POST_RAM | post_bootmode_get(0));
 #endif
 
+	sandbox_main_loop_init();
+
 	/*
 	 * For now, run the main loop. Later we might let this be done
 	 * in the main program.