[U-Boot] [PATCH 18/28] nios2: pass command line and initrd to linux

Thomas Chou thomas at wytron.com.tw
Fri Mar 19 08:43:43 CET 2010


The bootargs passing to nios2 linux is enabled with 'NIOS' magic as
the first argument.

Signed-off-by: Thomas Chou <thomas at wytron.com.tw>
---
 lib_nios2/bootm.c |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib_nios2/bootm.c b/lib_nios2/bootm.c
index 675bfac..302f709 100644
--- a/lib_nios2/bootm.c
+++ b/lib_nios2/bootm.c
@@ -26,21 +26,26 @@
 #include <asm/byteorder.h>
 #include <asm/cache.h>
 
+#define NIOS_MAGIC 0x534f494e /* enable command line and initrd passing */
+
 int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 {
-	void (*kernel)(void) = (void (*)(void))images->ep;
+	void (*kernel)(int, int, int, char *) = (void (*)(void))images->ep;
+	char *commandline = getenv("bootargs");
+	ulong initrd_start = images->rd_start;
+	ulong initrd_end = images->rd_end;
 
 	if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
 		return 1;
 
 	/* flushes data and instruction caches before calling the kernel */
-	flush_dcache (0,CONFIG_SYS_DCACHE_SIZE);
-	flush_icache (0,CONFIG_SYS_ICACHE_SIZE);
+	disable_interrupts();
+	flush_dcache((unsigned long) kernel, CONFIG_SYS_DCACHE_SIZE);
+	flush_icache((unsigned long) kernel, CONFIG_SYS_ICACHE_SIZE);
 
-	/* For now we assume the Microtronix linux ... which only
-	 * needs to be called ;-)
-	 */
-	kernel ();
+	printf("bootargs=%s @ 0x%x\n", commandline, &commandline);
+	printf("initrd=0x%x-0x%x\n", initrd_start, initrd_end);
+	kernel(NIOS_MAGIC, initrd_start, initrd_end, commandline);
 	/* does not return */
 
 	return 1;
-- 
1.6.6.1



More information about the U-Boot mailing list