aboutsummaryrefslogtreecommitdiff
path: root/hw/etraxfs.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/etraxfs.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/etraxfs.c')
-rw-r--r--hw/etraxfs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/etraxfs.c b/hw/etraxfs.c
index eda9929..445f5f9 100644
--- a/hw/etraxfs.c
+++ b/hw/etraxfs.c
@@ -129,7 +129,8 @@ void bareetraxfs_init (ram_addr_t ram_size, int vga_ram_size,
bootstrap_pc = entry;
if (kernel_size < 0) {
/* Takes a kimage from the axis devboard SDK. */
- kernel_size = load_image(kernel_filename, phys_ram_base + 0x4000);
+ kernel_size = load_image_targphys(kernel_filename, 0x40004000,
+ ram_size);
bootstrap_pc = 0x40004000;
env->regs[9] = 0x40004000 + kernel_size;
}