diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2023-10-24 18:24:21 +0200 |
|---|---|---|
| committer | Cédric Le Goater <clg@kaod.org> | 2023-10-25 09:52:44 +0200 |
| commit | c17fc025714faa031cd6570ca2f74a0d5b008431 (patch) | |
| tree | da2b5c9c5fad532c497201f2c4ebcd20e2ee88a0 /include/hw/arm/aspeed_soc.h | |
| parent | a0c21030705246fc53703253d9b9fccd88aa88d0 (diff) | |
| download | focaccia-qemu-c17fc025714faa031cd6570ca2f74a0d5b008431.tar.gz focaccia-qemu-c17fc025714faa031cd6570ca2f74a0d5b008431.zip | |
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>
Diffstat (limited to 'include/hw/arm/aspeed_soc.h')
| -rw-r--r-- | include/hw/arm/aspeed_soc.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h index 2118a441f7..6f783138e1 100644 --- a/include/hw/arm/aspeed_soc.h +++ b/include/hw/arm/aspeed_soc.h @@ -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" |