diff options
| author | Max Filippov | 2019-01-21 01:26:07 +0100 |
|---|---|---|
| committer | Max Filippov | 2019-01-24 19:44:25 +0100 |
| commit | 288a3f2ed70400bcb6fbabbe30410ee58f8263ba (patch) | |
| tree | 252e021a51df85d6b1884d21714973ca400267d3 | |
| parent | target/xtensa: add qemu_cpu_kick to xtensa_runstall (diff) | |
| download | qemu-288a3f2ed70400bcb6fbabbe30410ee58f8263ba.tar.gz qemu-288a3f2ed70400bcb6fbabbe30410ee58f8263ba.tar.xz qemu-288a3f2ed70400bcb6fbabbe30410ee58f8263ba.zip | |
hw/xtensa: xtfpga: fix bootloader placement in SMP
Use BSP reset PC as a place for the mini-bootloader because in SMP
configurations APs and BSP may have different boot addresses.
This fixes SMP linux uImage boot on xtfpga boards.
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
| -rw-r--r-- | hw/xtensa/xtfpga.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index 21094319a6..d3afdfc247 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -234,10 +234,15 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine) int n; for (n = 0; n < smp_cpus; n++) { + CPUXtensaState *cenv = NULL; + cpu = XTENSA_CPU(cpu_create(machine->cpu_type)); - env = &cpu->env; + cenv = &cpu->env; + if (!env) { + env = cenv; + } - env->sregs[PRID] = n; + cenv->sregs[PRID] = n; qemu_register_reset(xtfpga_reset, cpu); /* Need MMU initialized prior to ELF loading, * so that ELF gets loaded into virtual addresses |