Merge remote-tracking branch 'origin/kirkstone-next' into master-next

Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>

2 files changed, 3 insertions, 3 deletions

diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb
index 3beb61eb..884422cc 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb
@@ -27,7 +27,7 @@ EXTRA_OECMAKE += " \
 PACKAGE_ARCH:versal-ai-core = "${SOC_VARIANT_ARCH}"
 EXTRA_OECMAKE:append:versal-ai-core = " -DXRT_AIE_BUILD=true"
 TARGET_CXXFLAGS:append:versal-ai-core = " -DXRT_ENABLE_AIE"
-DEPENDS:append:versal-ai-core = " libmetal libxaiengine aiefal"
+DEPENDS:append:versal-ai-core = " libmetal-xlnx libxaiengine aiefal"
 RDEPENDS:${PN}:append:versal-ai-core = " libxaiengine aiefal"
 EXTRA_OECMAKE:append:versal = " -DXRT_LIBDFX=true"
 EXTRA_OECMAKE:append:zynqmp = " -DXRT_LIBDFX=true"
diff --git a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
index bf1698a3..57fbf956 100644
--- a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
+++ b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
@@ -34,8 +34,8 @@ VIRTUAL-RUNTIME_init_manager:xilinx-standalone = ""
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"
 
-PREFERRED_VERSION_libmetal = "${@'standalone' if 'xilinx-standalone-exp' in d.getVar('BBFILE_COLLECTIONS').split() else ''}"
-PREFERRED_VERSION_open-amp = "${@'standalone' if 'xilinx-standalone-exp' in d.getVar('BBFILE_COLLECTIONS').split() else ''}"
+PREFERRED_VERSION_libmetal-xlnx = "${@'standalone' if 'xilinx-standalone-exp' in d.getVar('BBFILE_COLLECTIONS').split() else ''}"
+PREFERRED_VERSION_open-amp-xlnx = "${@'standalone' if 'xilinx-standalone-exp' in d.getVar('BBFILE_COLLECTIONS').split() else ''}"
 
 # Hold this until it gets merged in core, we need libc.a and libgloss.a for cross-canadian
 LIBC_DEPENDENCIES:append = " newlib-staticdev libgloss-staticdev"