[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH microblaze/ppc v3 2/8] ppc/virtex_ml507: Define macr
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [PATCH microblaze/ppc v3 2/8] ppc/virtex_ml507: Define macros for irq/memory maps |
Date: |
Tue, 25 Feb 2014 16:38:54 -0800 |
Define macros for the interrupt and memory maps for the sake of self
documentation.
Signed-off-by: Peter Crosthwaite <address@hidden>
---
I haven't converted the xilinx_foo_create usages because they will be
deleted in following patches
hw/ppc/virtex_ml507.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index bdb057e..88312f8 100644
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -45,6 +45,14 @@
#define EPAPR_MAGIC (0x45504150)
#define FLASH_SIZE (16 * 1024 * 1024)
+#define INTC_BASEADDR 0x81800000
+#define UART16550_BASEADDR 0x83e01003
+#define TIMER_BASEADDR 0x83c00000
+#define PFLASH_BASEADDR 0xfc000000
+
+#define TIMER_IRQ 3
+#define UART16550_IRQ 9
+
static struct boot_info
{
uint32_t bootstrap_pc;
@@ -204,7 +212,7 @@ static void virtex_init(QEMUMachineInitArgs *args)
memory_region_add_subregion(address_space_mem, ram_base, phys_ram);
dinfo = drive_get(IF_PFLASH, 0, 0);
- pflash_cfi01_register(0xfc000000, NULL, "virtex.flash", FLASH_SIZE,
+ pflash_cfi01_register(PFLASH_BASEADDR, NULL, "virtex.flash", FLASH_SIZE,
dinfo ? dinfo->bdrv : NULL, (64 * 1024),
FLASH_SIZE >> 16,
1, 0x89, 0x18, 0x0000, 0x0, 1);
@@ -215,8 +223,8 @@ static void virtex_init(QEMUMachineInitArgs *args)
irq[i] = qdev_get_gpio_in(dev, i);
}
- serial_mm_init(address_space_mem, 0x83e01003ULL, 2, irq[9], 115200,
- serial_hds[0], DEVICE_LITTLE_ENDIAN);
+ serial_mm_init(address_space_mem, UART16550_BASEADDR, 2,
irq[UART16550_IRQ],
+ 115200, serial_hds[0], DEVICE_LITTLE_ENDIAN);
/* 2 timers at irq 2 @ 62 Mhz. */
xilinx_timer_create(0x83c00000, irq[3], 0, 62 * 1000000);
--
1.9.0.1.g4196000
- [Qemu-devel] [PATCH microblaze/ppc v3 0/8] Remove include/hw/xilinx.h, Peter Crosthwaite, 2014/02/25
- [Qemu-devel] [PATCH microblaze/ppc v3 1/8] microblaze/s3adsp_1800: Define macros for irq map, Peter Crosthwaite, 2014/02/25
- [Qemu-devel] [PATCH microblaze/ppc v3 2/8] ppc/virtex_ml507: Define macros for irq/memory maps,
Peter Crosthwaite <=
- [Qemu-devel] [PATCH microblaze/ppc v3 3/8] microblaze/ml605: Define macros for irq/memory maps, Peter Crosthwaite, 2014/02/25
- [Qemu-devel] [PATCH microblaze/ppc v3 4/8] xilinx: Inline usages of xilinx_intc_create(), Peter Crosthwaite, 2014/02/25
- [Qemu-devel] [PATCH microblaze/ppc v3 5/8] xilinx: Inline usages of xilinx_timer_create(), Peter Crosthwaite, 2014/02/25
- [Qemu-devel] [PATCH microblaze/ppc v3 6/8] xilinx: Inline usage of xilinx_ethlite_create(), Peter Crosthwaite, 2014/02/25
- [Qemu-devel] [PATCH microblaze/ppc v3 7/8] xilinx: Inline usages of xilinx_axi*_init(), Peter Crosthwaite, 2014/02/25
- [Qemu-devel] [PATCH microblaze/ppc v3 8/8] xilinx: Delete hw/include/xilinx.h, Peter Crosthwaite, 2014/02/25
- Re: [Qemu-devel] [PATCH microblaze/ppc v3 0/8] Remove include/hw/xilinx.h, Edgar E. Iglesias, 2014/02/26