Merge remote-tracking branch 'github/rel-v2023.2' into HEAD

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

11 files changed, 135 insertions, 8 deletions

diff --git a/meta-xilinx-core/recipes-apps/image-update/image-update_1.0.bb b/meta-xilinx-core/recipes-apps/image-update/image-update_1.1.bb
index 8a707df4..f053a9bd 100644
--- a/meta-xilinx-core/recipes-apps/image-update/image-update_1.0.bb
+++ b/meta-xilinx-core/recipes-apps/image-update/image-update_1.1.bb
@@ -6,9 +6,9 @@ SUMMARY = "Image update is used to update alternate image on compatible firmware
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSES/MIT;md5=2ac09a7a37dd6ee0ba23ce497d57d09b"
 
-BRANCH = "xlnx_rel_v2023.2"
+BRANCH = "master"
 SRC_URI = "git://github.com/Xilinx/linux-image_update.git;branch=${BRANCH};protocol=https"
-SRCREV = "4f0b7b1b20933ddc454124fc3472f1b8894ddf08"
+SRCREV = "a68308f329578d3585fd335071a9184aa7f46d2e"
 
 RDEPENDS:${PN} += "freeipmi"
 
diff --git a/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-header.bb b/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-header.bb
new file mode 100644
index 00000000..98eebc3e
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-header.bb
@@ -0,0 +1,54 @@
+DESCRIPTION = "Bootbin version string file"
+SUMMARY = "The BIF file for bootbin requires a version file in a specific format"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+
+COMPATIBLE_MACHINE = "^$"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+BOOTBIN_VER_MAIN ?= ""
+
+BOOTBIN_VER_SUFFIX ?= "${@(d.getVar('XILINX_VER_BUILD') or '')[:8] if d.getVar('XILINX_VER_UPDATE') != 'release' and not d.getVar('XILINX_VER_UPDATE').startswith('update') else ''}"
+BOOTBIN_VER_FILE = "bootbin-version-header.txt"
+BOOTBIN_VER_MAX_LEN = "36"
+
+BOOTBIN_MANIFEST_FILE ?= "bootbin-version-header.manifest"
+
+inherit deploy image-artifact-names
+
+python do_configure() {
+    if d.getVar("BOOTBIN_VER_SUFFIX"):
+        version = version + "-" + d.getVar("BOOTBIN_VER_SUFFIX")
+
+    if len(version) > int(d.getVar("BOOTBIN_VER_MAX_LEN")):
+        bb.error("version string too long")
+
+    with open(d.expand("${B}/${BOOTBIN_VER_FILE}"), "w") as f:
+        f.write(version.encode("utf-8").hex())
+
+    with open(d.expand("${B}/${BOOTBIN_MANIFEST_FILE}"), "w") as f:
+        f.write("* %s\n" % d.getVar('PN'))
+        f.write("VERSION: %s\n" % version)
+        f.write("PV: %s\n" % d.getVar('PV'))
+        f.write("XILINX_VER_MAIN: %s\n" % d.getVar('XILINX_VER_MAIN'))
+        f.write("XILINX_VER_UPDATE: %s\n" % d.getVar('XILINX_VER_UPDATE'))
+        f.write("XILINX_VER_BUILD: %s\n\n" % d.getVar('XILINX_VER_BUILD'))
+}
+
+do_install() {
+    install -d ${D}/boot
+    install -m 0644 ${B}/${BOOTBIN_VER_FILE} ${D}/boot/
+}
+
+do_deploy() {
+    install -m 0644 ${B}/${BOOTBIN_VER_FILE} ${DEPLOYDIR}/${IMAGE_NAME}.txt
+    ln -s ${IMAGE_NAME}.txt ${DEPLOYDIR}/${IMAGE_LINK_NAME}.txt
+    install -m 0644 ${B}/${BOOTBIN_MANIFEST_FILE} ${DEPLOYDIR}/${IMAGE_NAME}.manifest
+    ln -s ${IMAGE_NAME}.manifest ${DEPLOYDIR}/${IMAGE_LINK_NAME}.manifest
+}
+
+addtask deploy after do_compile
+
+SYSROOT_DIRS += "/boot"
+FILES:${PN} += "/boot/${BOOTBIN_VER_FILE}"
diff --git a/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-string.bb b/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-string.bb
new file mode 100644
index 00000000..af30a17d
--- /dev/null
+++ b/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-string.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "Bootbin version file - text format"
+SUMMARY = "The BIF file for bootbin requires a version file in a text format"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+
+COMPATIBLE_MACHINE = "^$"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+BOOTBIN_VER_MAIN ?= ""
+BOOTBIN_VER_SUFFIX ?= "${@(d.getVar('XILINX_VER_BUILD') or '')[:8] if d.getVar('XILINX_VER_UPDATE') != 'release' and not d.getVar('XILINX_VER_UPDATE').startswith('update') else ''}"
+BOOTBIN_VER_FILE = "bootbin-version-string.txt"
+
+#BOOTBIN_MANIFEST_FILE ?= "bootbin-version-header.manifest"
+
+inherit deploy image-artifact-names
+
+python do_configure() {
+    if d.getVar("BOOTBIN_VER_SUFFIX"):
+        version = version + "-" + d.getVar("BOOTBIN_VER_SUFFIX")
+    with open(d.expand("${B}/${BOOTBIN_VER_FILE}"), "w") as f:
+        f.write(version)
+}
+
+do_deploy() {
+     install -m 0644 ${B}/${BOOTBIN_VER_FILE} ${DEPLOYDIR}/${IMAGE_NAME}.txt
+     ln -s ${IMAGE_NAME}.txt ${DEPLOYDIR}/${IMAGE_LINK_NAME}.txt
+#     install -m 0644 ${B}/${BOOTBIN_MANIFEST_FILE} ${DEPLOYDIR}/${IMAGE_NAME}.manifest
+#     ln -s ${IMAGE_NAME}.manifest ${DEPLOYDIR}/${IMAGE_LINK_NAME}.manifest
+}
+
+addtask deploy after do_compile
diff --git a/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-versal.inc b/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-versal.inc
index fff2c7a3..cd6adcef 100644
--- a/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-versal.inc
+++ b/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-versal.inc
@@ -4,6 +4,9 @@ BOOTGEN_EXTRA_ARGS += "-dump bh"
 # specify BIF common attribute for FSBL
 BIF_COMMON_ATTR ?= ""
 
