[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 14/16] ml605_mmu: Move the hardcoded values to th
From: |
Edgar E. Iglesias |
Subject: |
[Qemu-devel] [PATCH v1 14/16] ml605_mmu: Move the hardcoded values to the init function |
Date: |
Sun, 21 Jun 2015 21:56:25 +1000 |
From: Alistair Francis <address@hidden>
Move the hard coded register values to the init function.
This also allows the entire reset function to be deleted, as
PVR registers are now preserved on reset.
The hardcoded PVR0 values can be removed as they are setting
the endianness and stack protection, which is already done
or invalid.
Signed-off-by: Alistair Francis <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Edgar E. Iglesias <address@hidden>
---
hw/microblaze/petalogix_ml605_mmu.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/hw/microblaze/petalogix_ml605_mmu.c
b/hw/microblaze/petalogix_ml605_mmu.c
index 609c90b..ed84a37 100644
--- a/hw/microblaze/petalogix_ml605_mmu.c
+++ b/hw/microblaze/petalogix_ml605_mmu.c
@@ -64,17 +64,6 @@
#define SPI_IRQ 4
#define UART16550_IRQ 5
-static void machine_cpu_reset(MicroBlazeCPU *cpu)
-{
- CPUMBState *env = &cpu->env;
-
- env->pvr.regs[10] = 0x0e000000; /* virtex 6 */
- /* setup pvr to match kernel setting */
- env->pvr.regs[0] |= (0x14 << 8);
- env->pvr.regs[4] = 0xc56b8000;
- env->pvr.regs[5] = 0xc56be000;
-}
-
static void
petalogix_ml605_init(MachineState *machine)
{
@@ -205,10 +194,15 @@ petalogix_ml605_init(MachineState *machine)
}
}
+ /* setup PVR to match kernel settings */
+ cpu->env.pvr.regs[4] = 0xc56b8000;
+ cpu->env.pvr.regs[5] = 0xc56be000;
+ cpu->env.pvr.regs[10] = 0x0e000000; /* virtex 6 */
+
microblaze_load_kernel(cpu, MEMORY_BASEADDR, ram_size,
machine->initrd_filename,
BINARY_DEVICE_TREE_FILE,
- machine_cpu_reset);
+ NULL);
}
--
1.9.1
- [Qemu-devel] [PATCH v1 01/16] microblaze: s3adsp: Instantiate CPU using QOM, (continued)
- [Qemu-devel] [PATCH v1 01/16] microblaze: s3adsp: Instantiate CPU using QOM, Edgar E. Iglesias, 2015/06/21
- [Qemu-devel] [PATCH v1 02/16] target-microblaze: Fix up indentation, Edgar E. Iglesias, 2015/06/21
- [Qemu-devel] [PATCH v1 03/16] target-microblaze: Preserve the pvr registers during reset, Edgar E. Iglesias, 2015/06/21
- [Qemu-devel] [PATCH v1 05/16] target-microblaze: Tidy up the base-vectors property, Edgar E. Iglesias, 2015/06/21
- [Qemu-devel] [PATCH v1 06/16] target-microblaze: Convert use-fpu to a CPU property, Edgar E. Iglesias, 2015/06/21
- [Qemu-devel] [PATCH v1 07/16] target-microblaze: Disable stack protection by default, Edgar E. Iglesias, 2015/06/21
- [Qemu-devel] [PATCH v1 08/16] target-microblaze: Rename the usefpu variable, Edgar E. Iglesias, 2015/06/21
- [Qemu-devel] [PATCH v1 11/16] target-microblaze: Convert endi to a CPU property, Edgar E. Iglesias, 2015/06/21
- [Qemu-devel] [PATCH v1 12/16] target-microblaze: Convert version_mask to a CPU property, Edgar E. Iglesias, 2015/06/21
- [Qemu-devel] [PATCH v1 13/16] target-microblaze: Convert pvr-full to a CPU property, Edgar E. Iglesias, 2015/06/21
- [Qemu-devel] [PATCH v1 14/16] ml605_mmu: Move the hardcoded values to the init function,
Edgar E. Iglesias <=
- [Qemu-devel] [PATCH v1 15/16] s3adsp1800: Remove the hardcoded values from the reset, Edgar E. Iglesias, 2015/06/21
- [Qemu-devel] [PATCH v1 16/16] target-microblaze: Remove dead code, Edgar E. Iglesias, 2015/06/21