summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKinsey Moore <kinsey.moore@oarcorp.com>2024-03-04 22:16:26 -0600
committerJoel Sherrill <joel@rtems.org>2024-04-04 08:20:58 -0500
commita9490f6d6839266c5a059d2489dd11f176e584c3 (patch)
tree1f947f52ba4f788def2f9169bef665f0078ab2b0
parentglib: Update to 2.56.4 (diff)
downloadrtems-source-builder-a9490f6d6839266c5a059d2489dd11f176e584c3.tar.bz2
qemu-xilinx: Update to 2023.2
The 2020.2 version of Xilinx's qemu branch does not build on AArch64 due to a merge conflict that was integrated into the repository and never corrected. This brings qemu-xilinx up to 2023.2 to resolve that issue and allow it to build on AArch64 systems.
-rw-r--r--bare/config/devel/qemu-xilinx-v2023.2-1.cfg37
-rw-r--r--bare/config/devel/qemu-xilinx.bset2
2 files changed, 38 insertions, 1 deletions
diff --git a/bare/config/devel/qemu-xilinx-v2023.2-1.cfg b/bare/config/devel/qemu-xilinx-v2023.2-1.cfg
new file mode 100644
index 0000000..ab808bf
--- /dev/null
+++ b/bare/config/devel/qemu-xilinx-v2023.2-1.cfg
@@ -0,0 +1,37 @@
+#
+# Xilinx Qemu from git
+#
+
+%if %{release} == %{nil}
+ %define release 1
+%endif
+
+%include %{_configdir}/base.cfg
+
+%include %{_configdir}/bare-config.cfg
+
+%define qemu_version xilinx_v2023.2
+
+#
+# Checkout the version tag and initialize all submodules.
+#
+%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==
+
+#
+# Patch to fix PPC64 build under GCC 13.2.0
+#
+#%patch add qemu --rsb-file=xlnx_ppc64_enum.patch -p1 https://devel.rtems.org/raw-attachment/ticket/4988/0001-target-ppc-Resolve-int-enum-mismatch-on-ppc64.patch
+#%hash sha512 xlnx_ppc64_enum.patch \
+# afYfClJ5IO9eV23dOAqxurzAnwS1YmiOEPCts/ftXS/ddXp9Rx2oQYuKeZriawKw7MVlqWNv9eTc5ERoFhRKOg==
+
+#
+# The Qemu build instructions. We use 5.x.x Release 1.
+#
+%include %{_configdir}/qemu-5-1.cfg
diff --git a/bare/config/devel/qemu-xilinx.bset b/bare/config/devel/qemu-xilinx.bset
index 5bcbe2f..5a204ca 100644
--- a/bare/config/devel/qemu-xilinx.bset
+++ b/bare/config/devel/qemu-xilinx.bset
@@ -21,4 +21,4 @@ devel/gettext-0.18.3.1-1
devel/libffi-3.0.13-1
devel/pixman-0.40.0-1
devel/glib-2.56.4-1
-devel/qemu-xilinx-v2020.2-1
+devel/qemu-xilinx-v2023.2-1