diff options
author | Nathan Rossi <nathan@nathanrossi.com> | 2015-12-28 18:16:21 +1000 |
---|---|---|
committer | Nathan Rossi <nathan@nathanrossi.com> | 2015-12-28 18:16:21 +1000 |
commit | eeecd6967742de6926340066e8d9a565f8809c80 (patch) | |
tree | e273c3a6d6ba5c569896d263928ee0f1d01016b2 | |
parent | d3948f2ad3d7f43d88c8c56781960327cf828688 (diff) | |
download | meta-xilinx-eeecd6967742de6926340066e8d9a565f8809c80.tar.gz |
qemu: Drop 2.4.* recipe with ZynqMP patches
These patches are merged and available from QEMU 2.5+.
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.%.bbappend | 6 |
2 files changed, 0 insertions, 38 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 deleted file mode 100644 index e90dd56d..00000000 --- a/recipes-zynqmp/qemu/files/arm-xlnx-zynqmp-Fix-up-GIC-region-size.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
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.%.bbappend b/recipes-zynqmp/qemu/qemu_2.4.%.bbappend deleted file mode 100644 index dc6c20ad..00000000 --- a/recipes-zynqmp/qemu/qemu_2.4.%.bbappend +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | |||
2 | FILESEXTRAPATHS_append := "${THISDIR}/files:" | ||
3 | SRC_URI_append = " \ | ||
4 | file://arm-xlnx-zynqmp-Fix-up-GIC-region-size.patch \ | ||
5 | " | ||
6 | |||