diff options
| author | Nathan Rossi <nathan@nathanrossi.com> | 2015-09-08 23:50:11 +1000 |
|---|---|---|
| committer | Nathan Rossi <nathan@nathanrossi.com> | 2015-09-09 00:10:28 +1000 |
| commit | d1da6ee20e5c478690509809af71a536bf92eed9 (patch) | |
| tree | ae3b4d48575b8b03129a6c940a5c966f495ba192 | |
| parent | b7960e3fc669cf2fda93265db9776d867d44683a (diff) | |
| download | meta-xilinx-d1da6ee20e5c478690509809af71a536bf92eed9.tar.gz | |
qemu: Add patch for ZynqMP
* This patch is required in order for kernels with upstream device trees
to work correctly
* Patch was submitted to qemu-devel
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
| -rw-r--r-- | recipes-zynqmp/qemu/files/arm-xlnx-zynqmp-Fix-up-GIC-region-size.patch | 32 | ||||
| -rw-r--r-- | recipes-zynqmp/qemu/qemu_2.4.0.bbappend | 6 |
2 files changed, 38 insertions, 0 deletions
diff --git a/recipes-zynqmp/qemu/files/arm-xlnx-zynqmp-Fix-up-GIC-region-size.patch b/recipes-zynqmp/qemu/files/arm-xlnx-zynqmp-Fix-up-GIC-region-size.patch new file mode 100644 index 00000000..e90dd56d --- /dev/null +++ b/recipes-zynqmp/qemu/files/arm-xlnx-zynqmp-Fix-up-GIC-region-size.patch | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | From ea0d8135b0c204a674300486d3933bdef7ac220b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Nathan Rossi <nathan@nathanrossi.com> | ||
| 3 | Date: Tue, 8 Sep 2015 23:07:11 +1000 | ||
| 4 | Subject: [PATCH] arm: xlnx-zynqmp: Fix up GIC region size | ||
| 5 | |||
| 6 | The GIC in ZynqMP cover a 64K address space, however the actual | ||
| 7 | registers are decoded within a 4K address space and mirrored at the 4K | ||
| 8 | boundaries. This change fixes the defined size for these regions as it | ||
| 9 | was set to 0x4000/16K incorrectly. | ||
| 10 | |||
| 11 | Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> | ||
| 12 | Upstream-Status: Submitted | ||
| 13 | --- | ||
| 14 | include/hw/arm/xlnx-zynqmp.h | 2 +- | ||
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 16 | |||
| 17 | diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h | ||
| 18 | index 6ccb57b..23b8453 100644 | ||
| 19 | --- a/include/hw/arm/xlnx-zynqmp.h | ||
| 20 | +++ b/include/hw/arm/xlnx-zynqmp.h | ||
| 21 | @@ -44,7 +44,7 @@ | ||
| 22 | * number of memory region aliases. | ||
| 23 | */ | ||
| 24 | |||
| 25 | -#define XLNX_ZYNQMP_GIC_REGION_SIZE 0x4000 | ||
| 26 | +#define XLNX_ZYNQMP_GIC_REGION_SIZE 0x1000 | ||
| 27 | #define XLNX_ZYNQMP_GIC_ALIASES (0x10000 / XLNX_ZYNQMP_GIC_REGION_SIZE - 1) | ||
| 28 | |||
| 29 | typedef struct XlnxZynqMPState { | ||
| 30 | -- | ||
| 31 | 2.5.1 | ||
| 32 | |||
diff --git a/recipes-zynqmp/qemu/qemu_2.4.0.bbappend b/recipes-zynqmp/qemu/qemu_2.4.0.bbappend new file mode 100644 index 00000000..74c8a1ca --- /dev/null +++ b/recipes-zynqmp/qemu/qemu_2.4.0.bbappend | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | |||
| 2 | FILESEXTRAPATHS_append := "${THISDIR}/files:" | ||
| 3 | SRC_URI_append += " \ | ||
| 4 | file://arm-xlnx-zynqmp-Fix-up-GIC-region-size.patch \ | ||
| 5 | " | ||
| 6 | |||
