Skip to content

Commit 8696b74

Browse files
philmdalistair23
authored andcommitted
hw/riscv/opentitan: Explicit machine type definition
Expand the DEFINE_MACHINE() macro, converting the class_init() handler. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> Message-Id: <20230520054510.68822-5-philmd@linaro.org> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
1 parent 264495f commit 8696b74

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

hw/riscv/opentitan.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,10 @@ static void opentitan_machine_init(MachineState *machine)
108108
}
109109
}
110110

111-
static void opentitan_machine_class_init(MachineClass *mc)
111+
static void opentitan_machine_class_init(ObjectClass *oc, void *data)
112112
{
113+
MachineClass *mc = MACHINE_CLASS(oc);
114+
113115
mc->desc = "RISC-V Board compatible with OpenTitan";
114116
mc->init = opentitan_machine_init;
115117
mc->max_cpus = 1;
@@ -118,8 +120,6 @@ static void opentitan_machine_class_init(MachineClass *mc)
118120
mc->default_ram_size = ibex_memmap[IBEX_DEV_RAM].size;
119121
}
120122

121-
DEFINE_MACHINE(TYPE_OPENTITAN_MACHINE, opentitan_machine_class_init)
122-
123123
static void lowrisc_ibex_soc_init(Object *obj)
124124
{
125125
LowRISCIbexSoCState *s = RISCV_IBEX_SOC(obj);
@@ -327,6 +327,10 @@ static const TypeInfo open_titan_types[] = {
327327
.instance_size = sizeof(LowRISCIbexSoCState),
328328
.instance_init = lowrisc_ibex_soc_init,
329329
.class_init = lowrisc_ibex_soc_class_init,
330+
}, {
331+
.name = TYPE_OPENTITAN_MACHINE,
332+
.parent = TYPE_MACHINE,
333+
.class_init = opentitan_machine_class_init,
330334
}
331335
};
332336

include/hw/riscv/opentitan.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "hw/char/ibex_uart.h"
2525
#include "hw/timer/ibex_timer.h"
2626
#include "hw/ssi/ibex_spi_host.h"
27+
#include "hw/boards.h"
2728
#include "qom/object.h"
2829

2930
#define TYPE_RISCV_IBEX_SOC "riscv.lowrisc.ibex.soc"
@@ -53,7 +54,7 @@ struct LowRISCIbexSoCState {
5354
MemoryRegion flash_alias;
5455
};
5556

56-
#define TYPE_OPENTITAN_MACHINE "opentitan"
57+
#define TYPE_OPENTITAN_MACHINE MACHINE_TYPE_NAME("opentitan")
5758

5859
typedef struct OpenTitanState {
5960
/*< private >*/

0 commit comments

Comments
 (0)