[PATCH rtems-source-builder] qemu: Adjust cgem interrupt patch

[Kinsey Moore]

This patch is being moved to the 5.2.0-1 QEMU configuration because the
Xilinx QEMU build uses the 5-1 configuration and this patch does not
apply to Xilinx's modified tree. This also adds a new patch that applies
correctly to Xilinx's modified QEMU tree.

Updates #4919
---
 bare/config/devel/qemu-5.2.0-1.cfg          | 7 +++++++
 bare/config/devel/qemu-xilinx-v2020.2-1.cfg | 7 +++++++
 source-builder/config/qemu-5-1.cfg          | 4 ----
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/bare/config/devel/qemu-5.2.0-1.cfg b/bare/config/devel/qemu-5.2.0-1.cfg
index 1c1cfeb..3c8186b 100644
--- a/bare/config/devel/qemu-5.2.0-1.cfg
+++ b/bare/config/devel/qemu-5.2.0-1.cfg
@@ -36,6 +36,13 @@
 %hash sha512 qemu-5.2.0-leon3.patch \
        cQju/ja5SAM+gsXEkzSteeR+7PjG9g2w+yUb4kg1eZoOSm2MmZDjA/auINVdRax8wgtIEWnzq5/hdY7/THnowg==
 
+#
+# Patch to fix cgem priority queue interrupt functionality issue
+#
+%patch add qemu --rsb-file=cgem_zynqmp_versal.patch -p1 https://devel.rtems.org/raw-attachment/ticket/4919/0001-hw-arm-xlnx-Connect-secondary-CGEM-IRQs.patch
+%hash sha512 cgem_zynqmp_versal.patch \
+  XIAGD29Qa4uaEKij3TYh1HJUJb7r9ZjZXl19t3Vk+8uleG2O7M1xgqmeA6zoQq+GCrcMRoJxqV4kniRapLgZRQ==
+
 #
 # The Qemu build instructions. We use 5.x.x Release 1.
 #
diff --git a/bare/config/devel/qemu-xilinx-v2020.2-1.cfg b/bare/config/devel/qemu-xilinx-v2020.2-1.cfg
index 2c3fb94..ca70ebd 100644
--- a/bare/config/devel/qemu-xilinx-v2020.2-1.cfg
+++ b/bare/config/devel/qemu-xilinx-v2020.2-1.cfg
@@ -17,6 +17,13 @@
 #
 %source set qemu git://github.com/Xilinx/qemu.git?protocol=https?checkout=%{qemu_version}?submodule=dtc?submodule=slirp?submodule=ui/keycodemapdb?submodule=tests/fp/berkeley-softfloat-3?submodule=tests/fp/berkeley-testfloat-3
 
+#
+# Patch to fix cgem priority queue interrupt functionality issue
+#
+%patch add qemu --rsb-file=xlnx_cgem_zynqmp_versal.patch -p1 https://devel.rtems.org/raw-attachment/ticket/4919/0001-hw-arm-xlnx-Connect-secondary-CGEM-IRQs-xlnx.patch
+%hash sha512 xlnx_cgem_zynqmp_versal.patch \
+  tGjJn7o8/fQwdC0sgsYmPW6bqDzMkwhKRqBwuuy8sdEKivDj7uGISMj7p8Iwy9fkHiO3Dd3feno+iz5fHYGBkA==
+
 #
 # The Qemu build instructions. We use 5.x.x Release 1.
 #
diff --git a/source-builder/config/qemu-5-1.cfg b/source-builder/config/qemu-5-1.cfg
index 89d203c..7ca58b8 100644
--- a/source-builder/config/qemu-5-1.cfg
+++ b/source-builder/config/qemu-5-1.cfg
@@ -7,7 +7,3 @@
 %define qemu_disables --disable-nettle
 
 %include %{_configdir}/qemu-common-2.cfg
-
-%patch add qemu --rsb-file=cgem_zynqmp_versal.patch -p1 https://devel.rtems.org/raw-attachment/ticket/4919/0001-hw-arm-xlnx-Connect-secondary-CGEM-IRQs.patch
-%hash sha512 cgem_zynqmp_versal.patch \
-  XIAGD29Qa4uaEKij3TYh1HJUJb7r9ZjZXl19t3Vk+8uleG2O7M1xgqmeA6zoQq+GCrcMRoJxqV4kniRapLgZRQ==
-- 
2.39.2