From 4a569ab9dc48c62c553b462e2717cb61527ecaf9 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 28 Nov 2005 13:15:08 +0000
Subject: [PATCH] --- yaml --- r: 14919 b: refs/heads/master c:
 fe3d72858c34a464976c6f8076971e2862d5c3b8 h: refs/heads/master i:   14917:
 dd515f3e1674b0222c24a4bc0220ba59b70b8877   14915:
 f24141ba66269ac434de74b184725604e675dfc6   14911:
 90f1568536d56739204c18aee177886ef6840ea9 v: v3

---
 [refs]                            |  2 +-
 trunk/arch/mips/qemu/q-firmware.c | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e2046604ba78..6c2483f627e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e76beeebff09b6a5eb338f306349ddc451a7804d
+refs/heads/master: fe3d72858c34a464976c6f8076971e2862d5c3b8
diff --git a/trunk/arch/mips/qemu/q-firmware.c b/trunk/arch/mips/qemu/q-firmware.c
index 5980f02b2df9..fb2a8673a6bf 100644
--- a/trunk/arch/mips/qemu/q-firmware.c
+++ b/trunk/arch/mips/qemu/q-firmware.c
@@ -1,7 +1,18 @@
 #include <linux/init.h>
+#include <linux/string.h>
+#include <asm/addrspace.h>
 #include <asm/bootinfo.h>
 
 void __init prom_init(void)
 {
-	add_memory_region(0x0<<20, 0x10<<20, BOOT_MEM_RAM);
+	int *cmdline;
+
+	cmdline = (int *) (CKSEG0 + (0x10 << 20) - 260);
+	if (*cmdline == 0x12345678) {
+		if (*(char *)(cmdline + 1))
+			strcpy (arcs_cmdline, (char *)(cmdline + 1));
+		add_memory_region(0x0<<20, cmdline[-1], BOOT_MEM_RAM);
+	} else {
+		add_memory_region(0x0<<20, 0x10<<20, BOOT_MEM_RAM);
+	}
 }