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/nseries.c | |
| parent | de1f34cb6351c028ebcc61fea9fa78008ca1a529 (diff) | |
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/nseries.c')
| -rw-r--r-- | hw/nseries.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/nseries.c b/hw/nseries.c index 04a028dc27..2f6f473d64 100644 --- a/hw/nseries.c +++ b/hw/nseries.c @@ -1326,7 +1326,7 @@ static void n8x0_init(ram_addr_t ram_size, const char *boot_device, qemu_register_reset(n8x0_boot_init, s); } - if (option_rom[0] && (boot_device[0] == 'n' || !kernel_filename)) { + if (option_rom[0].name && (boot_device[0] == 'n' || !kernel_filename)) { int rom_size; uint8_t nolo_tags[0x10000]; /* No, wait, better start at the ROM. */ @@ -1341,7 +1341,7 @@ 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. */ - rom_size = load_image_targphys(option_rom[0], + rom_size = load_image_targphys(option_rom[0].name, OMAP2_Q2_BASE + 0x400000, sdram_size - 0x400000); printf("%i bytes of image loaded\n", rom_size); |