summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Chou <thomas@wytron.com.tw>2010-03-24 11:41:46 +0800
committerScott McNutt <smcnutt@psyent.com>2010-04-02 12:28:41 -0400
commited2941578480d30b413e081b6f1a5675d4afd9e2 (patch)
tree5d0a0049a6131113ca29d1e13846bfe3b498e2ed
parent9e486ab1c98ea7ab357520307fe5d5a0847cd1bb (diff)
downloadu-boot-imx-ed2941578480d30b413e081b6f1a5675d4afd9e2.zip
u-boot-imx-ed2941578480d30b413e081b6f1a5675d4afd9e2.tar.gz
u-boot-imx-ed2941578480d30b413e081b6f1a5675d4afd9e2.tar.bz2
nios2: pass command line and initrd to linux in bootm.c
This patch adds bootargs passing to nios2 linux. The args passing is enabled with, r4 : 'NIOS' magic r5 : pointer to initrd start r6 : pointer to initrd end r7 : pointer to command line Signed-off-by: Thomas Chou <thomas@wytron.com.tw> Signed-off-by: Scott McNutt <smcnutt@psyent.com>
-rw-r--r--lib_nios2/bootm.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/lib_nios2/bootm.c b/lib_nios2/bootm.c
index 675bfac..5d25edf 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 *)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((ulong)kernel, CONFIG_SYS_DCACHE_SIZE);
+ flush_icache((ulong)kernel, CONFIG_SYS_ICACHE_SIZE);
- /* For now we assume the Microtronix linux ... which only
- * needs to be called ;-)
- */
- kernel ();
+ debug("bootargs=%s @ 0x%lx\n", commandline, (ulong)&commandline);
+ debug("initrd=0x%lx-0x%lx\n", (ulong)initrd_start, (ulong)initrd_end);
+ kernel(NIOS_MAGIC, initrd_start, initrd_end, commandline);
/* does not return */
return 1;