+# specify BIF optional attributes
+BIF_OPTIONAL_DATA ?= ""
+
 #specify BIF partition attributes required for BOOT.bin
 BIF_FSBL_ATTR       ??= "base-pdi plmfw psmfw"
 BIF_ATF_ATTR        ??= "arm-trusted-firmware"
diff --git a/meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb b/meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
index 4c8bfa0e..e0e1e506 100644
--- a/meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
@@ -125,6 +125,10 @@ python do_configure() {
         biffd.write("the_ROM_image:\n")
         biffd.write("{\n")
 
+        if d.getVar("BIF_OPTIONAL_DATA"):
+            opt_data = d.getVar("BIF_OPTIONAL_DATA") or ""
+            biffd.write("\toptionaldata { %s }\n" % opt_data)
+
         arch = d.getVar("SOC_FAMILY")
         bifattr = (d.getVar("BIF_COMMON_ATTR") or "").split()
         if bifattr:
diff --git a/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb b/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
index 8d7211f5..26a10677 100644
--- a/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
+++ b/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
@@ -130,7 +130,7 @@ devicetree_do_install:append() {
         fi
         if [ -e "${D}/boot/devicetree/${DTB_FILE_NAME}" ]; then
             # We need the output to be system.dtb for WIC setup to match XSCT flow
-            ln -sf devicetree/${DTB_FILE_NAME} ${D}/boot/system.dtb
+            cp ${D}/boot/devicetree/${DTB_FILE_NAME} ${D}/boot/system.dtb
         else
             bberror "Expected filename ${DTB_FILE_NAME} doesn't exist in ${DEPLOYDIR}/devicetree"
         fi
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..a7b1c9dc 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
@@ -2,7 +2,7 @@ UBOOT_VERSION = "v2023.01"
 
 UBRANCH = "xlnx_rebase_v2023.01"
 
-SRCREV = "4da834fc7644b4124f7417e0e2789c7afcb40352"
+SRCREV = "2b54ad6f1d278c419b927d10db2edf323d844578"
 
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897"
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb
index 6410fc25..ac391c3c 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb
@@ -262,10 +262,11 @@ do_compile() {
 do_install() {
     install -d ${D}/boot
     install -m 0644 boot.scr ${D}/boot/${UBOOTSCR_BASE_NAME}.scr
-    ln -sf ${UBOOTSCR_BASE_NAME}.scr ${D}/boot/boot.scr
+    install -m 0644 boot.scr ${D}/boot/
     install -d ${D}/boot/pxeboot/${UBOOTPXE_CONFIG_NAME}
     install -m 0644 pxeboot.pxe ${D}/boot/pxeboot/${UBOOTPXE_CONFIG_NAME}/default
-    ln -sf pxeboot/${UBOOTPXE_CONFIG_NAME} ${D}/boot/${UBOOTPXE_CONFIG}
+    install -d ${D}/boot/${UBOOTPXE_CONFIG}/
+    install -m 0644 pxeboot.pxe ${D}/boot/${UBOOTPXE_CONFIG}/default
 }
 
 FILES:${PN} = "/boot/*"
@@ -273,10 +274,11 @@ FILES:${PN} = "/boot/*"
 do_deploy() {
     install -d ${DEPLOYDIR}
     install -m 0644 boot.scr ${DEPLOYDIR}/${UBOOTSCR_BASE_NAME}.scr
-    ln -sf ${UBOOTSCR_BASE_NAME}.scr ${DEPLOYDIR}/boot.scr
+    install -m 0644 boot.scr ${DEPLOYDIR}/
     install -d ${DEPLOYDIR}/pxeboot/${UBOOTPXE_CONFIG_NAME}
     install -m 0644 pxeboot.pxe ${DEPLOYDIR}/pxeboot/${UBOOTPXE_CONFIG_NAME}/default
-    ln -sf pxeboot/${UBOOTPXE_CONFIG_NAME} ${DEPLOYDIR}/${UBOOTPXE_CONFIG}
+    install -d ${DEPLOYDIR}/${UBOOTPXE_CONFIG}/
+    install -m 0644 pxeboot.pxe ${DEPLOYDIR}/${UBOOTPXE_CONFIG}/default
 }
 
 addtask do_deploy after do_compile before do_build
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.cfg b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.cfg
new file mode 100644
index 00000000..a5b23e3f
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.cfg
@@ -0,0 +1 @@
+CONFIG_VERSAL_SYSMON_I2C=y
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.scc b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.scc
new file mode 100644
index 00000000..c1830956
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.scc
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: MIT
+kconf hardware versal-sysmon.cfg
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_git.bb b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_git.bb
new file mode 100644
index 00000000..e0edbb7b
--- /dev/null
+++ b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_git.bb
@@ -0,0 +1,29 @@
+SUMMARY  = "Xilinx Runtime(XRT) - minimal native build for xclbinutil"
+DESCRIPTION = "Native build of xclbinutil using XRT codebase"
+
+require xrt.inc
+
+FILESEXTRAPATHS:append := ":${THISDIR}/xrt"
+
+LICENSE = "GPL-2.0-or-later & Apache-2.0 & MIT"
+LIC_FILES_CHKSUM = " \
+    file://../LICENSE;md5=de2c993ac479f02575bcbfb14ef9b485 \
+    file://runtime_src/core/edge/drm/zocl/LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8 \
+    file://runtime_src/core/pcie/driver/linux/xocl/LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://runtime_src/core/pcie/linux/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://runtime_src/core/tools/xbutil2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://runtime_src/core/common/elf/LICENSE.txt;md5=b996e8b74af169e7e72e22d9e7d05b06 \
+"
+
+S = "${WORKDIR}/git/src"
+
+inherit cmake pkgconfig native
+
+DEPENDS = "libdrm-native ocl-icd-native boost-native rapidjson-native protobuf-native python3-pybind11-native systemtap-native"
+
+EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMANDS=ON"
+
+do_install() {
+    install -d ${D}${bindir}
+    install -Dm 0755 ${WORKDIR}/build/runtime_src/tools/xclbinutil/xclbinutil ${D}${bindir}
+}