Skip to content

Commit 886bff4

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 removed in Xilinx 2024.1. --disable-sheepdog was removed in 2022.1. There is also a need to cover new dependencies including libtasn1, bison and ninja. And also disabling meson when Qemu is configured and enable gcrypt to emulate crypto models. Signed-off-by: Michal Simek <[email protected]>
1 parent 666f881 commit 886bff4

File tree

3 files changed

+7
-86
lines changed

3 files changed

+7
-86
lines changed

meta-zephyr-sdk/recipes-devtools/qemu_xilinx/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/qemu_xilinx/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/qemu_xilinx/qemu-xilinx_git.bb

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

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

7-
SRCREV = "e40b634b24b37fe521bb2857c5e93ee1d30c2e37"
7+
SRCREV = "01482fa113dcbfa785feb7d513df50d15ec4c5df"
88
SRC_URI = "gitsm://github.com/Xilinx/qemu.git;protocol=https;nobranch=1 \
9-
file://0001-Revert-target-arm-Revert-back-to-YIELD-for-WFI.patch \
10-
file://0002-Enable-WFI-CPU-halting-in-icount-mode.patch \
119
"
1210

1311
BBCLASSEXTEND = "native nativesdk"
@@ -193,14 +191,15 @@ inherit autotools pkgconfig
193191

194192
#--disable-fdt: Cannot use if supporting arm-generic-fdt machine type
195193

196-
QEMUS_BUILT = "aarch64-softmmu microblazeel-softmmu"
194+
QEMUS_BUILT = "aarch64-softmmu microblazeel-softmmu riscv32-softmmu riscv64-softmmu"
197195
QEMU_FLAGS = "--disable-docs --disable-sdl --disable-debug-info --disable-cap-ng \
198196
--disable-libnfs --disable-libusb --disable-libiscsi --disable-usb-redir --disable-linux-aio \
199-
--disable-guest-agent --disable-libssh --disable-vnc-png --disable-seccomp \
200-
--disable-tpm --disable-numa --disable-glusterfs --disable-blobs \
197+
--disable-guest-agent --disable-libssh --disable-seccomp \
198+
--disable-tpm --disable-numa --disable-glusterfs \
201199
--disable-virtfs --disable-xen --disable-curl --disable-attr --disable-curses --disable-iconv \
202-
--disable-kvm --disable-sheepdog --disable-parallels --disable-replication \
200+
--disable-kvm --disable-parallels --disable-replication \
203201
--disable-live-block-migration --disable-dmg --disable-werror \
202+
--skip-meson --enable-gcrypt \
204203
"
205204

206205
# NOTE: Once --prefix is set, QEMU configure script automatically figures out adequate sysconfdir,

0 commit comments

Comments
 (0)