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

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

8 files changed, 14 insertions, 22 deletions

diff --git a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
index c732523c..1837da26 100644
--- a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
+++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
@@ -23,6 +23,10 @@ PREFERRED_PROVIDER_u-boot-tools ??= "u-boot-tools-xlnx"
 PREFERRED_PROVIDER_u-boot-tools-native ??= "u-boot-tools-xlnx-native"
 PREFERRED_PROVIDER_nativesdk-u-boot-tools ??= "nativesdk-u-boot-tools-xlnx"
 
+# Libmetal and OpenAMP Configuration
+PREFERRED_PROVIDER_libmetal ?= "libmetal-xlnx"
+PREFERRED_PROVIDER_open-amp ?= "open-amp-xlnx"
+
 do_image_wic[depends] += "${@' '.join('%s:do_deploy' % r for r in (d.getVar('WIC_DEPENDS') or "").split())}"
 
 UBOOT_SUFFIX ?= "bin"
diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper_git.bbappend b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper_git.bbappend
index 62a3b0f2..6e31d1f0 100644
--- a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper_git.bbappend
+++ b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper_git.bbappend
@@ -1,5 +1,5 @@
 SRC_URI = "git://github.com/devicetree-org/lopper.git;branch=v0.2024.x;protocol=https"
-SRCREV = "a85a86eba10c7cd0f8aa4c99aa647ae8bdd72d70"
+SRCREV = "9e880fa8bad815f01ca8ec4a3e141e5386f012fd"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/lopper:"
 
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc
index 0a813d69..33b302e9 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc
@@ -15,3 +15,9 @@ HAS_PLATFORM_INIT ?= " \
                 "
 
 DEPENDS += "bc-native dtc-native python3-setuptools-native gnutls-native"
+
+SRC_URI:append:microblaze = " file://microblaze-generic-top.h"
+
+do_configure:prepend:microblaze () {
+    install ${WORKDIR}/microblaze-generic-top.h ${S}/include/configs/
+}
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 08e625c2..b919b230 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 = "c0dbd5ec673441d8d8de4ac03a3b92c9512bfd6e"
+SRCREV = "12c2fe646e7e98ba98334c75e082cc10faf0413d"
 
 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 019e9de9..8f65469a 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 = "562194b7c36184701c8774d1a07da07deeae374b"
+SRCREV = "dcac89c7c78a556240e07ac3c6c568dd5be90ef3"
 SRCREV_meta = "5d0809d0d939c7738cb6e5391126c73fd0e4e865"
 
 KCONF_AUDIT_LEVEL="0"
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt.inc
index 89dc87cc..7c2e932c 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt.inc
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt.inc
@@ -3,7 +3,7 @@ BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '
 SRC_URI = "${REPO};${BRANCHARG};name=xrt"
 
 BRANCH= "master"
-SRCREV_xrt = "8426f5733c01018acbd8d12745bc9e5ffc4535e6"
+SRCREV_xrt = "f23d53edd42fea0f0acd08c194b4750ed77127e2"
 PV = "202320.2.17.0"
 
 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"
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt/disable_aie_profiling.patch b/meta-xilinx-core/recipes-xrt/xrt/xrt/disable_aie_profiling.patch
deleted file mode 100644
index f2f63470..00000000
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt/disable_aie_profiling.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/runtime_src/xdp/profile/plugin/CMakeLists.txt b/src/runtime_src/xdp/profile/plugin/CMakeLists.txt
-index 8ef7a2f..9b8baac 100644
---- a/src/runtime_src/xdp/profile/plugin/CMakeLists.txt
-+++ b/src/runtime_src/xdp/profile/plugin/CMakeLists.txt
-@@ -33,9 +33,9 @@ if (NOT WIN32)
- # =========================================================
- # The plugins to be built on Linux only
- # =========================================================
--add_subdirectory(aie_status)
--add_subdirectory(aie_profile)
--add_subdirectory(aie_trace)
-+#add_subdirectory(aie_status)
-+#add_subdirectory(aie_profile)
-+#add_subdirectory(aie_trace)
- add_subdirectory(device_offload/hw_emu)
- add_subdirectory(noc)
- add_subdirectory(power)
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb
index 439c47ec..5a617a5c 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb
@@ -4,7 +4,6 @@ DESCRIPTION = "Xilinx Runtime User Space Libraries and headers"
 require xrt.inc
 
 SRC_URI += "file://xrt-cstdint.patch;striplevel=2"
-SRC_URI += "file://disable_aie_profiling.patch;striplevel=2"
 
 LICENSE = "GPL-2.0-or-later & Apache-2.0 & MIT"
 LIC_FILES_CHKSUM = "file://../LICENSE;md5=de2c993ac479f02575bcbfb14ef9b485 \