summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdgar E. Iglesias <edgar.iglesias@gmail.com>2009-05-15 16:53:53 +0200
committerEdgar E. Iglesias <edgar.iglesias@gmail.com>2009-05-15 21:43:56 +0200
commit1570841432555416a2f8eb9069e74dfc9391a610 (patch)
treeee2220238ffa3efa93c887749d6d1c6a940490ce
parenta59cc95e232e365a0cb7f3319b048f7f56f10a6b (diff)
downloadqemu-1570841432555416a2f8eb9069e74dfc9391a610.tar.gz
ETRAX: Correct passing of kernel command line.
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
-rw-r--r--hw/axis_dev88.c4
-rw-r--r--hw/etraxfs.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c
index e7fdc639e6..9753868d87 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 eda992971f..dceee9c449 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;