[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 05/13] hw/arm/raspi: Extract the processor type from the board
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v3 05/13] hw/arm/raspi: Extract the processor type from the board revision |
Date: |
Sat, 8 Feb 2020 17:56:37 +0100 |
The board revision encode the processor type. Add a helper
to extract the type, 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 dcd8d2d6d3..7a2ca97347 100644
--- a/hw/arm/raspi.c
+++ b/hw/arm/raspi.c
@@ -67,6 +67,21 @@ static int board_version(uint32_t board_rev)
return board_processor_id(board_rev) + 1;
}
+static const char *board_soc_type(uint32_t board_rev)
+{
+ static const char *soc_types[] = {
+ NULL, TYPE_BCM2836, TYPE_BCM2837,
+ };
+ int proc_id = board_processor_id(board_rev);
+
+ if (proc_id >= ARRAY_SIZE(soc_types) || !soc_types[proc_id]) {
+ error_report("Unsupported processor id '%d' (board revision: 0x%x)",
+ proc_id, board_rev);
+ exit(1);
+ }
+ return soc_types[proc_id];
+}
+
static void write_smpboot(ARMCPU *cpu, const struct arm_boot_info *info)
{
static const uint32_t smpboot[] = {
@@ -213,8 +228,7 @@ static void raspi_init(MachineState *machine, uint32_t
board_rev)
}
object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc),
- version == 3 ? TYPE_BCM2837 : TYPE_BCM2836,
- &error_abort, NULL);
+ board_soc_type(board_rev), &error_abort, NULL);
/* Allocate and map RAM */
memory_region_allocate_system_memory(&s->ram, OBJECT(machine), "ram",
--
2.21.1
- [PATCH v3 00/13] hw/arm/raspi: Dynamically create machines based on the board revision, Philippe Mathieu-Daudé, 2020/02/08
- [PATCH v3 02/13] hw/arm/raspi: Correct the board descriptions, Philippe Mathieu-Daudé, 2020/02/08
- [PATCH v3 01/13] hw/arm/raspi: Use BCM2708 machine type with pre Device Tree kernels, Philippe Mathieu-Daudé, 2020/02/08
- [PATCH v3 03/13] hw/arm/raspi: Extract the version from the board revision, Philippe Mathieu-Daudé, 2020/02/08
- [PATCH v3 04/13] hw/arm/raspi: Extract the RAM size from the board revision, Philippe Mathieu-Daudé, 2020/02/08
- [PATCH v3 05/13] hw/arm/raspi: Extract the processor type from the board revision,
Philippe Mathieu-Daudé <=
- [PATCH v3 06/13] hw/arm/raspi: Trivial code movement, Philippe Mathieu-Daudé, 2020/02/08
- [PATCH v3 08/13] hw/arm/raspi: Make board_rev a field of RaspiMachineClass, Philippe Mathieu-Daudé, 2020/02/08
- [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