Skip to content

Commit d1d1660

Browse files
committed
qemu: Update to QEMU 6.2 release
This commit updates the QEMU version to 6.2. QEMU 6.2 is required to support ARM M-Profile Vector Extension (MVE) emulation. Signed-off-by: Stephanos Ioannidis <[email protected]>
1 parent 1abfff0 commit d1d1660

File tree

3 files changed

+20
-15
lines changed

3 files changed

+20
-15
lines changed

meta-zephyr-sdk/recipes-devtools/qemu/files/cross.patch

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@ Index: qemu/configure
1010
===================================================================
1111
--- a/configure
1212
+++ b/configure
13-
@@ -6345,7 +6345,6 @@ if has $sdl2_config; then
14-
fi
15-
echo "strip = [$(meson_quote $strip)]" >> $cross
16-
echo "windres = [$(meson_quote $windres)]" >> $cross
17-
-if test "$cross_compile" = "yes"; then
13+
@@ -3932,7 +3932,6 @@ if test "$skip_meson" = no; then
14+
fi
15+
echo "strip = [$(meson_quote $strip)]" >> $cross
16+
echo "windres = [$(meson_quote $windres)]" >> $cross
17+
- if test "$cross_compile" = "yes"; then
1818
cross_arg="--cross-file config-meson.cross"
1919
echo "[host_machine]" >> $cross
2020
if test "$mingw32" = "yes" ; then
21-
@@ -6377,9 +6376,6 @@ if test "$cross_compile" = "yes"; then
21+
@@ -3964,9 +3963,6 @@ if test "$skip_meson" = no; then
2222
else
2323
echo "endian = 'little'" >> $cross
2424
fi
25-
-else
25+
- else
2626
- cross_arg="--native-file config-meson.cross"
27-
-fi
28-
mv $cross config-meson.cross
29-
30-
rm -rf meson-private meson-info meson-logs
27+
- fi
28+
mv $cross config-meson.cross
29+
30+
rm -rf meson-private meson-info meson-logs

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

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

2-
DEPENDS = "glib-2.0 zlib pixman gnutls dtc ninja-native meson-native"
2+
DEPENDS = "glib-2.0 zlib pixman gnutls libtasn1 dtc ninja-native meson-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 = "44596c428a63452efd5dd52324d0b8338a7e6919"
8+
SRCREV = "59f1efa351fefd631650a9a49da64fa082103ac2"
99
SRC_URI = "git://github.com/zephyrproject-rtos/qemu.git;protocol=https;nobranch=1 \
1010
https://github.com/zephyrproject-rtos/seabios/releases/download/zephyr-v1.0.0/bios-128k.bin;name=bios-128k \
1111
https://github.com/zephyrproject-rtos/seabios/releases/download/zephyr-v1.0.0/bios-256k.bin;name=bios-256k \
@@ -198,13 +198,13 @@ inherit autotools pkgconfig
198198
#--disable-blobs : BIOS needed for x86
199199
#--disable-fdt: Cannot use if supporting ARM
200200

201-
QEMUS_BUILT = "aarch64-softmmu arm-softmmu i386-softmmu mips-softmmu mipsel-softmmu nios2-softmmu xtensa-softmmu riscv32-softmmu riscv64-softmmu sparc-softmmu x86_64-softmmu arc-softmmu arc64-softmmu"
201+
QEMUS_BUILT = "aarch64-softmmu arm-softmmu i386-softmmu mips-softmmu mipsel-softmmu nios2-softmmu xtensa-softmmu riscv32-softmmu riscv64-softmmu sparc-softmmu x86_64-softmmu"
202202
QEMU_FLAGS = "--disable-docs --disable-sdl --disable-debug-info --disable-cap-ng \
203203
--disable-libnfs --disable-libusb --disable-libiscsi --disable-usb-redir --disable-linux-aio\
204204
--disable-guest-agent --disable-libssh --disable-vnc-png --disable-seccomp \
205205
--disable-tpm --disable-numa --disable-glusterfs \
206206
--disable-virtfs --disable-xen --disable-curl --disable-attr --disable-curses --disable-iconv \
207-
--disable-kvm --disable-sheepdog --disable-parallels --disable-replication \
207+
--disable-kvm --disable-parallels --disable-replication \
208208
--disable-live-block-migration --disable-dmg \
209209
"
210210

release-notes.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Notes / Changes in various releases
22

3+
## Zephyr SDK 0.14.1
4+
5+
- qemu:
6+
* Updated to QEMU 6.2 release.
7+
38
## Zephyr SDK 0.14.0
49

510
- general:

0 commit comments

Comments
 (0)