diff options
| author | Paolo Bonzini | 2020-10-26 15:30:20 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2020-12-10 18:15:05 +0100 |
| commit | 1684273ca8144d8f7dc9c8e9fea17753a9c09fd8 (patch) | |
| tree | abca010f68c5fb5c2ad52c63a986068b1c3c3ae7 /hw/m68k/next-cube.c | |
| parent | lm32: remove bios_name (diff) | |
| download | qemu-1684273ca8144d8f7dc9c8e9fea17753a9c09fd8.tar.gz qemu-1684273ca8144d8f7dc9c8e9fea17753a9c09fd8.tar.xz qemu-1684273ca8144d8f7dc9c8e9fea17753a9c09fd8.zip | |
m68k: remove bios_name
Cc: Laurent Vivier <lvivier@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20201026143028.3034018-8-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/m68k/next-cube.c')
| -rw-r--r-- | hw/m68k/next-cube.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index e7045980b7..37bc35dfa4 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -868,6 +868,7 @@ static void next_cube_init(MachineState *machine) MemoryRegion *bmapm1 = g_new(MemoryRegion, 1); MemoryRegion *bmapm2 = g_new(MemoryRegion, 1); MemoryRegion *sysmem = get_system_memory(); + const char *bios_name = machine->firmware ?: ROM_FILE; NeXTState *ns = NEXT_MACHINE(machine); DeviceState *dev; @@ -924,9 +925,6 @@ static void next_cube_init(MachineState *machine) sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0x0200e000); /* Load ROM here */ - if (bios_name == NULL) { - bios_name = ROM_FILE; - } /* still not sure if the rom should also be mapped at 0x0*/ memory_region_init_rom(rom, NULL, "next.rom", 0x20000, &error_fatal); memory_region_add_subregion(sysmem, 0x01000000, rom); |