mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/arm/mps2-tz: Allow boards to have different PPCInfo data

Browse Source 
The AN505 and AN521 have the same device layout, but the AN524 is
somewhat different.  Allow for more than one PPCInfo array, which can
be selected based on the board type.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210215115138.20465-16-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2021-02-15 11:51:29 +00:00
parent 8cf68ed935
commit ef29e3826b
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/arm/mps2-tz.c
View File

@ -423,6 +423,8 @@ static void mps2tz_common_init(MachineState *machine)
MemoryRegion *system_memory = get_system_memory(); MemoryRegion *system_memory = get_system_memory();
DeviceState *iotkitdev; DeviceState *iotkitdev;
DeviceState *dev_splitter; DeviceState *dev_splitter;
const PPCInfo *ppcs;
int num_ppcs;
int i; int i;
if (strcmp(machine->cpu_type, mc->default_cpu_type) != 0) { if (strcmp(machine->cpu_type, mc->default_cpu_type) != 0) {
@ -544,7 +546,7 @@ static void mps2tz_common_init(MachineState *machine)
* + wire up the PPC's control lines to the IoTKit object * + wire up the PPC's control lines to the IoTKit object
*/ */
const PPCInfo ppcs[] = { { const PPCInfo an505_ppcs[] = { {
.name = "apb_ppcexp0", .name = "apb_ppcexp0",
.ports = { .ports = {
{ "ssram-0", make_mpc, &mms->ssram_mpc[0], 0x58007000, 0x1000 }, { "ssram-0", make_mpc, &mms->ssram_mpc[0], 0x58007000, 0x1000 },
@ -598,7 +600,17 @@ static void mps2tz_common_init(MachineState *machine)
}, },
}; };
for (i = 0; i < ARRAY_SIZE(ppcs); i++) { switch (mmc->fpga_type) {
case FPGA_AN505:
case FPGA_AN521:
ppcs = an505_ppcs;
num_ppcs = ARRAY_SIZE(an505_ppcs);
break;
default:
g_assert_not_reached();
}
for (i = 0; i < num_ppcs; i++) {
const PPCInfo *ppcinfo = &ppcs[i]; const PPCInfo *ppcinfo = &ppcs[i];
TZPPC *ppc = &mms->ppc[i]; TZPPC *ppc = &mms->ppc[i];
DeviceState *ppcdev; DeviceState *ppcdev;