| Message ID | 20231014195719.151397-9-deller@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | target/hppa: Add emulation of a C3700 HP-PARISC workstation | expand |
On Sat, 14 Oct 2023, deller@kernel.org wrote: > From: Helge Deller <deller@gmx.de> > > The new SeaBIOS-hppa version 10 includes initial support > for PA2.0 CPUs. Patch does a few misc things not mentioned in commit message. Would those need to be split of in separate patch or mentioned here? Regards, BALATON Zoltan > Signed-off-by: Helge Deller <deller@gmx.de> > --- > hw/hppa/machine.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c > index cf28cb9586..c6d8deffcf 100644 > --- a/hw/hppa/machine.c > +++ b/hw/hppa/machine.c > @@ -1,6 +1,8 @@ > /* > * QEMU HPPA hardware system emulator. > - * Copyright 2018 Helge Deller <deller@gmx.de> > + * (C) Copyright 2018-2023 Helge Deller <deller@gmx.de> > + * > + * This work is licensed under the GNU GPL license version 2 or later. > */ > > #include "qemu/osdep.h" > @@ -29,7 +31,7 @@ > #include "net/net.h" > #include "qemu/log.h" > > -#define MIN_SEABIOS_HPPA_VERSION 6 /* require at least this fw version */ > +#define MIN_SEABIOS_HPPA_VERSION 10 /* require at least this fw version */ > > #define HPA_POWER_BUTTON (FIRMWARE_END - 0x10) > > @@ -95,9 +97,7 @@ static ISABus *hppa_isa_bus(void) > > isa_bus = isa_bus_new(NULL, get_system_memory(), isa_region, > &error_abort); > - isa_irqs = i8259_init(isa_bus, > - /* qemu_allocate_irq(dino_set_isa_irq, s, 0)); */ > - NULL); > + isa_irqs = i8259_init(isa_bus, NULL); > isa_bus_register_input_irqs(isa_bus, isa_irqs); > > return isa_bus; >
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index cf28cb9586..c6d8deffcf 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -1,6 +1,8 @@ /* * QEMU HPPA hardware system emulator. - * Copyright 2018 Helge Deller <deller@gmx.de> + * (C) Copyright 2018-2023 Helge Deller <deller@gmx.de> + * + * This work is licensed under the GNU GPL license version 2 or later. */ #include "qemu/osdep.h" @@ -29,7 +31,7 @@ #include "net/net.h" #include "qemu/log.h" -#define MIN_SEABIOS_HPPA_VERSION 6 /* require at least this fw version */ +#define MIN_SEABIOS_HPPA_VERSION 10 /* require at least this fw version */ #define HPA_POWER_BUTTON (FIRMWARE_END - 0x10) @@ -95,9 +97,7 @@ static ISABus *hppa_isa_bus(void) isa_bus = isa_bus_new(NULL, get_system_memory(), isa_region, &error_abort); - isa_irqs = i8259_init(isa_bus, - /* qemu_allocate_irq(dino_set_isa_irq, s, 0)); */ - NULL); + isa_irqs = i8259_init(isa_bus, NULL); isa_bus_register_input_irqs(isa_bus, isa_irqs); return isa_bus;