aboutsummaryrefslogtreecommitdiff
path: root/hw/dummy_m68k.c
diff options
context:
space:
mode:
authorpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2009-04-09 20:05:49 +0000
committerpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2009-04-09 20:05:49 +0000
commitdcac9679febc944f79e82fb9970ad83154de22ac (patch)
treef3802d48847ce3aef1f9cc6552baeeeb07dd77b2 /hw/dummy_m68k.c
parentf78630ab2f4b15d493fa921bb43ddcec4119f6d3 (diff)
downloadqemu-dcac9679febc944f79e82fb9970ad83154de22ac.zip
qemu-dcac9679febc944f79e82fb9970ad83154de22ac.tar.gz
qemu-dcac9679febc944f79e82fb9970ad83154de22ac.tar.bz2
Use load_image_targphys and avoid phys_ram_base.
Signed-off-by: Paul Brook <paul@codesourcery.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7056 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/dummy_m68k.c')
-rw-r--r--hw/dummy_m68k.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/dummy_m68k.c b/hw/dummy_m68k.c
index 9c0a9dc..d9f1444 100644
--- a/hw/dummy_m68k.c
+++ b/hw/dummy_m68k.c
@@ -47,8 +47,9 @@ static void dummy_m68k_init(ram_addr_t ram_size, int vga_ram_size,
kernel_size = load_uimage(kernel_filename, &entry, NULL, NULL);
}
if (kernel_size < 0) {
- kernel_size = load_image(kernel_filename,
- phys_ram_base + KERNEL_LOAD_ADDR);
+ kernel_size = load_image_targphys(kernel_filename,
+ KERNEL_LOAD_ADDR,
+ ram_size - KERNEL_LOAD_ADDR);
entry = KERNEL_LOAD_ADDR;
}
if (kernel_size < 0) {