diff options
| author | Gleb Natapov <gleb@redhat.com> | 2010-12-08 13:35:07 +0200 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2010-12-11 21:32:47 +0000 |
| commit | 2e55e84282c545aeab8f5c9dd52a8073deaf3dbc (patch) | |
| tree | 7fdff0cb2027337a402dfb2f1687840c552a8e76 /hw/palm.c | |
| parent | de1f34cb6351c028ebcc61fea9fa78008ca1a529 (diff) | |
| download | focaccia-qemu-2e55e84282c545aeab8f5c9dd52a8073deaf3dbc.tar.gz focaccia-qemu-2e55e84282c545aeab8f5c9dd52a8073deaf3dbc.zip | |
Add bootindex for option roms.
Extend -option-rom command to have additional parameter ,bootindex=. Signed-off-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw/palm.c')
| -rw-r--r-- | hw/palm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/palm.c b/hw/palm.c index dd8d1e51dd..f22d7775ee 100644 --- a/hw/palm.c +++ b/hw/palm.c @@ -238,20 +238,20 @@ static void palmte_init(ram_addr_t ram_size, /* Setup initial (reset) machine state */ if (nb_option_roms) { - rom_size = get_image_size(option_rom[0]); + rom_size = get_image_size(option_rom[0].name); if (rom_size > flash_size) { fprintf(stderr, "%s: ROM image too big (%x > %x)\n", __FUNCTION__, rom_size, flash_size); rom_size = 0; } if (rom_size > 0) { - rom_size = load_image_targphys(option_rom[0], OMAP_CS0_BASE, + rom_size = load_image_targphys(option_rom[0].name, OMAP_CS0_BASE, flash_size); rom_loaded = 1; } if (rom_size < 0) { fprintf(stderr, "%s: error loading '%s'\n", - __FUNCTION__, option_rom[0]); + __FUNCTION__, option_rom[0].name); } } |