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

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

13 files changed, 49 insertions, 11 deletions

diff --git a/.gitmodules b/.gitmodules
index 5e671383..104587f3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "gen-machine-conf"]
         path = meta-xilinx-core/gen-machine-conf
         url = https://github.com/Xilinx/gen-machine-conf.git
-        branch = xlnx_rel_v2023.2
+        branch = xlnx_rel_v2024.1
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2024.1.bb b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2024.1.bb
index bf779ff5..c1fda947 100644
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2024.1.bb
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2024.1.bb
@@ -1,5 +1,5 @@
 SRCBRANCH ?= "2024"
-SRCREV = "7d39410ad2172be9f339c4ce565ed765ddd8c5c8"
+SRCREV = "dbf0857389190f4c4cedfb77bd1f9bdd7ab404f3"
 BRANCH = "xlnx_rel_v2024.1"
 LIC_FILES_CHKSUM ?= "file://LICENSE.md;md5=ab88daf995c0bd0071c2e1e55f3d3505"
 PV = "${SRCBRANCH}+git${SRCPV}"
diff --git a/meta-xilinx-core/gen-machine-conf b/meta-xilinx-core/gen-machine-conf
-Subproject 911941fc094dc0073c2f01a2b94de3cc6e993fe
+Subproject e3968c5d6b1d02b2c1fa51de838f0757bca1c16
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 c0c48f81..23e3975e 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 ?= "60579564ad9d54608aa7f5fc19df1ec599eee707"
+SRCREV ?= "18e416bca8f2cb1de8956fa8cb8a5ae783f3c2ee"
 
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM ?= "file://license.txt;md5=04a153cae61a8a606fc79dff49c2c897"
diff --git a/meta-xilinx-core/recipes-bsp/bootgen/bootgen_2024.1.bb b/meta-xilinx-core/recipes-bsp/bootgen/bootgen_2024.1.bb
new file mode 100644
index 00000000..3c68f10d
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/bootgen/bootgen_2024.1.bb
@@ -0,0 +1,31 @@
+SUMMARY = "Building and installing bootgen"
+DESCRIPTION = "Building and installing bootgen, a Xilinx tool that lets you stitch binary files together and generate device boot images"
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d526b6d0807bf263b97da1da876f39b1"
+
+S = "${WORKDIR}/git"
+
+DEPENDS += "openssl"
+RDEPENDS:${PN} += "openssl"
+
+REPO ?= "git://github.com/Xilinx/bootgen.git;protocol=https"
+BRANCH = "xlnx_rel_v2024.1"
+SRCREV = "92e09bf37ea17d7b1f0e102a2548f27fb768651c"
+
+BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
+SRC_URI = "${REPO};${BRANCHARG}"
+
+EXTRA_OEMAKE += 'CROSS_COMPILER="${CXX}" -C ${S}'
+CXXFLAGS:append = " -std=c++0x"
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+do_install() {
+    install -d ${D}${bindir}
+    install -Dm 0755 ${S}/bootgen ${D}${bindir}
+}
+
+FILES:${PN} = "${bindir}/bootgen"
+
+BBCLASSEXTEND = "native nativesdk"
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 c30c5666..9b99a476 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 = "8fc1a07a7c3e84fcd5bd945e1c931da25e1b0130"
+SRCREV = "5b0014e7c094c87035b02756fc07b02816bee992"
 
 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 a1e9095c..71ac690e 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 = "7d3c0f27dc86aab8e1ddd1683691633e72f28174"
+SRCREV = "3af4295e00efdced3e8c6973606a7de55f6bf7dc"
 SRCREV_meta = "5d0809d0d939c7738cb6e5391126c73fd0e4e865"
 
 KCONF_AUDIT_LEVEL="0"
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2024.1.bb
index 3acbf3ef..88ddb885 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2024.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_2024.1.bb
@@ -13,7 +13,7 @@ REQUIRED_MACHINE_FEATURES = "vdu"
 
 BRANCH ?= "xlnx_rel_v2024.1"
 REPO   ?= "git://github.com/Xilinx/vdu-ctrl-sw.git;protocol=https"
-SRCREV ?= "7af131e0780d52ebc7bd6173bf1b99fec4dc522f"
+SRCREV ?= "fb8730a808b707bfb86d3d64881899214a951ff6"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.0.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.0.inc
index 9e38688d..09ef913a 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.0.inc
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt-202410.2.17.0.inc
@@ -2,8 +2,8 @@ REPO ?= "git://github.com/Xilinx/XRT.git;protocol=https"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG};name=xrt"
 
