diff options
Diffstat (limited to 'hw/palm.c')
-rw-r--r-- | hw/palm.c | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -247,16 +247,21 @@ static void palmte_init(ram_addr_t ram_size, int vga_ram_size, /* Setup initial (reset) machine state */ if (nb_option_roms) { rom_size = get_image_size(option_rom[0]); - if (rom_size > flash_size) + if (rom_size > flash_size) { fprintf(stderr, "%s: ROM image too big (%x > %x)\n", __FUNCTION__, rom_size, flash_size); - else if (rom_size > 0 && load_image(option_rom[0], - phys_ram_base + phys_flash) > 0) { + rom_size = 0; + } + if (rom_size > 0) { + rom_size = load_image_targphys(option_rom[0], OMAP_CS0_BASE, + flash_size); rom_loaded = 1; cpu->env->regs[15] = 0x00000000; - } else + } + if (rom_size < 0) { fprintf(stderr, "%s: error loading '%s'\n", __FUNCTION__, option_rom[0]); + } } if (!rom_loaded && !kernel_filename) { |