[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 11/13] hw/arm/raspi: Extract the board model from the board re
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v3 11/13] hw/arm/raspi: Extract the board model from the board revision |
Date: |
Sat, 8 Feb 2020 17:56:43 +0100 |
The board revision encode the model type. Add a helper
to extract the model, and use it.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/arm/raspi.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
index f0dcffbc2e..0537fc0a2d 100644
--- a/hw/arm/raspi.c
+++ b/hw/arm/raspi.c
@@ -101,6 +101,20 @@ static const char *board_soc_type(uint32_t board_rev)
return soc_types[proc_id];
}
+static const char *board_type(uint32_t board_rev)
+{
+ static const char *types[] = {
+ "A", "B", "A+", "B+", "2B", "Alpha", "CM1", NULL, "3B", "Zero",
+ "CM3", NULL, "Zero W", "3B+", "3A+", NULL, "CM3+", "4B",
+ };
+ assert(FIELD_EX32(board_rev, REV_CODE, STYLE)); /* Only new style */
+ int bt = FIELD_EX32(board_rev, REV_CODE, TYPE);
+ if (bt >= ARRAY_SIZE(types) || !types[bt]) {
+ return "Unknown";
+ }
+ return types[bt];
+}
+
static void write_smpboot(ARMCPU *cpu, const struct arm_boot_info *info)
{
static const uint32_t smpboot[] = {
@@ -287,7 +301,7 @@ static void raspi2_machine_class_init(ObjectClass *oc, void
*data)
uint32_t board_rev = (uint32_t)(uintptr_t)data;
rmc->board_rev = board_rev;
- mc->desc = "Raspberry Pi 2B";
+ mc->desc = g_strdup_printf("Raspberry Pi %s", board_type(board_rev));
mc->init = raspi_machine_init;
mc->block_default_type = IF_SD;
mc->no_parallel = 1;
@@ -308,7 +322,7 @@ static void raspi3_machine_class_init(ObjectClass *oc, void
*data)
uint32_t board_rev = (uint32_t)(uintptr_t)data;
rmc->board_rev = board_rev;
- mc->desc = "Raspberry Pi 3B";
+ mc->desc = g_strdup_printf("Raspberry Pi %s", board_type(board_rev));
mc->init = raspi_machine_init;
mc->block_default_type = IF_SD;
mc->no_parallel = 1;
--
2.21.1
- Re: [PATCH v3 06/13] hw/arm/raspi: Trivial code movement, (continued)
- [PATCH v3 07/13] hw/arm/raspi: Make machines children of abstract RaspiMachineClass, Philippe Mathieu-Daudé, 2020/02/08
- [PATCH v3 09/13] hw/arm/raspi: Let class_init() directly call raspi_machine_init(), Philippe Mathieu-Daudé, 2020/02/08
- [PATCH v3 10/13] hw/arm/raspi: Set default RAM size to size encoded in board revision, Philippe Mathieu-Daudé, 2020/02/08
- [PATCH v3 11/13] hw/arm/raspi: Extract the board model from the board revision,
Philippe Mathieu-Daudé <=
- [PATCH v3 12/13] hw/arm/raspi: Use a unique raspi_machine_class_init() method, Philippe Mathieu-Daudé, 2020/02/08
[PATCH v3 13/13] hw/arm/raspi: Extract the cores count from the board revision, Philippe Mathieu-Daudé, 2020/02/08
Re: [PATCH v3 00/13] hw/arm/raspi: Dynamically create machines based on the board revision, Peter Maydell, 2020/02/13