1 files changed, 12 insertions, 44 deletions

diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf
index 5f2b17b7..f0a233cf 100644
--- a/meta-xilinx-core/conf/layer.conf
+++ b/meta-xilinx-core/conf/layer.conf
@@ -29,7 +29,7 @@ LAYERSERIES_COMPAT_xilinx = "scarthgap"
 
 SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
   *->xrt \
-  *->zocl \
+  *->kernel-module-zocl \
   *->cairo \
   *->libepoxy \
   *->gstreamer1.0-plugins-base \
@@ -46,13 +46,6 @@ XILINX_RELEASE_VERSION ??= "v2024.1"
 
 BUILDCFG_VARS:append = " SOC_VARIANT XILINX_RELEASE_VERSION"
 
-XILINX_QEMU_VERSION[v2024.1] = "v8.1.0-xilinx-v2024.1%"
-PREFERRED_VERSION_qemu ?= "${@ '8.1%' if not (d.getVar('XILINX_RELEASE_VERSION') or 'undefined').startswith('v2024') else '8.1%'}"
-PREFERRED_VERSION_qemu-xilinx ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'v8.1%'}"
-PREFERRED_VERSION_qemu-xilinx-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'v8.1%'}"
-PREFERRED_VERSION_qemu-xilinx-system-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'v8.1%'}"
-PREFERRED_VERSION_qemu-devicetrees ?= "xilinx-v2024.1%"
-
 DEFAULT_XILINX_QEMU = "qemu-xilinx"
 DEFAULT_XILINX_QEMU:arm = "qemu"
 PREFERRED_PROVIDER_qemu ?= "${DEFAULT_XILINX_QEMU}"
@@ -64,47 +57,22 @@ XILINX_ATF_VERSION[v2023.2] = "2.8-xilinx-v2023.2%"
 XILINX_ATF_VERSION[v2024.1] = "2.10-xilinx-v2024.1%"
 PREFERRED_VERSION_arm-trusted-firmware ?= "${@d.getVarFlag('XILINX_ATF_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 
-XILINX_UBOOT_VERSION[v2022.1] = "1:v2021.01-xilinx-v2022.1%"
-XILINX_UBOOT_VERSION[v2022.2] = "1:v2022.01-xilinx-v2022.2%"
-XILINX_UBOOT_VERSION[v2023.1] = "1:v2023.01-xilinx-v2023.1%"
-XILINX_UBOOT_VERSION[v2023.2] = "1:v2023.01-xilinx-v2023.2%"
-XILINX_UBOOT_VERSION[v2024.1] = "1:v2024.01-xilinx-v2024.1%"
+XILINX_UBOOT_VERSION[v2022.1] = "1:2021.01-xilinx-v2022.1%"
+XILINX_UBOOT_VERSION[v2022.2] = "1:2022.01-xilinx-v2022.2%"
+XILINX_UBOOT_VERSION[v2023.1] = "1:2023.01-xilinx-v2023.1%"
+XILINX_UBOOT_VERSION[v2023.2] = "1:2023.01-xilinx-v2023.2%"
+XILINX_UBOOT_VERSION[v2024.1] = "1:2024.01-xilinx-v2024.1%"
 
 PREFERRED_VERSION_u-boot-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 PREFERRED_VERSION_u-boot-tools-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 
-XILINX_LINUX_VERSION[v2022.1] = "5.15.19-xilinx-v2022.1%"
-XILINX_LINUX_VERSION[v2022.2] = "5.15.36-xilinx-v2022.2%"
-XILINX_LINUX_VERSION[v2023.1] = "6.1.30-xilinx-v2023.1%"
-XILINX_LINUX_VERSION[v2023.2] = "6.1.60-xilinx-v2023.2%"
-XILINX_LINUX_VERSION[v2024.1] = "6.6.10-xilinx-v2024.1%"
+XILINX_LINUX_VERSION[v2022.1] = "5.15.19%"
+XILINX_LINUX_VERSION[v2022.2] = "5.15.36%"
+XILINX_LINUX_VERSION[v2023.1] = "6.1.30%"
+XILINX_LINUX_VERSION[v2023.2] = "6.1.60%"
+XILINX_LINUX_VERSION[v2024.1] = "6.6.10%"
 PREFERRED_VERSION_linux-xlnx ?= "${@d.getVarFlag('XILINX_LINUX_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 
-# Mali needs to match the kernel version
-PREFERRED_VERSION_kernel-module-mali = "r9p0-01rel0-${XILINX_RELEASE_VERSION}"
-
-# DP kernel module
-KERNEL_MODULE_DP_VERSION[v2022.1] = "5.10.0+xilinx-v2022.1+git%"
-KERNEL_MODULE_DP_VERSION[v2022.2] = "5.10.0+xilinx-v2022.2+git%"
-KERNEL_MODULE_DP_VERSION[v2023.1] = "6.1.0+xilinx-v2023.1+git%"
-KERNEL_MODULE_DP_VERSION[v2023.2] = "6.1.0+xilinx-v2023.2+git%"
-KERNEL_MODULE_DP_VERSION[v2024.1] = "6.1.0+xilinx-v2024.1+git%"
-PREFERRED_VERSION_kernel-module-dp ?= "${@d.getVarFlag('KERNEL_MODULE_DP_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
-
-# HDMI kernel module
-KERNEL_MODULE_HDMI_VERSION[v2022.1] = "5.15.0+xilinx-v2022.1+git%"
-KERNEL_MODULE_HDMI_VERSION[v2022.2] = "5.15.19+xilinx-v2022.2+git%"
-KERNEL_MODULE_HDMI_VERSION[v2023.1] = "6.1+xilinx-v2023.1+git%"
-KERNEL_MODULE_HDMI_VERSION[v2023.2] = "6.1+xilinx-v2023.2+git%"
-KERNEL_MODULE_HDMI_VERSION[v2024.1] = "6.1+xilinx-v2024.1+git%"
-PREFERRED_VERSION_kernel-module-hdmi ?= "${@d.getVarFlag('KERNEL_MODULE_HDMI_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
-
-# VCU kernel module
-PREFERRED_VERSION_kernel-module-vcu = "1.0.0-xilinx-${XILINX_RELEASE_VERSION}+git%"
-
-# VDU kernel module
-PREFERRED_VERSION_kernel-module-vdu = "1.0.0-xilinx-${XILINX_RELEASE_VERSION}+git%"
-
 # XRT/ZOCL
 XRT_ZOCL_VERSION[v2022.1] = "202210.2.13.479"
 XRT_ZOCL_VERSION[v2022.2] = "202220.2.14.0"
@@ -112,7 +80,7 @@ XRT_ZOCL_VERSION[v2023.1] = "202310.2.15.0"
 XRT_ZOCL_VERSION[v2023.2] = "202320.2.16.0"
 XRT_ZOCL_VERSION[v2024.1] = "202410.2.17.0"
 PREFERRED_VERSION_xrt ?= "${@d.getVarFlag('XRT_ZOCL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
-PREFERRED_VERSION_zocl ?= "${@d.getVarFlag('XRT_ZOCL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
+PREFERRED_VERSION_kernel-module-zocl ?= "${@d.getVarFlag('XRT_ZOCL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 
 # AI-Engine
 AIEFAL_VERSION[v2022.1] = "1.4"