Skip to content

Commit 13e391b

Browse files
committed
qemu: xilinx: update to work with poky 5
Signed-off-by: Anas Nashif <[email protected]>
1 parent 381c58c commit 13e391b

7 files changed

+219
-266
lines changed

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: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
From 1a574aa22c9b3700af7e5c0901abef59c72bb874 Mon Sep 17 00:00:00 2001
2+
From: Changqing Li <[email protected]>
3+
Date: Thu, 14 Jan 2021 06:33:04 +0000
4+
Subject: [PATCH] tests/meson.build: use relative path to refer to files
5+
6+
Fix error like:
7+
Fatal error: can't create tests/ptimer-test.p/..._qemu-5.2.0_hw_core_ptimer.c.o: File name too long
8+
9+
when build path is too long, use meson.source_root() will make this
10+
filename too long. Fixed by using relative path to refer to files
11+
12+
Upstream-Status: Submitted [send to qemu-devel]
13+
14+
Signed-off-by: Changqing Li <[email protected]>
15+
---
16+
tests/unit/meson.build | 6 +++---
17+
1 file changed, 3 insertions(+), 3 deletions(-)
18+
19+
diff --git a/tests/unit/meson.build b/tests/unit/meson.build
20+
index 490ab8182..d19ee5606 100644
21+
--- a/tests/unit/meson.build
22+
+++ b/tests/unit/meson.build
23+
@@ -128,17 +128,17 @@ endif
24+
25+
if have_system
26+
tests += {
27+
- 'ptimer-test': ['ptimer-test-stubs.c', meson.project_source_root() / 'hw/core/ptimer.c'],
28+
+ 'ptimer-test': ['ptimer-test-stubs.c', '../../hw/core/ptimer.c'],
29+
'test-iov': [],
30+
'test-opts-visitor': [testqapi],
31+
'test-xs-node': [qom],
32+
- 'test-virtio-dmabuf': [meson.project_source_root() / 'hw/display/virtio-dmabuf.c'],
33+
+ 'test-virtio-dmabuf': ['../../hw/display/virtio-dmabuf.c'],
34+
'test-qmp-cmds': [testqapi],
35+
'test-xbzrle': [migration],
36+
'test-util-sockets': ['socket-helpers.c'],
37+
'test-base64': [],
38+
'test-bufferiszero': [],
39+
- 'test-smp-parse': [qom, meson.project_source_root() / 'hw/core/machine-smp.c'],
40+
+ 'test-smp-parse': [qom, '../../hw/core/machine-smp.c'],
41+
'test-vmstate': [migration, io],
42+
'test-yank': ['socket-helpers.c', qom, io, chardev]
43+
}
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
From 2e9642b9001df523628ab2cacbbbf2b208c49437 Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <[email protected]>
3+
Date: Wed, 22 May 2024 14:02:55 +0200
4+
Subject: [PATCH] configure: lookup meson exutable from PATH
5+
6+
Upstream-Status: Inappropriate [workaround, would need a real fix for upstream]
7+
---
8+
configure | 7 +------
9+
1 file changed, 1 insertion(+), 6 deletions(-)
10+
11+
diff --git a/configure b/configure
12+
index d08b71f14..af0bd2c66 100755
13+
--- a/configure
14+
+++ b/configure
15+
@@ -958,12 +958,7 @@ mkvenv="$python ${source_path}/python/scripts/mkvenv.py"
16+
$mkvenv ensuregroup --dir "${source_path}/python/wheels" \
17+
${source_path}/pythondeps.toml meson || exit 1
18+
19+
-# At this point, we expect Meson to be installed and available.
20+
-# We expect mkvenv or pip to have created pyvenv/bin/meson for us.
21+
-# We ignore PATH completely here: we want to use the venv's Meson
22+
-# *exclusively*.
23+
-
24+
-meson="$(cd pyvenv/bin; pwd)/meson"
25+
+meson=`which meson`
26+
27+
# Conditionally ensure Sphinx is installed.
28+
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+
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/configure b/configure
2+
index 133f4e3235..63e3c97fd9 100755
3+
--- a/configure
4+
+++ b/configure
5+
@@ -1037,7 +1037,7 @@ fi
6+
# We ignore PATH completely here: we want to use the venv's Meson
7+
# *exclusively*.
8+
9+
-meson="$(cd pyvenv/bin; pwd)/meson"
10+
+meson=`which meson`
11+
12+
# Conditionally ensure Sphinx is installed.
13+

0 commit comments

Comments
 (0)