From 0d1cfe8de320a2fb470e3b832b249b8e0c820685 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 20 Dec 2023 14:35:56 -0700 Subject: 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 --- meta-xilinx-core/conf/layer.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta-xilinx-core/conf') 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 PREFERRED_VERSION_qemu-xilinx-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" PREFERRED_VERSION_qemu-xilinx-system-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" PREFERRED_VERSION_qemu-devicetrees ?= "xilinx-${XILINX_RELEASE_VERSION}%" -PREFERRED_PROVIDER_qemu ?= "qemu-xilinx" + +DEFAULT_XILINX_QEMU = "qemu-xilinx" +DEFAULT_XILINX_QEMU:arm = "qemu" +PREFERRED_PROVIDER_qemu ?= "${DEFAULT_XILINX_QEMU}" XILINX_ATF_VERSION[v2023.1] = "2.8-xilinx-v2023.1%" XILINX_ATF_VERSION[v2023.2] = "2.8-xilinx-v2023.2%" -- cgit v1.2.3-54-g00ecf