Merge remote-tracking branch 'xilinx/rel-v2024.1' into master_2024.1

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

9 files changed, 9 insertions, 8 deletions

diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2024.inc b/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2024.inc
index 577ac963..c0c48f81 100644
--- a/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2024.inc
+++ b/meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2024.inc
@@ -3,7 +3,7 @@ SECTION	= "libs"
 REPO ?= "git://github.com/Xilinx/aie-rt.git;protocol=https"
 
 BRANCH ?= "xlnx_rel_v2024.1"
-SRCREV ?= "d864f8eb4c509393696cf564bee11086744efcdb"
+SRCREV ?= "60579564ad9d54608aa7f5fc19df1ec599eee707"
 
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM ?= "file://license.txt;md5=04a153cae61a8a606fc79dff49c2c897"
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2024.1.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2024.1.inc
index b4ac7998..c30c5666 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2024.1.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2024.1.inc
@@ -2,7 +2,7 @@ UBOOT_VERSION = "v2024.01"
 
 UBRANCH = "xlnx_rebase_v2024.01"
 
-SRCREV = "a64b554a4a7e0c540dd4fbb69bcf765a88d7359f"
+SRCREV = "8fc1a07a7c3e84fcd5bd945e1c931da25e1b0130"
 
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897"
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2024.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2024.1.bb
index 3008a572..a1e9095c 100644
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2024.1.bb
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2024.1.bb
@@ -1,7 +1,7 @@
 LINUX_VERSION = "6.6.10"
 YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=yocto-kmeta"
 KBRANCH="xlnx_rebase_v6.6_LTS"
-SRCREV = "73608e3d7f39dc2b44a1d3c135dec85bcb1b67f0"
+SRCREV = "7d3c0f27dc86aab8e1ddd1683691633e72f28174"
 SRCREV_meta = "5d0809d0d939c7738cb6e5391126c73fd0e4e865"
 
 KCONF_AUDIT_LEVEL="0"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2024.1.bb
index f474595c..3a6e3721 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2024.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2024.1.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Linux kernel module for Video Code Unit"
 DESCRIPTION = "Out-of-tree VCU decoder, encoder and common kernel modules provider for MPSoC EV devices"
 SECTION = "kernel/modules"
-LICENSE = "GPL-2.0-only"
+LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
 
 XILINX_VCU_VERSION = "1.0.0"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2024.1.bb
index 84f9cc2a..63936e2e 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2024.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2024.1.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Linux kernel module for Video Decode Unit"
 DESCRIPTION = "Out-of-tree VDU decoder common kernel modules"
 SECTION = "kernel/modules"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
 
 XILINX_VDU_VERSION = "1.0.0"
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilloader_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilloader_2024.1.bb
index 11b03c1b..4f01407e 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilloader_2024.1.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilloader_2024.1.bb
@@ -4,6 +4,6 @@ ESW_COMPONENT_SRC = "/lib/sw_services/xilloader/src/"
 ESW_COMPONENT_NAME = "libxilloader.a"
 
 #DEPENDS += "xilstandalone libxil xilpdi xilffs xilsecure xilpuf xilplmi"
-DEPENDS += "xilstandalone libxil xilpm xilpdi xilffs xilsecure xilpuf"
+DEPENDS += "xilstandalone libxil xilpm xilpdi xilffs xilsecure xilpuf xilsem"
 
 DEPENDS += "cframe"
diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
index d8f7ebfb..1307b044 100644
--- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
+++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
@@ -17,7 +17,7 @@ ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01"
 ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2"
 ESW_REV[2023.1] = "af784f742dad0ca6e69e05baf8de51152c396b9a"
 ESW_REV[2023.2] = "e847e1935dca630615e5f7dc694365a44b89699c"
-ESW_REV[2024.1] = "faf498ef6012b89134892af6644943bd3caa776d"
+ESW_REV[2024.1] = "54539e1accb6c616a1b67ef07b7d83d4097194b6"
 SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or 'INVALID'}"
 
 EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}"
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc
index 2faf7a4b..3417f375 100644
--- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc
@@ -24,4 +24,5 @@ EXTRA_OECONF:append:xilinx-standalone:armv8r = " \
 
 EXTRA_OECONF:append:xilinx-standalone:microblaze = " \
         --without-long-double-128 \
+        --disable-tm-clone-registry \
         "
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.18.inc b/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.18.inc
index 7c573f73..7551e8cd 100644
--- a/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.18.inc
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.18.inc
@@ -1,4 +1,4 @@
-SRCREV = "a4754372819eb69acb658fc013ad35c4d55bf9a5"
+SRCREV = "c4ff3360900b7428ca31de2425763acfe7ad9c21"
 XEN_URI = "git://github.com/Xilinx/xen.git;protocol=https"
 XEN_BRANCH = "xlnx_rebase_4.18"