diff options
| author | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-09 20:05:49 +0000 |
|---|---|---|
| committer | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-09 20:05:49 +0000 |
| commit | dcac9679febc944f79e82fb9970ad83154de22ac (patch) | |
| tree | f3802d48847ce3aef1f9cc6552baeeeb07dd77b2 /hw/mcf5208.c | |
| parent | f78630ab2f4b15d493fa921bb43ddcec4119f6d3 (diff) | |
| download | qemu-dcac9679febc944f79e82fb9970ad83154de22ac.tar.gz qemu-dcac9679febc944f79e82fb9970ad83154de22ac.tar.bz2 qemu-dcac9679febc944f79e82fb9970ad83154de22ac.zip | |
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/mcf5208.c')
| -rw-r--r-- | hw/mcf5208.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/mcf5208.c b/hw/mcf5208.c index dae9a61c2c..02aabdf84c 100644 --- a/hw/mcf5208.c +++ b/hw/mcf5208.c @@ -220,7 +220,7 @@ static void mcf5208evb_init(ram_addr_t ram_size, int vga_ram_size, env->vbr = 0; /* TODO: Configure BARs. */ - /* DRAM at 0x20000000 */ + /* DRAM at 0x40000000 */ cpu_register_physical_memory(0x40000000, ram_size, qemu_ram_alloc(ram_size) | IO_MEM_RAM); @@ -278,8 +278,9 @@ static void mcf5208evb_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); - entry = 0x20000000; + kernel_size = load_image_targphys(kernel_filename, 0x40000000, + ram_size); + entry = 0x40000000; } if (kernel_size < 0) { fprintf(stderr, "qemu: could not load kernel '%s'\n", kernel_filename); |