meta-zephyr-sdk: xilinx_qemu: Update to QEMU 8.1.0

Update Xilinx Qemu version based on 8.1.0 which is aligned with Xilinx v2024.2 (xilinx_v2024.2 tag) tools. Also at the same time enable riscv32/64 targets and remove compilation flags which are not longer available. --disable-vnc-png was removed in Xilinx 2023.1. --disable-blobs was remvoed in Xilinx 2024.1. --disable-sheepdog was removed in 2022.1. Signed-off-by: Michal Simek <[email protected]>
zephyrproject-rtos · Feb 7, 2025 · 60a2e0c · 60a2e0c
1 parent fff0928
commit 60a2e0c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 85 deletions.
diff --git a/meta-zephyr-sdk/recipes-devtools/qemu/zephyr-qemu_git.bb b/meta-zephyr-sdk/recipes-devtools/qemu/zephyr-qemu_git.bb
@@ -228,6 +228,8 @@ do_install_append() {
     # Link Xilinx QEMU executables
     ln -sf ../xilinx/bin/qemu-system-aarch64 ${D}${bindir}/qemu-system-xilinx-aarch64
     ln -sf ../xilinx/bin/qemu-system-microblazeel ${D}${bindir}/qemu-system-xilinx-microblazeel
+    ln -sf ../xilinx/bin/qemu-system-riscv32 ${D}${bindir}/qemu-system-xilinx-riscv32
+    ln -sf ../xilinx/bin/qemu-system-riscv64 ${D}${bindir}/qemu-system-xilinx-riscv64
 
     # Link ARC (Synopsys) QEMU executables
     ln -sf ../synopsys/bin/qemu-system-arc ${D}${bindir}/qemu-system-arc

diff --git a/...ipes-devtools/xilinx_qemu/files/0001-Revert-target-arm-Revert-back-to-YIELD-for-WFI.patch b/...ipes-devtools/xilinx_qemu/files/0001-Revert-target-arm-Revert-back-to-YIELD-for-WFI.patch
diff --git a/...r-sdk/recipes-devtools/xilinx_qemu/files/0002-Enable-WFI-CPU-halting-in-icount-mode.patch b/...r-sdk/recipes-devtools/xilinx_qemu/files/0002-Enable-WFI-CPU-halting-in-icount-mode.patch
diff --git a/meta-zephyr-sdk/recipes-devtools/xilinx_qemu/xilinx-qemu_git.bb b/meta-zephyr-sdk/recipes-devtools/xilinx_qemu/xilinx-qemu_git.bb
@@ -5,10 +5,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
                     file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f"
 
-SRCREV = "e40b634b24b37fe521bb2857c5e93ee1d30c2e37"
+SRCREV = "01482fa113dcbfa785feb7d513df50d15ec4c5df"
 SRC_URI = "git://github.com/Xilinx/qemu.git;protocol=https \
-	   file://0001-Revert-target-arm-Revert-back-to-YIELD-for-WFI.patch \
-	   file://0002-Enable-WFI-CPU-halting-in-icount-mode.patch \
 "
 
 BBCLASSEXTEND = "native nativesdk"
@@ -194,13 +192,13 @@ inherit autotools pkgconfig
 
 #--disable-fdt: Cannot use if supporting arm-generic-fdt machine type
 
-QEMUS_BUILT = "aarch64-softmmu microblazeel-softmmu"
+QEMUS_BUILT = "aarch64-softmmu microblazeel-softmmu riscv32-softmmu riscv64-softmmu"
 QEMU_FLAGS = "--disable-docs  --disable-sdl --disable-debug-info  --disable-cap-ng \
   --disable-libnfs --disable-libusb --disable-libiscsi --disable-usb-redir --disable-linux-aio \
-  --disable-guest-agent --disable-libssh --disable-vnc-png  --disable-seccomp \
-  --disable-tpm  --disable-numa --disable-glusterfs --disable-blobs \
+  --disable-guest-agent --disable-libssh --disable-seccomp \
+  --disable-tpm  --disable-numa --disable-glusterfs \
   --disable-virtfs --disable-xen --disable-curl --disable-attr --disable-curses --disable-iconv \
-  --disable-kvm --disable-sheepdog --disable-parallels --disable-replication \
+  --disable-kvm --disable-parallels --disable-replication \
   --disable-live-block-migration --disable-dmg \
   "