hw/arm/aspeed: Move AspeedSoCState::a7mpcore to Aspeed2600SoCState

The v7-A cluster is specific to the Aspeed 2600 series,
remove it from the common AspeedSoCState.

The ARM cores belong to the MP cluster, but the array
is currently used by TYPE_ASPEED2600_SOC. We'll clean
that soon, but for now keep it in Aspeed2600SoCState.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-10-24 18:24:21 +02:00 committed by Cédric Le Goater
parent a0c2103070
commit c17fc02571
3 changed files with 37 additions and 30 deletions

View file

@ -50,7 +50,6 @@ struct AspeedSoCState {
DeviceState parent;
ARMCPU cpu[ASPEED_CPUS_NUM];
A15MPPrivState a7mpcore;
MemoryRegion *memory;
MemoryRegion *dram_mr;
MemoryRegion dram_container;
@ -107,6 +106,9 @@ OBJECT_DECLARE_SIMPLE_TYPE(Aspeed2400SoCState, ASPEED2400_SOC)
struct Aspeed2600SoCState {
AspeedSoCState parent;
A15MPPrivState a7mpcore;
ARMCPU cpu[ASPEED_CPUS_NUM]; /* XXX belong to a7mpcore */
};
#define TYPE_ASPEED2600_SOC "aspeed2600-soc"