| Message ID | 20201018203358.1530378-10-f4bug@amsat.org |
|---|---|
| State | Accepted |
| Commit | 5be94252d3497c29c0640e816903a148a4370153 |
| Headers | show |
| Series | hw/arm: Add raspi Zero, 1A+ and 3A+ machines | expand |
On Sun, 18 Oct 2020 22:33:58 +0200 Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > The Pi 3A+ is a stripped down version of the 3B: > - 512 MiB of RAM instead of 1 GiB > - no on-board ethernet chipset > > Add it as it is a closer match to what we model. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > hw/arm/raspi.c | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c > index 1510ca01afe..4ea200572ea 100644 > --- a/hw/arm/raspi.c > +++ b/hw/arm/raspi.c > @@ -348,6 +348,15 @@ static void raspi2b_machine_class_init(ObjectClass *oc, void *data) > }; > > #ifdef TARGET_AARCH64 > +static void raspi3ap_machine_class_init(ObjectClass *oc, void *data) > +{ > + MachineClass *mc = MACHINE_CLASS(oc); > + RaspiMachineClass *rmc = RASPI_MACHINE_CLASS(oc); > + > + rmc->board_rev = 0x9020e0; > + raspi_machine_class_common_init(mc, rmc->board_rev); > +}; > + > static void raspi3b_machine_class_init(ObjectClass *oc, void *data) > { > MachineClass *mc = MACHINE_CLASS(oc); > @@ -373,6 +382,10 @@ static const TypeInfo raspi_machine_types[] = { > .parent = TYPE_RASPI_MACHINE, > .class_init = raspi2b_machine_class_init, > #ifdef TARGET_AARCH64 > + }, { > + .name = MACHINE_TYPE_NAME("raspi3ap"), > + .parent = TYPE_RASPI_MACHINE, > + .class_init = raspi3ap_machine_class_init, > }, { > .name = MACHINE_TYPE_NAME("raspi3b"), > .parent = TYPE_RASPI_MACHINE,
diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 1510ca01afe..4ea200572ea 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -348,6 +348,15 @@ static void raspi2b_machine_class_init(ObjectClass *oc, void *data) }; #ifdef TARGET_AARCH64 +static void raspi3ap_machine_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + RaspiMachineClass *rmc = RASPI_MACHINE_CLASS(oc); + + rmc->board_rev = 0x9020e0; + raspi_machine_class_common_init(mc, rmc->board_rev); +}; + static void raspi3b_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -373,6 +382,10 @@ static const TypeInfo raspi_machine_types[] = { .parent = TYPE_RASPI_MACHINE, .class_init = raspi2b_machine_class_init, #ifdef TARGET_AARCH64 + }, { + .name = MACHINE_TYPE_NAME("raspi3ap"), + .parent = TYPE_RASPI_MACHINE, + .class_init = raspi3ap_machine_class_init, }, { .name = MACHINE_TYPE_NAME("raspi3b"), .parent = TYPE_RASPI_MACHINE,
The Pi 3A+ is a stripped down version of the 3B: - 512 MiB of RAM instead of 1 GiB - no on-board ethernet chipset Add it as it is a closer match to what we model. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/arm/raspi.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)