diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2009-10-07 13:37:06 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-12 09:42:31 -0500 |
| commit | 138eebb3a5ab59df2eb1856bf9daaa8680b77431 (patch) | |
| tree | 1b061a3da7b69089de1822efa9f15c66cfba8880 /hw/r2d.c | |
| parent | c173db85dab6eb8f6adafe9ef4a8ea8e4ea65435 (diff) | |
| download | qemu-138eebb3a5ab59df2eb1856bf9daaa8680b77431.tar.gz qemu-138eebb3a5ab59df2eb1856bf9daaa8680b77431.tar.bz2 qemu-138eebb3a5ab59df2eb1856bf9daaa8680b77431.zip | |
rom loader: fix sparc -kernel boot.
Changes:
(1) register pstrcpy_targphys() in rom list, it is used for kernel
command lines by a number of architectures.
(2) add rom_ptr() function to get a pointer for applying changes
to loaded images. Needed for example to tell the linux kernel
where it finds the initrd image by updating the header.
(3) make sparc use rom_ptr for initrd setup.
booting sparc-test works now, and 'info roms' shows this:
(qemu) info roms
addr=0000000000000000 size=0x2a3828 mem=ram name="phdr #0: vmlinux-2.6.11+tcx"
addr=00000000007ff000 size=0x00000e mem=ram name="cmdline"
addr=0000000000800000 size=0x400000 mem=ram name="/root/qemu-test/sparc-test/linux.img"
addr=0000000070000000 size=0x0e4000 mem=rom name="phdr #0: /home/kraxel/projects/qemu/build-zfull/pc-bios/openbios-sparc32"
reboot via 'system_reset' works too.
Patchworks-ID: 35262
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/r2d.c')
| -rw-r--r-- | hw/r2d.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -250,7 +250,7 @@ static void r2d_init(ram_addr_t ram_size, SDRAM_BASE + LINUX_LOAD_OFFSET, SDRAM_SIZE - LINUX_LOAD_OFFSET); env->pc = (SDRAM_BASE + LINUX_LOAD_OFFSET) | 0xa0000000; - pstrcpy_targphys(SDRAM_BASE + 0x10100, 256, kernel_cmdline); + pstrcpy_targphys("cmdline", SDRAM_BASE + 0x10100, 256, kernel_cmdline); } else { kernel_size = load_image_targphys(kernel_filename, SDRAM_BASE, SDRAM_SIZE); env->pc = SDRAM_BASE | 0xa0000000; /* Start from P2 area */ |