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/nseries.c | |
| parent | f78630ab2f4b15d493fa921bb43ddcec4119f6d3 (diff) | |
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/nseries.c')
| -rw-r--r-- | hw/nseries.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/hw/nseries.c b/hw/nseries.c index 0c7da77f8..f69872e1e 100644 --- a/hw/nseries.c +++ b/hw/nseries.c @@ -1341,6 +1341,7 @@ static void n8x0_init(ram_addr_t ram_size, const char *boot_device, } if (option_rom[0] && (boot_device[0] == 'n' || !kernel_filename)) { + int rom_size; /* No, wait, better start at the ROM. */ s->cpu->env->regs[15] = OMAP2_Q2_BASE + 0x400000; @@ -1353,8 +1354,10 @@ static void n8x0_init(ram_addr_t ram_size, const char *boot_device, * * The code above is for loading the `zImage' file from Nokia * images. */ - printf("%i bytes of image loaded\n", load_image(option_rom[0], - phys_ram_base + 0x400000)); + rom_size = load_image_targphys(option_rom[0], + OMAP2_Q2_BASE + 0x400000, + sdram_size - 0x400000); + printf("%i bytes of image loaded\n", rom_size); n800_setup_nolo_tags(phys_ram_base + sdram_size); } |