[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 09/30] hw/arm/raspi: Let class_init() directly call raspi_mach
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 09/30] hw/arm/raspi: Let class_init() directly call raspi_machine_init() |
Date: |
Thu, 6 Feb 2020 02:17:35 +0100 |
raspi_machine_init() access to board_rev via RaspiMachineClass.
raspi2_init() and raspi3_init() do nothing. Call raspi_machine_init
directly.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
Squash with previous?
---
hw/arm/raspi.c | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
index 885abced57..651585ebfb 100644
--- a/hw/arm/raspi.c
+++ b/hw/arm/raspi.c
@@ -227,7 +227,7 @@ static void setup_boot(MachineState *machine, int version,
size_t ram_size)
arm_load_kernel(ARM_CPU(first_cpu), machine, &binfo);
}
-static void raspi_init(MachineState *machine)
+static void raspi_machine_init(MachineState *machine)
{
RaspiMachineClass *mc = RASPI_MACHINE_GET_CLASS(machine);
RaspiMachineState *s = RASPI_MACHINE(machine);
@@ -279,11 +279,6 @@ static void raspi_init(MachineState *machine)
setup_boot(machine, version, machine->ram_size - vcram_size);
}
-static void raspi2_init(MachineState *machine)
-{
- raspi_init(machine);
-}
-
static void raspi2_machine_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
@@ -292,7 +287,7 @@ static void raspi2_machine_class_init(ObjectClass *oc, void
*data)
rmc->board_rev = board_rev;
mc->desc = "Raspberry Pi 2B";
- mc->init = raspi2_init;
+ mc->init = raspi_machine_init;
mc->block_default_type = IF_SD;
mc->no_parallel = 1;
mc->no_floppy = 1;
@@ -305,11 +300,6 @@ static void raspi2_machine_class_init(ObjectClass *oc,
void *data)
};
#ifdef TARGET_AARCH64
-static void raspi3_init(MachineState *machine)
-{
- raspi_init(machine);
-}
-
static void raspi3_machine_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
@@ -318,7 +308,7 @@ static void raspi3_machine_class_init(ObjectClass *oc, void
*data)
rmc->board_rev = board_rev;
mc->desc = "Raspberry Pi 3B";
- mc->init = raspi3_init;
+ mc->init = raspi_machine_init;
mc->block_default_type = IF_SD;
mc->no_parallel = 1;
mc->no_floppy = 1;
--
2.21.1
- Re: [PATCH v2 01/30] hw/arm/raspi: Use BCM2708 machine type with pre Device Tree kernels, (continued)
[PATCH v2 04/30] hw/arm/raspi: Extract the RAM size from the board revision, Philippe Mathieu-Daudé, 2020/02/05
[PATCH v2 05/30] hw/arm/raspi: Extract the processor type from the board revision, Philippe Mathieu-Daudé, 2020/02/05
[PATCH v2 06/30] hw/arm/raspi: Trivial code movement, Philippe Mathieu-Daudé, 2020/02/05
[PATCH v2 07/30] hw/arm/raspi: Make machines children of abstract RaspiMachineClass, Philippe Mathieu-Daudé, 2020/02/05
[PATCH v2 08/30] hw/arm/raspi: Make board_rev a field of RaspiMachineClass, Philippe Mathieu-Daudé, 2020/02/05
[PATCH v2 10/30] hw/arm/raspi: Set default RAM size to size encoded in board revision, Philippe Mathieu-Daudé, 2020/02/05
[PATCH v2 09/30] hw/arm/raspi: Let class_init() directly call raspi_machine_init(),
Philippe Mathieu-Daudé <=
[PATCH v2 11/30] hw/arm/raspi: Extract the board model from the board revision, Philippe Mathieu-Daudé, 2020/02/05
[PATCH v2 12/30] hw/arm/raspi: Use a unique raspi_machine_class_init() method, Philippe Mathieu-Daudé, 2020/02/05
[PATCH v2 13/30] hw/arm/raspi: Extract the cores count from the board revision, Philippe Mathieu-Daudé, 2020/02/05
[PATCH v2 14/30] hw/arm/bcm2836: Restrict BCM283XClass declaration to C source, Philippe Mathieu-Daudé, 2020/02/05
[PATCH v2 15/30] hw/arm/bcm2836: QOM'ify more by adding class_init() to each SoC type, Philippe Mathieu-Daudé, 2020/02/05
[PATCH v2 16/30] hw/arm/bcm2836: Introduce BCM283XClass::core_count, Philippe Mathieu-Daudé, 2020/02/05
[PATCH v2 17/30] hw/arm/bcm2836: Only provide "enabled-cpus" property to multicore SoCs, Philippe Mathieu-Daudé, 2020/02/05
[PATCH v2 18/30] hw/arm/bcm2836: Split out common realize() code, Philippe Mathieu-Daudé, 2020/02/05
[PATCH v2 19/30] hw/arm/bcm2836: Introduce the BCM2835 SoC, Philippe Mathieu-Daudé, 2020/02/05
[PATCH v2 20/30] hw/arm/raspi: Add the Raspberry Pi Zero machine, Philippe Mathieu-Daudé, 2020/02/05