1 files changed, 15 insertions, 4 deletions

diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf
index 2aa0a1a1..399011a7 100644
--- a/meta-xilinx-core/conf/layer.conf
+++ b/meta-xilinx-core/conf/layer.conf
@@ -22,7 +22,7 @@ xilinx-tools:${LAYERDIR}/dynamic-layers/meta-xilinx-tools/recipes-*/*/*.bb \
 xilinx-tools:${LAYERDIR}/dynamic-layers/meta-xilinx-tools/recipes-*/*/*.bbappend \
 "
 
-LAYERDEPENDS_xilinx = "core"
+LAYERDEPENDS_xilinx = "core meta-arm"
 LAYERRECOMMENDS_xilinx = "openembedded-layer"
 
 LAYERSERIES_COMPAT_xilinx = "scarthgap"
@@ -42,7 +42,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
   *->xserver-xorg \
 "
 
-XILINX_RELEASE_VERSION ??= "v2024.1"
+XILINX_RELEASE_VERSION ??= "v2024.2"
 
 BUILDCFG_VARS:append = " XILINX_RELEASE_VERSION"
 
@@ -55,13 +55,20 @@ XILINX_ATF_VERSION[v2022.2] = "2.6-xilinx-v2022.2%"
 XILINX_ATF_VERSION[v2023.1] = "2.8-xilinx-v2023.1%"
 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_ATF_VERSION[v2024.2] = "2.10-xilinx-v2024.2%"
+PREFERRED_VERSION_virtual/arm-trusted-firmware ?= "${@d.getVarFlag('XILINX_ATF_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
+
+# The name of the software has changed to match upstream ARM
+XILINX_ATF_PROVIDERS[v2024.2] = "trusted-firmware-a"
+PREFERRED_PROVIDER_virtual/arm-trusted-firmware = "${@d.getVarFlag('XILINX_ATF_PROVIDERS', d.getVar('XILINX_RELEASE_VERSION')) or 'arm-trusted-firmware'}"
+
 
 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%"
+XILINX_UBOOT_VERSION[v2024.2] = "1:2024.01-xilinx-v2024.2%"
 
 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'}"
@@ -71,6 +78,7 @@ 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%"
+XILINX_LINUX_VERSION[v2024.2] = "6.6.40%"
 PREFERRED_VERSION_linux-xlnx ?= "${@d.getVarFlag('XILINX_LINUX_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 
 # XRT/ZOCL
@@ -78,7 +86,8 @@ XRT_ZOCL_VERSION[v2022.1] = "202210.2.13.479"
 XRT_ZOCL_VERSION[v2022.2] = "202220.2.14.0"
 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"
+XRT_ZOCL_VERSION[v2024.1] = "202410.2.17.319"
+XRT_ZOCL_VERSION[v2024.2] = "202420.2.18.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'}"
 
@@ -88,6 +97,7 @@ AIEFAL_VERSION[v2022.2] = "1.4"
 AIEFAL_VERSION[v2023.1] = "1.5"
 AIEFAL_VERSION[v2023.2] = "1.5"
 AIEFAL_VERSION[v2024.1] = "1.6"
+AIEFAL_VERSION[v2024.2] = "1.7"
 PREFERRED_VERSION_aiefal ?= "${@d.getVarFlag('AIEFAL_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 
 AI_ENGINE_DRIVER_VERSION[v2022.1] = "3.3"
@@ -95,6 +105,7 @@ AI_ENGINE_DRIVER_VERSION[v2022.2] = "3.3"
 AI_ENGINE_DRIVER_VERSION[v2023.1] = "3.4"
 AI_ENGINE_DRIVER_VERSION[v2023.2] = "3.4"
 AI_ENGINE_DRIVER_VERSION[v2024.1] = "3.5"
+AI_ENGINE_DRIVER_VERSION[v2024.2] = "3.6"
 PREFERRED_VERSION_ai-engine-driver ?= "${@d.getVarFlag('AI_ENGINE_DRIVER_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 
 # Add support to eSDK for gen-machine-conf if it exists