Skip to content

Commit e6f3cb8

Browse files
committed
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]>
1 parent fff0928 commit e6f3cb8

File tree

4 files changed

+10
-86
lines changed

4 files changed

+10
-86
lines changed

meta-zephyr-sdk/recipes-devtools/qemu/zephyr-qemu_git.bb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,8 @@ do_install_append() {
228228
# Link Xilinx QEMU executables
229229
ln -sf ../xilinx/bin/qemu-system-aarch64 ${D}${bindir}/qemu-system-xilinx-aarch64
230230
ln -sf ../xilinx/bin/qemu-system-microblazeel ${D}${bindir}/qemu-system-xilinx-microblazeel
231+
ln -sf ../xilinx/bin/qemu-system-riscv32 ${D}${bindir}/qemu-system-xilinx-riscv32
232+
ln -sf ../xilinx/bin/qemu-system-riscv64 ${D}${bindir}/qemu-system-xilinx-riscv64
231233

232234
# Link ARC (Synopsys) QEMU executables
233235
ln -sf ../synopsys/bin/qemu-system-arc ${D}${bindir}/qemu-system-arc

meta-zephyr-sdk/recipes-devtools/xilinx_qemu/files/0001-Revert-target-arm-Revert-back-to-YIELD-for-WFI.patch

Lines changed: 0 additions & 39 deletions
This file was deleted.

meta-zephyr-sdk/recipes-devtools/xilinx_qemu/files/0002-Enable-WFI-CPU-halting-in-icount-mode.patch

Lines changed: 0 additions & 39 deletions
This file was deleted.

meta-zephyr-sdk/recipes-devtools/xilinx_qemu/xilinx-qemu_git.bb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11

2-
DEPENDS = "glib-2.0 zlib pixman gnutls dtc"
2+
DEPENDS = "glib-2.0 zlib pixman gnutls dtc bison-native ninja-native"
33
LICENSE = "GPLv2"
44
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
55
LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
66
file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f"
77

8-
SRCREV = "e40b634b24b37fe521bb2857c5e93ee1d30c2e37"
8+
SRCREV = "01482fa113dcbfa785feb7d513df50d15ec4c5df"
99
SRC_URI = "git://github.com/Xilinx/qemu.git;protocol=https \
10-
file://0001-Revert-target-arm-Revert-back-to-YIELD-for-WFI.patch \
11-
file://0002-Enable-WFI-CPU-halting-in-icount-mode.patch \
1210
"
1311

1412
BBCLASSEXTEND = "native nativesdk"
1513
INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
1614
INHIBIT_PACKAGE_STRIP = "1"
1715

16+
EXTRA_OEMESON:append:class-native = "-Dskip_sanity_check = true"
17+
1818
S = "${WORKDIR}/git"
1919

2020
xilinx_qemu_prefix = "${base_prefix}/usr/xilinx"
@@ -194,13 +194,13 @@ inherit autotools pkgconfig
194194

195195
#--disable-fdt: Cannot use if supporting arm-generic-fdt machine type
196196

197-
QEMUS_BUILT = "aarch64-softmmu microblazeel-softmmu"
197+
QEMUS_BUILT = "aarch64-softmmu microblazeel-softmmu riscv32-softmmu riscv64-softmmu"
198198
QEMU_FLAGS = "--disable-docs --disable-sdl --disable-debug-info --disable-cap-ng \
199199
--disable-libnfs --disable-libusb --disable-libiscsi --disable-usb-redir --disable-linux-aio \
200-
--disable-guest-agent --disable-libssh --disable-vnc-png --disable-seccomp \
201-
--disable-tpm --disable-numa --disable-glusterfs --disable-blobs \
200+
--disable-guest-agent --disable-libssh --disable-seccomp \
201+
--disable-tpm --disable-numa --disable-glusterfs \
202202
--disable-virtfs --disable-xen --disable-curl --disable-attr --disable-curses --disable-iconv \
203-
--disable-kvm --disable-sheepdog --disable-parallels --disable-replication \
203+
--disable-kvm --disable-parallels --disable-replication \
204204
--disable-live-block-migration --disable-dmg \
205205
"
206206

0 commit comments

Comments
 (0)