-BRANCH= "master"
-SRCREV_xrt = "baf88820fb3fc24dda4dc08c91ecbca2c76c7b0f"
+BRANCH= "2024.1"
+SRCREV_xrt = "11f9d2bc6fc61862105093e42cb62c04cf506e51"
 
 SRC_URI += "git://github.com/Xilinx/dma_ip_drivers.git;branch=master;name=dma_ip_drivers;destsuffix=git/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma;protocol=https"
 SRCREV_dma_ip_drivers = "9f02769a2eddde008158c96efa39d7edb6512578"
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_2024.1.bb
index b8dc3b33..b7e0784a 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_2024.1.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs_2024.1.bb
@@ -8,4 +8,6 @@ PACKAGECONFIG[use_mkfs]   ="-DXILFFS_use_mkfs=ON,-DXILFFS_use_mkfs=OFF,,"
 PACKAGECONFIG[read_only]  ="-DXILFFS_read_only=ON,-DXILFFS_read_only=OFF,,"
 PACKAGECONFIG[word_access]="-DXILFFS_word_access=ON,-DXILFFS_word_access=OFF,,"
 
+EXTRA_OECMAKE += "${@'-DXILFFS_num_logical_vol=10 -DXILFFS_enable_multi_partition=ON' if d.getVar('ESW_MACHINE') == 'psv_pmc_0' else ''}"
+
 DEPENDS += "xilstandalone libxil"
diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
index 1307b044..e9a2df8c 100644
--- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
+++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
@@ -9,7 +9,7 @@ ESW_BRANCH[2022.1] = "xlnx_rel_v2022.1_update"
 ESW_BRANCH[2022.2] = "xlnx_rel_v2022.2"
 ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1_update"
 ESW_BRANCH[2023.2] = "xlnx_rel_v2023.2_update"
-ESW_BRANCH[2024.1] = "xlnx_rel_v2024.1-next"
+ESW_BRANCH[2024.1] = "xlnx_rel_v2024.1"
 BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}"
 
 ESW_REV[git] = "${AUTOREV}"
@@ -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] = "54539e1accb6c616a1b67ef07b7d83d4097194b6"
+ESW_REV[2024.1] = "b5aeb49ea7dfc76dfd3f3de5fac335abab206ec8"
 SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or 'INVALID'}"
 
 EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}"
@@ -29,7 +29,7 @@ LIC_FILES_CHKSUM[xlnx_rel_v2022.1_update] = 'e62cb7a722c4430999e0a55a7234035d'
 LIC_FILES_CHKSUM[xlnx_rel_v2022.2]  = 'ce611484168a6000bd35df68fc4f4290'
 LIC_FILES_CHKSUM[xlnx_rel_v2023.1_update] = '3c310a3ee2197a4c92c6a0e2937c207c'
 LIC_FILES_CHKSUM[xlnx_rel_v2023.2_update] = '9fceecdbcad88698f265578f3d4cb26c'
-LIC_FILES_CHKSUM[xlnx_rel_v2024.1-next] = '443113d5aa8fd5facf31e9c5d25dc114'
+LIC_FILES_CHKSUM[xlnx_rel_v2024.1] = '443113d5aa8fd5facf31e9c5d25dc114'
 LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}"
 
 SRC_URI = "${EMBEDDEDSW_SRCURI}"
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend
index 3a7d1395..52360e2b 100644
--- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend
@@ -28,6 +28,7 @@ EXTRA_OECONF:append:xilinx-standalone:armv8r:class-target = " \
 
 EXTRA_OECONF:append:xilinx-standalone:microblaze:class-target = " \
         --without-long-double-128 \
+        --disable-tm-clone-registry \
         "
 
 # Changes local to gcc-runtime...
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend
index 861b3f9c..2d33f5a9 100644
--- a/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend
@@ -2,6 +2,10 @@ require gcc-configure-xilinx-standalone.inc
 
 COMPATIBLE_HOST = "${HOST_SYS}"
 
+EXTRA_OECONF:append:xilinx-standalone:microblaze:class-target = " \
+        --disable-tm-clone-registry \
+        "
+
 python do_multilib_install:xilinx-standalone:class-target () {
     pass
 }