diff options
author | Mark Hatle <mark.hatle@amd.com> | 2023-12-20 14:35:56 -0700 |
---|---|---|
committer | Mark Hatle <mark.hatle@amd.com> | 2024-01-30 17:48:07 -0700 |
commit | 0d1cfe8de320a2fb470e3b832b249b8e0c820685 (patch) | |
tree | a20e2627c30b50bf5566fd4aee9d64850f0b095d /meta-xilinx-core | |
parent | 28ba82e414e24ca66ea5d10f026ecdff9818db2c (diff) | |
download | meta-xilinx-0d1cfe8de320a2fb470e3b832b249b8e0c820685.tar.gz |
meta-xilinx-core: layer.conf: Default to qemu for arm (32)
Normally we default to qemu-xlnx (the AMD/Xilinx QEMU fork). However, this
fork depends on some functionality not present on 32-bit arm. For on-target
qemu we need to use the stock QEMU instead.
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
Diffstat (limited to 'meta-xilinx-core')
-rw-r--r-- | meta-xilinx-core/conf/layer.conf | 5 | ||||
-rw-r--r-- | meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.inc | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index 5e1b5b5c..539688ff 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf | |||
@@ -54,7 +54,10 @@ PREFERRED_VERSION_qemu-xilinx ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVa | |||
54 | PREFERRED_VERSION_qemu-xilinx-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" | 54 | PREFERRED_VERSION_qemu-xilinx-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" |
55 | PREFERRED_VERSION_qemu-xilinx-system-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" | 55 | PREFERRED_VERSION_qemu-xilinx-system-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" |
56 | PREFERRED_VERSION_qemu-devicetrees ?= "xilinx-${XILINX_RELEASE_VERSION}%" | 56 | PREFERRED_VERSION_qemu-devicetrees ?= "xilinx-${XILINX_RELEASE_VERSION}%" |
57 | PREFERRED_PROVIDER_qemu ?= "qemu-xilinx" | 57 | |
58 | DEFAULT_XILINX_QEMU = "qemu-xilinx" | ||
59 | DEFAULT_XILINX_QEMU:arm = "qemu" | ||
60 | PREFERRED_PROVIDER_qemu ?= "${DEFAULT_XILINX_QEMU}" | ||
58 | 61 | ||
59 | XILINX_ATF_VERSION[v2023.1] = "2.8-xilinx-v2023.1%" | 62 | XILINX_ATF_VERSION[v2023.1] = "2.8-xilinx-v2023.1%" |
60 | XILINX_ATF_VERSION[v2023.2] = "2.8-xilinx-v2023.2%" | 63 | XILINX_ATF_VERSION[v2023.2] = "2.8-xilinx-v2023.2%" |
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 index bf7ad610..6e98d15d 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.inc +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-7.1.inc | |||
@@ -1,6 +1,10 @@ | |||
1 | SUMMARY = "Xilinx's fork of a fast open source processor emulator" | 1 | SUMMARY = "Xilinx's fork of a fast open source processor emulator" |
2 | HOMEPAGE = "https://github.com/xilinx/qemu/" | 2 | HOMEPAGE = "https://github.com/xilinx/qemu/" |
3 | 3 | ||
4 | # This qemu fork is NOT compatible with running on a 32-bit system | ||
5 | # See: https://github.com/Xilinx/qemu/issues/35 | ||
6 | COMPATIBLE_HOST:arm = "null" | ||
7 | |||
4 | # x86_64 is needed to build nativesdks | 8 | # x86_64 is needed to build nativesdks |
5 | QEMU_TARGETS = "aarch64 arm microblaze microblazeel x86_64" | 9 | QEMU_TARGETS = "aarch64 arm microblaze microblazeel x86_64" |
6 | 10 | ||