Skip to content

Commit d2a5d26

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. There is also a need to cover new dependencies including libtasn1, bison and ninja. And also disabling meson when Qemu is configured. Signed-off-by: Michal Simek <[email protected]>
1 parent fff0928 commit d2a5d26

File tree

5 files changed

+51
-87
lines changed

5 files changed

+51
-87
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.
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
From aa75635d53ae7d2dd7b1a76aa571e686533ed813 Mon Sep 17 00:00:00 2001
2+
Message-ID: <aa75635d53ae7d2dd7b1a76aa571e686533ed813.1739290771.git.michal.simek@amd.com>
3+
From: Michal Simek <[email protected]>
4+
Date: Tue, 11 Feb 2025 17:18:42 +0100
5+
Subject: [PATCH] cross
6+
7+
We need to be able to trigger configure's cross code but we don't want
8+
to set cross_prefix as it does other things we don't want. Patch things
9+
so we can do what we need in the target config case.
10+
11+
Upstream-Status: Inappropriate [may be rewritten in a way upstream may accept?]
12+
Signed-off-by: Richard Purdie <[email protected]>
13+
---
14+
configure | 4 ----
15+
1 file changed, 4 deletions(-)
16+
17+
diff --git a/configure b/configure
18+
index 133f4e323512..49fb6bd36a92 100755
19+
--- a/configure
20+
+++ b/configure
21+
@@ -1897,7 +1897,6 @@ if test "$skip_meson" = no; then
22+
echo "widl = [$(meson_quote $widl)]" >> $cross
23+
echo "windres = [$(meson_quote $windres)]" >> $cross
24+
echo "windmc = [$(meson_quote $windmc)]" >> $cross
25+
- if test "$cross_compile" = "yes"; then
26+
cross_arg="--cross-file config-meson.cross"
27+
echo "[host_machine]" >> $cross
28+
echo "system = '$targetos'" >> $cross
29+
@@ -1915,9 +1914,6 @@ if test "$skip_meson" = no; then
30+
else
31+
echo "endian = 'little'" >> $cross
32+
fi
33+
- else
34+
- cross_arg="--native-file config-meson.cross"
35+
- fi
36+
mv $cross config-meson.cross
37+
38+
rm -rf meson-private meson-info meson-logs
39+
--
40+
2.43.0
41+

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
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
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 \
10+
file://cross.patch \
1211
"
1312

1413
BBCLASSEXTEND = "native nativesdk"
@@ -194,14 +193,14 @@ inherit autotools pkgconfig
194193

195194
#--disable-fdt: Cannot use if supporting arm-generic-fdt machine type
196195

197-
QEMUS_BUILT = "aarch64-softmmu microblazeel-softmmu"
196+
QEMUS_BUILT = "aarch64-softmmu microblazeel-softmmu riscv32-softmmu riscv64-softmmu"
198197
QEMU_FLAGS = "--disable-docs --disable-sdl --disable-debug-info --disable-cap-ng \
199198
--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 \
199+
--disable-guest-agent --disable-libssh --disable-seccomp \
200+
--disable-tpm --disable-numa --disable-glusterfs \
202201
--disable-virtfs --disable-xen --disable-curl --disable-attr --disable-curses --disable-iconv \
203-
--disable-kvm --disable-sheepdog --disable-parallels --disable-replication \
204-
--disable-live-block-migration --disable-dmg \
202+
--disable-kvm --disable-parallels --disable-replication \
203+
--disable-live-block-migration --disable-dmg --skip-meson \
205204
"
206205

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

0 commit comments

Comments
 (0)