| Message ID | 4f6bd6c109a2f732cfe767cb54ede06ed7568845.1433314301.git.alistair.francis@xilinx.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Jun 04, 2015 at 11:25:11AM +1000, Alistair Francis wrote: > Remove the hardcoded values from the machine specific reset > function, as the same values are already set in the standard > MicroBlaze reset. > > This also allows the entire reset function to be deleted, as > PVR registers are now preserved on reset. > > Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> > --- > hw/microblaze/petalogix_s3adsp1800_mmu.c | 9 +-------- > 1 files changed, 1 insertions(+), 8 deletions(-) > > diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c > index 84f6e74..7109e63 100644 > --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c > +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c > @@ -51,13 +51,6 @@ > #define ETHLITE_IRQ 1 > #define UARTLITE_IRQ 3 > > -static void machine_cpu_reset(MicroBlazeCPU *cpu) > -{ > - CPUMBState *env = &cpu->env; > - > - env->pvr.regs[10] = 0x0c000000; /* spartan 3a dsp family. */ > -} > - > static void > petalogix_s3adsp1800_init(MachineState *machine) > { > @@ -132,7 +125,7 @@ petalogix_s3adsp1800_init(MachineState *machine) > microblaze_load_kernel(cpu, ddr_base, ram_size, > machine->initrd_filename, > BINARY_DEVICE_TREE_FILE, > - machine_cpu_reset); > + NULL); > } > > static QEMUMachine petalogix_s3adsp1800_machine = { > -- > 1.7.1 >
diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c index 84f6e74..7109e63 100644 --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c @@ -51,13 +51,6 @@ #define ETHLITE_IRQ 1 #define UARTLITE_IRQ 3 -static void machine_cpu_reset(MicroBlazeCPU *cpu) -{ - CPUMBState *env = &cpu->env; - - env->pvr.regs[10] = 0x0c000000; /* spartan 3a dsp family. */ -} - static void petalogix_s3adsp1800_init(MachineState *machine) { @@ -132,7 +125,7 @@ petalogix_s3adsp1800_init(MachineState *machine) microblaze_load_kernel(cpu, ddr_base, ram_size, machine->initrd_filename, BINARY_DEVICE_TREE_FILE, - machine_cpu_reset); + NULL); } static QEMUMachine petalogix_s3adsp1800_machine = {
Remove the hardcoded values from the machine specific reset function, as the same values are already set in the standard MicroBlaze reset. This also allows the entire reset function to be deleted, as PVR registers are now preserved on reset. Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> --- hw/microblaze/petalogix_s3adsp1800_mmu.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-)