[meta-xilinx] [PATCH] qemu: mainline: Remove patches for mainline QEMU

[Alistair Francis]

OE-Core updated to QEMU 2.8 and these patches are no longer required.
Just delete all changes made to mainline QEMU in meta-xilinx.

Signed-off-by: Alistair Francis <alistair.francis at xilinx.com>
---
 .../8fa2346723fb74e8220ac9f186dabc2f57e4cb43.patch | 30 ------------
 .../qemu/files/dma-xlnx-zynq-devcfg.patch          | 55 ----------------------
 recipes-devtools/qemu/qemu_2.7%.bbappend           |  8 ----
 3 files changed, 93 deletions(-)
 delete mode 100644 recipes-devtools/qemu/files/8fa2346723fb74e8220ac9f186dabc2f57e4cb43.patch
 delete mode 100644 recipes-devtools/qemu/files/dma-xlnx-zynq-devcfg.patch
 delete mode 100644 recipes-devtools/qemu/qemu_2.7%.bbappend

diff --git a/recipes-devtools/qemu/files/8fa2346723fb74e8220ac9f186dabc2f57e4cb43.patch b/recipes-devtools/qemu/files/8fa2346723fb74e8220ac9f186dabc2f57e4cb43.patch
deleted file mode 100644
index f266d6d..0000000
--- a/recipes-devtools/qemu/files/8fa2346723fb74e8220ac9f186dabc2f57e4cb43.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 8fa2346723fb74e8220ac9f186dabc2f57e4cb43 Mon Sep 17 00:00:00 2001
-From: Alistair Francis <alistair.francis at xilinx.com>
-Date: Wed, 15 Jun 2016 10:39:55 -0700
-Subject: [PATCH] target-arm: Disable EL3 on A53
-
-The Xilinx kernel doesn't support having EL3 enabled and EL2 disabled.
-As EL2 is not yet supported on mainline QEMU disable EL3 until we can
-support a complete boot flow.
-
-Signed-off-by: Alistair Francis <alistair.francis at xilinx.com>
-Upstream-Status: Inappropriate [workaround feature incompatibility]
----
- target-arm/cpu64.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/target-arm/cpu64.c b/target-arm/cpu64.c
-index 1635deb..0896259 100644
---- a/target-arm/cpu64.c
-+++ b/target-arm/cpu64.c
-@@ -165,7 +165,6 @@ static void aarch64_a53_initfn(Object *obj)
-     set_feature(&cpu->env, ARM_FEATURE_V8_SHA256);
-     set_feature(&cpu->env, ARM_FEATURE_V8_PMULL);
-     set_feature(&cpu->env, ARM_FEATURE_CRC);
--    set_feature(&cpu->env, ARM_FEATURE_EL3);
-     cpu->kvm_target = QEMU_KVM_ARM_TARGET_CORTEX_A53;
-     cpu->midr = 0x410fd034;
-     cpu->revidr = 0x00000000;
--- 
-2.7.4
-
diff --git a/recipes-devtools/qemu/files/dma-xlnx-zynq-devcfg.patch b/recipes-devtools/qemu/files/dma-xlnx-zynq-devcfg.patch
deleted file mode 100644
index eb6a587..0000000
--- a/recipes-devtools/qemu/files/dma-xlnx-zynq-devcfg.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From a43639b12daff2230a98faffcffc79346c8ebf8c Mon Sep 17 00:00:00 2001
-From: Nathan Rossi <nathan at nathanrossi.com>
-Date: Thu, 22 Sep 2016 18:13:08 +0100
-Subject: [PATCH] dma: xlnx-zynq-devcfg: Fix up XLNX_ZYNQ_DEVCFG_R_MAX
-
-Whilst according to the Zynq TRM this device covers a register region of
-0x000 - 0x120. The register region is also shared with XADCIF prefix
-registers at 0x100 and above. Due to how the devcfg and the xadc devices
-are implemented in QEMU these are separate models with individual mmio
-regions. As such the region registered by the devcfg overlaps with the
-xadc when initialized in a machine model (e.g. xilinx-zynq-a9).
-
-This patch fixes up the incorrect region size, where
-XLNX_ZYNQ_DEVCFG_R_MAX is missing its '/ 4' causing it to be 0x460 in
-size. As well as setting the region size to the 0x0 - 0x100 region so
-that an xadc device instance can be registered in the correct region to
-pair with the devcfg device instance.
-
-Mapping with XLNX_ZYNQ_DEVCFG_R_MAX = 0x118:
-  dev: xlnx.ps7-dev-cfg, id ""
-    mmio 00000000f8007000/0000000000000460
-  dev: xlnx,zynq-xadc, id ""
-    mmio 00000000f8007100/0000000000000020
-
-Mapping with XLNX_ZYNQ_DEVCFG_R_MAX = 0x100 / 4:
-  dev: xlnx.ps7-dev-cfg, id ""
-    mmio 00000000f8007000/0000000000000100
-  dev: xlnx,zynq-xadc, id ""
-    mmio 00000000f8007100/0000000000000020
-
-Signed-off-by: Nathan Rossi <nathan at nathanrossi.com>
-Reviewed-by: Alistair Francis <alistair.francis at xilinx.com>
-Message-id: 20160921180911.32289-1-nathan at nathanrossi.com
-Signed-off-by: Peter Maydell <peter.maydell at linaro.org>
-Upstream-Status: Backport
----
- include/hw/dma/xlnx-zynq-devcfg.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/hw/dma/xlnx-zynq-devcfg.h b/include/hw/dma/xlnx-zynq-devcfg.h
-index d40e5c8df6..9f5119a89a 100644
---- a/include/hw/dma/xlnx-zynq-devcfg.h
-+++ b/include/hw/dma/xlnx-zynq-devcfg.h
-@@ -34,7 +34,7 @@
- #define XLNX_ZYNQ_DEVCFG(obj) \
-     OBJECT_CHECK(XlnxZynqDevcfg, (obj), TYPE_XLNX_ZYNQ_DEVCFG)
- 
--#define XLNX_ZYNQ_DEVCFG_R_MAX 0x118
-+#define XLNX_ZYNQ_DEVCFG_R_MAX (0x100 / 4)
- 
- #define XLNX_ZYNQ_DEVCFG_DMA_CMD_FIFO_LEN 10
- 
--- 
-2.9.3
-
diff --git a/recipes-devtools/qemu/qemu_2.7%.bbappend b/recipes-devtools/qemu/qemu_2.7%.bbappend
deleted file mode 100644
index 60ae486..0000000
--- a/recipes-devtools/qemu/qemu_2.7%.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += " \
-		file://8fa2346723fb74e8220ac9f186dabc2f57e4cb43.patch \
-		file://dma-xlnx-zynq-devcfg.patch \
-		"
-
-- 
2.9.3