From: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Date: Fri, 15 May 2009 14:53:53 +0000 (+0200)
Subject: ETRAX: Correct passing of kernel command line.
X-Git-Tag: v0.10.5~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1570841432555416a2f8eb9069e74dfc9391a610;p=thirdparty%2Fqemu.git

ETRAX: Correct passing of kernel command line.

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
---

diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c
index e7fdc639e62..9753868d871 100644
--- a/hw/axis_dev88.c
+++ b/hw/axis_dev88.c
@@ -349,10 +349,10 @@ void axisdev88_init (ram_addr_t ram_size, int vga_ram_size,
                 fprintf(stderr, "Too long CRIS kernel cmdline (max 256)\n");
                 exit(1);
             }
-            pstrcpy_targphys(high, 256, kernel_cmdline);
             /* Let the kernel know we are modifying the cmdline.  */
             env->regs[10] = 0x87109563;
-            env->regs[11] = high;
+            env->regs[11] = 0x40000000;
+            pstrcpy_targphys(env->regs[11], 256, kernel_cmdline);
         }
     }
     env->pc = bootstrap_pc;
diff --git a/hw/etraxfs.c b/hw/etraxfs.c
index eda992971f5..dceee9c4491 100644
--- a/hw/etraxfs.c
+++ b/hw/etraxfs.c
@@ -140,10 +140,10 @@ void bareetraxfs_init (ram_addr_t ram_size, int vga_ram_size,
                 fprintf(stderr, "Too long CRIS kernel cmdline (max 256)\n");
                 exit(1);
             }
-            pstrcpy_targphys(high, 256, kernel_cmdline);
             /* Let the kernel know we are modifying the cmdline.  */
             env->regs[10] = 0x87109563;
-            env->regs[11] = high;
+            env->regs[11] = 0x40000000;
+            pstrcpy_targphys(env->regs[11], 256, kernel_cmdline);
         }
     }
     env->pc = bootstrap_pc;