[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 5/8] hw/arm/raspi: Use more specific machine names
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v3 5/8] hw/arm/raspi: Use more specific machine names |
Date: |
Mon, 21 Sep 2020 09:56:25 +0200 |
Now that we can instantiate different machines based on their
board_rev register value, we can have various raspi2 and raspi3.
In commit fc78a990ec103 we corrected the machine description.
Correct the machine names too. For backward compatibility, add
an alias to the previous generic name.
Reviewed-by: Luc Michel <luc.michel@greensocs.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/arm/raspi.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
index 3000e6d57e6..3426521379e 100644
--- a/hw/arm/raspi.c
+++ b/hw/arm/raspi.c
@@ -327,6 +327,7 @@ static void raspi2b_machine_class_init(ObjectClass *oc,
void *data)
MachineClass *mc = MACHINE_CLASS(oc);
RaspiMachineClass *rmc = RASPI_MACHINE_CLASS(oc);
+ mc->alias = "raspi2";
rmc->board_rev = 0xa21041;
raspi_machine_class_common_init(mc, rmc->board_rev);
};
@@ -337,6 +338,7 @@ static void raspi3b_machine_class_init(ObjectClass *oc,
void *data)
MachineClass *mc = MACHINE_CLASS(oc);
RaspiMachineClass *rmc = RASPI_MACHINE_CLASS(oc);
+ mc->alias = "raspi3";
rmc->board_rev = 0xa02082;
raspi_machine_class_common_init(mc, rmc->board_rev);
};
@@ -344,12 +346,12 @@ static void raspi3b_machine_class_init(ObjectClass *oc,
void *data)
static const TypeInfo raspi_machine_types[] = {
{
- .name = MACHINE_TYPE_NAME("raspi2"),
+ .name = MACHINE_TYPE_NAME("raspi2b"),
.parent = TYPE_RASPI_MACHINE,
.class_init = raspi2b_machine_class_init,
#ifdef TARGET_AARCH64
}, {
- .name = MACHINE_TYPE_NAME("raspi3"),
+ .name = MACHINE_TYPE_NAME("raspi3b"),
.parent = TYPE_RASPI_MACHINE,
.class_init = raspi3b_machine_class_init,
#endif
--
2.26.2
- [PATCH v3 4/8] hw/arm/raspi: Avoid using TypeInfo::class_data pointer, (continued)
- [PATCH v3 4/8] hw/arm/raspi: Avoid using TypeInfo::class_data pointer, Philippe Mathieu-Daudé, 2020/09/21
- [PATCH v3 2/8] hw/arm/raspi: Load the firmware on the first core, Philippe Mathieu-Daudé, 2020/09/21
- [PATCH v3 6/8] hw/arm/raspi: Introduce RaspiProcessorId enum, Philippe Mathieu-Daudé, 2020/09/21
- [PATCH v3 8/8] hw/arm/raspi: Remove use of the 'version' value in the board code, Philippe Mathieu-Daudé, 2020/09/21
- [PATCH v3 7/8] hw/arm/raspi: Use RaspiProcessorId to set the firmware load address, Philippe Mathieu-Daudé, 2020/09/21
- [PATCH v3 3/8] hw/arm/raspi: Move arm_boot_info structure to RaspiMachineState, Philippe Mathieu-Daudé, 2020/09/21
- [PATCH v3 5/8] hw/arm/raspi: Use more specific machine names,
Philippe Mathieu-Daudé <=