On 2/6/26 06:33, Jamin Lin wrote:
Add a new AST2700 A2 EVB machine to model the newer A2 silicon.
The "ast2700-evb" machine alias is moved to the AST2700 A2 EVB, making
it the default AST2700 evaluation board. The existing AST2700 A1 EVB
machine remains available as "ast2700a1-evb".
Signed-off-by: Jamin Lin <[email protected]>
---
hw/arm/aspeed_ast27x0_evb.c | 29 ++++++++++++++++++++++++++++-
1 file changed, 28 insertions(+), 1 deletion(-)
diff --git a/hw/arm/aspeed_ast27x0_evb.c b/hw/arm/aspeed_ast27x0_evb.c
index 31f7d61117..0ff1bebeb0 100644
--- a/hw/arm/aspeed_ast27x0_evb.c
+++ b/hw/arm/aspeed_ast27x0_evb.c
@@ -34,7 +34,6 @@ static void
aspeed_machine_ast2700a1_evb_class_init(ObjectClass *oc,
MachineClass *mc = MACHINE_CLASS(oc);
AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
- mc->alias = "ast2700-evb";
Please change the machine alias in a separate patch.
Thanks,
C.
mc->desc = "Aspeed AST2700 A1 EVB (Cortex-A35)";
amc->soc_name = "ast2700-a1";
amc->hw_strap1 = AST2700_EVB_HW_STRAP1;
@@ -50,12 +49,40 @@ static void
aspeed_machine_ast2700a1_evb_class_init(ObjectClass *oc,
aspeed_machine_class_init_cpus_defaults(mc);
}
+static void aspeed_machine_ast2700a2_evb_class_init(ObjectClass *oc,
+ const void *data)
+{
+ MachineClass *mc = MACHINE_CLASS(oc);
+ AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
+
+ mc->alias = "ast2700-evb";
+ mc->desc = "Aspeed AST2700 A2 EVB (Cortex-A35)";
+ amc->soc_name = "ast2700-a2";
+ amc->hw_strap1 = AST2700_EVB_HW_STRAP1;
+ amc->hw_strap2 = AST2700_EVB_HW_STRAP2;
+ amc->fmc_model = "w25q01jvq";
+ amc->spi_model = "w25q512jv";
+ amc->num_cs = 2;
+ amc->macs_mask = ASPEED_MAC0_ON | ASPEED_MAC1_ON | ASPEED_MAC2_ON;
+ amc->uart_default = ASPEED_DEV_UART12;
+ amc->i2c_init = ast2700_evb_i2c_init;
+ amc->vbootrom = true;
+ mc->default_ram_size = 2 * GiB;
+ aspeed_machine_class_init_cpus_defaults(mc);
+}
+
static const TypeInfo aspeed_ast27x0_evb_types[] = {
{
.name = MACHINE_TYPE_NAME("ast2700a1-evb"),
.parent = TYPE_ASPEED_MACHINE,
.class_init = aspeed_machine_ast2700a1_evb_class_init,
.interfaces = aarch64_machine_interfaces,
+ },
+ {
+ .name = MACHINE_TYPE_NAME("ast2700a2-evb"),
+ .parent = TYPE_ASPEED_MACHINE,
+ .class_init = aspeed_machine_ast2700a2_evb_class_init,
+ .interfaces = aarch64_machine_interfaces,
}
};