diff options
author | Mark Hatle <mark.hatle@amd.com> | 2022-12-22 02:32:16 -0800 |
---|---|---|
committer | Mark Hatle <mark.hatle@amd.com> | 2023-01-06 10:58:20 -0800 |
commit | 38a28f24d52ce2bfb608e544dc943c68982e8a0a (patch) | |
tree | 2d687b8501c6c217055e6cf386fb17ac9f805d88 /meta-xilinx-core | |
parent | a6bbe1adb83bcb0edc62fc9f1d3f5c54db34a916 (diff) | |
download | meta-xilinx-38a28f24d52ce2bfb608e544dc943c68982e8a0a.tar.gz |
qemu-xilinx: Refactor to enable qemu 2023.1 ver 7.1
Refactor QEMU integration as the versions now match the Langdale core version.
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
Diffstat (limited to 'meta-xilinx-core')
-rw-r--r-- | meta-xilinx-core/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.1.inc | 5 | ||||
-rw-r--r-- | meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-6.1.0/cross.patch (renamed from meta-xilinx-core/recipes-devtools/qemu/files/cross.patch) | 0 | ||||
-rw-r--r-- | meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/cross.patch | 38 | ||||
-rw-r--r-- | meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.inc | 32 | ||||
-rw-r--r-- | meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native-7.1.inc | 4 | ||||
-rw-r--r-- | meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2023.1.bb | 2 | ||||
-rw-r--r-- | meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2023.1.bb | 5 | ||||
-rw-r--r-- | meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc | 2 | ||||
-rw-r--r-- | meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.1.bb | 2 |
10 files changed, 82 insertions, 10 deletions
diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index e8145be8..6c1c2423 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf | |||
@@ -50,7 +50,7 @@ BUILDCFG_VARS:append = " SOC_VARIANT XILINX_RELEASE_VERSION" | |||
50 | 50 | ||
51 | XILINX_QEMU_VERSION[v2022.1] = "v6.1.0-xilinx-v2022.1%" | 51 | XILINX_QEMU_VERSION[v2022.1] = "v6.1.0-xilinx-v2022.1%" |
52 | XILINX_QEMU_VERSION[v2022.2] = "v6.1.0-xilinx-v2022.2%" | 52 | XILINX_QEMU_VERSION[v2022.2] = "v6.1.0-xilinx-v2022.2%" |
53 | XILINX_QEMU_VERSION[v2023.1] = "v6.1.0-xilinx-v2023.1%" | 53 | XILINX_QEMU_VERSION[v2023.1] = "v7.1.0-xilinx-v2023.1%" |
54 | PREFERRED_VERSION_qemu-xilinx ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" | 54 | PREFERRED_VERSION_qemu-xilinx ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" |
55 | PREFERRED_VERSION_qemu-xilinx-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" | 55 | PREFERRED_VERSION_qemu-xilinx-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" |
56 | PREFERRED_VERSION_qemu-xilinx-system-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" | 56 | PREFERRED_VERSION_qemu-xilinx-system-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" |
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.1.inc index fc5689bf..97e2a094 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.1.inc +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.1.inc | |||
@@ -1,4 +1,3 @@ | |||
1 | XILINX_QEMU_VERSION = "v6.1.0" | 1 | XILINX_QEMU_VERSION = "v7.1.0" |
2 | BRANCH = "master" | 2 | BRANCH = "master" |
3 | SRCREV = "fe535c44759cc43a4beea9b08a66c2ba869add7b" | 3 | SRCREV = "ed2e270398ef10d8a40cf26eb2bd7704e24fe451" |
4 | |||
diff --git a/meta-xilinx-core/recipes-devtools/qemu/files/cross.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-6.1.0/cross.patch index bdb77ec7..bdb77ec7 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/files/cross.patch +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-6.1.0/cross.patch | |||
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/cross.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/cross.patch new file mode 100644 index 00000000..ca2ad361 --- /dev/null +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.0/cross.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 76c3fc4c87231bed32974ebbbdb5079cff45a6b7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Tue, 5 Jan 2021 23:00:14 +0000 | ||
4 | Subject: [PATCH 12/12] qemu: Upgrade 5.1.0->5.2.0 | ||
5 | |||
6 | We need to be able to trigger configure's cross code but we don't want | ||
7 | to set cross_prefix as it does other things we don't want. Patch things | ||
8 | so we can do what we need in the target config case. | ||
9 | |||
10 | Upstream-Status: Inappropriate [may be rewritten in a way upstream may accept?] | ||
11 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
12 | |||
13 | --- | ||
14 | configure | 4 ---- | ||
15 | 1 file changed, 4 deletions(-) | ||
16 | |||
17 | Index: qemu-7.1.0/configure | ||
18 | =================================================================== | ||
19 | --- qemu-7.1.0.orig/configure | ||
20 | +++ qemu-7.1.0/configure | ||
21 | @@ -2710,7 +2710,6 @@ if test "$skip_meson" = no; then | ||
22 | echo "strip = [$(meson_quote $strip)]" >> $cross | ||
23 | echo "widl = [$(meson_quote $widl)]" >> $cross | ||
24 | echo "windres = [$(meson_quote $windres)]" >> $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 | @@ -2728,9 +2727,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 | ||
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.inc new file mode 100644 index 00000000..595b988d --- /dev/null +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.inc | |||
@@ -0,0 +1,32 @@ | |||
1 | SUMMARY = "Xilinx's fork of a fast open source processor emulator" | ||
2 | HOMEPAGE = "https://github.com/xilinx/qemu/" | ||
3 | |||
4 | # x86_64 is needed to build nativesdks | ||
5 | QEMU_TARGETS = "aarch64 arm microblaze microblazeel x86_64" | ||
6 | |||
7 | LIC_FILES_CHKSUM = " \ | ||
8 | file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ | ||
9 | file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f \ | ||
10 | " | ||
11 | DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native meson-native" | ||
12 | |||
13 | FILESEXTRAPATHS:prepend := "${THISDIR}/qemu-xilinx-7.1.0:" | ||
14 | |||
15 | PV = "${XILINX_QEMU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}" | ||
16 | REPO ?= "gitsm://github.com/Xilinx/qemu.git;protocol=https" | ||
17 | |||
18 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" | ||
19 | SRC_URI = "${REPO};${BRANCHARG}" | ||
20 | |||
21 | SRC_URI:append = " file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch" | ||
22 | |||
23 | S = "${WORKDIR}/git" | ||
24 | |||
25 | PACKAGECONFIG ??= " \ | ||
26 | fdt sdl kvm gcrypt pie slirp \ | ||
27 | ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \ | ||
28 | ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)} \ | ||
29 | " | ||
30 | PACKAGECONFIG:class-nativesdk ??= "fdt sdl kvm gcrypt pie slirp" | ||
31 | |||
32 | DISABLE_STATIC:pn-${PN} = "" | ||
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native-7.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native-7.1.inc new file mode 100644 index 00000000..e664a580 --- /dev/null +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native-7.1.inc | |||
@@ -0,0 +1,4 @@ | |||
1 | require recipes-devtools/qemu/qemu-native.inc | ||
2 | require qemu-xilinx-7.1.inc | ||
3 | |||
4 | DEPENDS = "glib-2.0-native zlib-native ninja-native meson-native" | ||
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2023.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2023.1.bb index 04d91948..06711fd9 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2023.1.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2023.1.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | require qemu-xilinx-2023.1.inc | 1 | require qemu-xilinx-2023.1.inc |
2 | require qemu-xilinx-native.inc | 2 | require qemu-xilinx-native-7.1.inc |
3 | require qemu-native-alt.inc | 3 | require qemu-native-alt.inc |
4 | 4 | ||
5 | BPN = "qemu-xilinx" | 5 | BPN = "qemu-xilinx" |
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2023.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2023.1.bb index 1fb51cdd..1e738530 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2023.1.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2023.1.bb | |||
@@ -1,12 +1,12 @@ | |||
1 | require qemu-system-native-alt.inc | 1 | require qemu-system-native-alt.inc |
2 | require qemu-xilinx-2023.1.inc | 2 | require qemu-xilinx-2023.1.inc |
3 | require qemu-xilinx-native.inc | 3 | require qemu-xilinx-native-7.1.inc |
4 | 4 | ||
5 | PROVIDES = "qemu-system-native" | 5 | PROVIDES = "qemu-system-native" |
6 | 6 | ||
7 | EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}" | 7 | EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}" |
8 | 8 | ||
9 | PACKAGECONFIG ??= "fdt alsa kvm pie slirp" | 9 | PACKAGECONFIG ??= "fdt alsa kvm gcrypt pie slirp" |
10 | 10 | ||
11 | PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}" | 11 | PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}" |
12 | 12 | ||
@@ -24,4 +24,3 @@ do_install:append() { | |||
24 | install -d ${D}${libdir}/qemu-python/qmp/ | 24 | install -d ${D}${libdir}/qemu-python/qmp/ |
25 | install -D ${S}/python/qemu/qmp/* ${D}${libdir}/qemu-python/qmp/ | 25 | install -D ${S}/python/qemu/qmp/* ${D}${libdir}/qemu-python/qmp/ |
26 | } | 26 | } |
27 | |||
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc index 7dc0b84b..788a3fe0 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc | |||
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \ | |||
10 | " | 10 | " |
11 | DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native meson-native" | 11 | DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native meson-native" |
12 | 12 | ||
13 | FILESEXTRAPATHS:prepend := "${THISDIR}/files:" | 13 | FILESEXTRAPATHS:prepend := "${THISDIR}/qemu-xilinx-6.1.0:" |
14 | 14 | ||
15 | PV = "${XILINX_QEMU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}" | 15 | PV = "${XILINX_QEMU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}" |
16 | REPO ?= "gitsm://github.com/Xilinx/qemu.git;protocol=https" | 16 | REPO ?= "gitsm://github.com/Xilinx/qemu.git;protocol=https" |
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.1.bb index 8bca9fdc..bc7b17b2 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.1.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.1.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require qemu-xilinx-2023.1.inc | 1 | require qemu-xilinx-2023.1.inc |
2 | require recipes-devtools/qemu/qemu.inc | 2 | require recipes-devtools/qemu/qemu.inc |
3 | require qemu-xilinx.inc | 3 | require qemu-xilinx-7.1.inc |
4 | require qemu-alt.inc | 4 | require qemu-alt.inc |
5 | 5 | ||
6 | BBCLASSEXTEND = "nativesdk" | 6 | BBCLASSEXTEND = "nativesdk" |