From 6ddec45a14c1d033b236a656c5ae0d02ae6a675c Mon Sep 17 00:00:00 2001 From: Bernhard Beschow Date: Thu, 2 Jul 2026 20:40:36 +0200 Subject: [PATCH] hw/arm/imx8mp-evk: Open code DEFINE_MACHINE_AARCH64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Open code the DEFINE_MACHINE_AARCH64 macro in preparation of creating FslImx8mpEvkState class, needed for FlexCAN emulation. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daudé Acked-by: Pavel Pisa Tested-by: Pavel Pisa Message-ID: <20260702184038.178196-4-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/imx8mp-evk.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/hw/arm/imx8mp-evk.c b/hw/arm/imx8mp-evk.c index b84ac91a17..4a0c9df76b 100644 --- a/hw/arm/imx8mp-evk.c +++ b/hw/arm/imx8mp-evk.c @@ -113,8 +113,10 @@ static const char *imx8mp_evk_get_default_cpu_type(const MachineState *ms) return ARM_CPU_TYPE_NAME("cortex-a53"); } -static void imx8mp_evk_machine_init(MachineClass *mc) +static void imx8mp_evk_machine_class_init(ObjectClass *oc, const void *data) { + MachineClass *mc = MACHINE_CLASS(oc); + mc->desc = "NXP i.MX 8M Plus EVK Board"; mc->init = imx8mp_evk_init; mc->default_cpus = 4; @@ -124,4 +126,13 @@ static void imx8mp_evk_machine_init(MachineClass *mc) mc->get_default_cpu_type = imx8mp_evk_get_default_cpu_type; } -DEFINE_MACHINE_AARCH64("imx8mp-evk", imx8mp_evk_machine_init) +static const TypeInfo imx8mp_evk_machine_types[] = { + { + .name = MACHINE_TYPE_NAME("imx8mp-evk"), + .parent = TYPE_MACHINE, + .class_init = imx8mp_evk_machine_class_init, + .interfaces = aarch64_machine_interfaces, + }, +}; + +DEFINE_TYPES(imx8mp_evk_machine_types)