From 79335c2a8a9a6cfef521a3bddb24865def036050 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 25 Jan 2024 12:21:15 -0700 Subject: linux-xlnx_2023.2: Update to more recent LTS version Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/layer.conf | 2 +- meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.2.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index 5441fd96..d38fd334 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -64,7 +64,7 @@ PREFERRED_VERSION_u-boot-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getV PREFERRED_VERSION_u-boot-tools-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" XILINX_LINUX_VERSION[v2023.1] = "6.1.5-xilinx-v2023.1%" -XILINX_LINUX_VERSION[v2023.2] = "6.1.30-xilinx-v2023.2%" +XILINX_LINUX_VERSION[v2023.2] = "6.1.60-xilinx-v2023.2%" PREFERRED_VERSION_linux-xlnx ?= "${@d.getVarFlag('XILINX_LINUX_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" # Add support to eSDK for gen-machine-conf if it exists diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.2.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.2.bb index 8842cb10..ec5827e6 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.2.bb +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.2.bb @@ -1,7 +1,7 @@ -LINUX_VERSION = "6.1.30" +LINUX_VERSION = "6.1.60" YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=yocto-kmeta" KBRANCH="xlnx_rebase_v6.1_LTS" -SRCREV = "a19da02cf5b44420ec6afb1eef348c21d9e8cda2" +SRCREV = "9c55be2d8a90a240912c9b85814ac962c86b382b" SRCREV_meta = "185bcfcbe480c742247d9117011794c69682914f" KCONF_AUDIT_LEVEL="0" -- cgit v1.2.3-54-g00ecf From 57b22cc33a24b32c4f3cef364378c5216d2fda87 Mon Sep 17 00:00:00 2001 From: Sharath Kumar Dasari Date: Fri, 26 Jan 2024 23:56:03 +0530 Subject: image-update: semantic version update Last SRCREV update added support for kv260 rev2 which we are now tagging, releasing for canonical, hence incrementing the version to 1.1 Signed-off-by: Sharath Kumar Dasari Signed-off-by: Mark Hatle --- .../recipes-apps/image-update/image-update_1.0.bb | 28 ---------------------- .../recipes-apps/image-update/image-update_1.1.bb | 28 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 meta-xilinx-core/recipes-apps/image-update/image-update_1.0.bb create mode 100644 meta-xilinx-core/recipes-apps/image-update/image-update_1.1.bb 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.0.bb deleted file mode 100644 index 8a707df4..00000000 --- a/meta-xilinx-core/recipes-apps/image-update/image-update_1.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "Image update is used to update alternate images on compatible firmware." -SUMMARY = "Image update is used to update alternate image on compatible firmware. \ - If the current image is ImageA, ImageB will get updated and vice versa. \ - Usage: image_update " - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSES/MIT;md5=2ac09a7a37dd6ee0ba23ce497d57d09b" - -BRANCH = "xlnx_rel_v2023.2" -SRC_URI = "git://github.com/Xilinx/linux-image_update.git;branch=${BRANCH};protocol=https" -SRCREV = "4f0b7b1b20933ddc454124fc3472f1b8894ddf08" - -RDEPENDS:${PN} += "freeipmi" - -S = "${WORKDIR}/git" - -COMPATIBLE_MACHINE = "^$" -COMPATIBLE_MACHINE:zynqmp = "zynqmp" - -PACKAGE_ARCH:zynqmp = "${SOC_FAMILY_ARCH}" - -# Force the make system to use the flags we want! -EXTRA_OEMAKE = 'CC="${CC} ${TARGET_CFLAGS} ${TARGET_LDFLAGS}" all' - -do_install () { - install -d ${D}${bindir} - install -m 0755 ${S}/image_update ${D}${bindir}/ -} diff --git a/meta-xilinx-core/recipes-apps/image-update/image-update_1.1.bb b/meta-xilinx-core/recipes-apps/image-update/image-update_1.1.bb new file mode 100644 index 00000000..8a707df4 --- /dev/null +++ b/meta-xilinx-core/recipes-apps/image-update/image-update_1.1.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "Image update is used to update alternate images on compatible firmware." +SUMMARY = "Image update is used to update alternate image on compatible firmware. \ + If the current image is ImageA, ImageB will get updated and vice versa. \ + Usage: image_update " + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSES/MIT;md5=2ac09a7a37dd6ee0ba23ce497d57d09b" + +BRANCH = "xlnx_rel_v2023.2" +SRC_URI = "git://github.com/Xilinx/linux-image_update.git;branch=${BRANCH};protocol=https" +SRCREV = "4f0b7b1b20933ddc454124fc3472f1b8894ddf08" + +RDEPENDS:${PN} += "freeipmi" + +S = "${WORKDIR}/git" + +COMPATIBLE_MACHINE = "^$" +COMPATIBLE_MACHINE:zynqmp = "zynqmp" + +PACKAGE_ARCH:zynqmp = "${SOC_FAMILY_ARCH}" + +# Force the make system to use the flags we want! +EXTRA_OEMAKE = 'CC="${CC} ${TARGET_CFLAGS} ${TARGET_LDFLAGS}" all' + +do_install () { + install -d ${D}${bindir} + install -m 0755 ${S}/image_update ${D}${bindir}/ +} -- cgit v1.2.3-54-g00ecf From fe1fee9a45076aab2e39e38b5705d1ad0aa06de5 Mon Sep 17 00:00:00 2001 From: John Toomey Date: Mon, 29 Jan 2024 13:41:46 +0000 Subject: bootbin-version-header: Move recipe from meta-kria Signed-off-by: John Toomey Signed-off-by: Mark Hatle --- .../recipes-bsp/bootbin/bootbin-version-header.bb | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-header.bb 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}" -- cgit v1.2.3-54-g00ecf From 362eeb56e99754b9082f62187d39dc7ea7ad1a19 Mon Sep 17 00:00:00 2001 From: Jonathan Stroud Date: Mon, 12 Feb 2024 11:41:20 -0700 Subject: Add a kernel config file to enable CONFIG_VERSAL_SYSMON_I2C Signed-off-by: Jonathan Stroud Signed-off-by: Mark Hatle --- .../linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.cfg | 1 + .../linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.scc | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.cfg create mode 100644 meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/versal-sysmon/versal-sysmon.scc 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 -- cgit v1.2.3-54-g00ecf From 63a77a8627b431dbaf014258ce87aa9ed571b07c Mon Sep 17 00:00:00 2001 From: Sharath Kumar Dasari Date: Tue, 13 Feb 2024 10:37:10 +0530 Subject: xlnx-embeddedsw: Update 2023.2 branch to xlnx_rel_v2023.2_update System controller SC_update6 candidate release image is 2023.2 yocto based image which needs changes backported from ESW master to xlnx_rel_v2023.2_update branch Signed-off-by: Sharath Kumar Dasari Signed-off-by: Mark Hatle --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index dc69a432..31f21a2a 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -4,11 +4,11 @@ ESW_VER ?= "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or 'master' REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1_update" -ESW_BRANCH[2023.2] = "xlnx_rel_v2023.2" +ESW_BRANCH[2023.2] = "xlnx_rel_v2023.2_update" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2023.1] = "af784f742dad0ca6e69e05baf8de51152c396b9a" -ESW_REV[2023.2] = "c9a0ee31b2a14cbcfcb56ca369037319b4ad4847" +ESW_REV[2023.2] = "73f0904e41cc109f18bb19a5329d0e5a66af2434" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" @@ -16,7 +16,7 @@ EMBEDDEDSW_SRCURI ?= "${REPO};${EMBEDDEDSW_BRANCHARG}" LICENSE = "MIT" LIC_FILES_CHKSUM[xlnx_rel_v2023.1_update] = '3c310a3ee2197a4c92c6a0e2937c207c' -LIC_FILES_CHKSUM[xlnx_rel_v2023.2] = '9fceecdbcad88698f265578f3d4cb26c' +LIC_FILES_CHKSUM[xlnx_rel_v2023.2_update] = '9fceecdbcad88698f265578f3d4cb26c' LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}" SRC_URI = "${EMBEDDEDSW_SRCURI}" -- cgit v1.2.3-54-g00ecf From 83a5f29420bf7c2cf627ebfdd39b17aa73c8548d Mon Sep 17 00:00:00 2001 From: Sharath Kumar Dasari Date: Tue, 13 Feb 2024 10:51:24 +0530 Subject: linux-image_update: Update xlnx_rel_v2023.2 branch to master Updated branch to master which has changes to support both boards SC/Kria-SOM Signed-off-by: Sharath Kumar Dasari Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-apps/image-update/image-update_1.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-xilinx-core/recipes-apps/image-update/image-update_1.1.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.1.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" -- cgit v1.2.3-54-g00ecf From 49e14580b9942aeb45b6d046b9379e51c090f72d Mon Sep 17 00:00:00 2001 From: John Toomey Date: Thu, 14 Mar 2024 11:12:04 +0000 Subject: xclbinutil-native: Add minimal recipe based on XRT Add a minimal xclbinutil recipe based on the existing XRT recipe Signed-off-by: John Toomey Signed-off-by: Mark Hatle --- .../recipes-xrt/xrt/xclbinutil-native_git.bb | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_git.bb 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} +} -- cgit v1.2.3-54-g00ecf From c73652b9f1b46ded3b672c022de0a79e306fdc25 Mon Sep 17 00:00:00 2001 From: Manikanta Guntupalli Date: Fri, 15 Mar 2024 17:23:06 +0530 Subject: u-boot-xlnx : Update SRCREV arm64: zynqmp: Add resets and assigned-clock-rates properties for KD240 Signed-off-by: Manikanta Guntupalli Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" -- cgit v1.2.3-54-g00ecf From 03d5b1500ee95320bfacc785ce832c04b3435d3d Mon Sep 17 00:00:00 2001 From: Sharath Kumar Dasari Date: Mon, 18 Mar 2024 13:32:52 +0530 Subject: xlnx-embeddedsw: Update SRCREV for xlnx_rel_v2023.2_update branch Update SRCREV for xlnx_rel_v2023.2_update branch to pull in the latest changes for image selector app Signed-off-by: Sharath Kumar Dasari Signed-off-by: Mark Hatle --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 31f21a2a..32005d97 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -8,7 +8,7 @@ ESW_BRANCH[2023.2] = "xlnx_rel_v2023.2_update" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2023.1] = "af784f742dad0ca6e69e05baf8de51152c396b9a" -ESW_REV[2023.2] = "73f0904e41cc109f18bb19a5329d0e5a66af2434" +ESW_REV[2023.2] = "e847e1935dca630615e5f7dc694365a44b89699c" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf From 6ddde9a20775549f1434cba6006f84db1a223cb4 Mon Sep 17 00:00:00 2001 From: John Toomey Date: Thu, 21 Mar 2024 14:31:31 +0000 Subject: device-tree: Replace symlink with cp It is not currently possible to create symlinks in the /boot partition due to the use of the vfat filesystem and this causes an issue when trying to update the dtb using rpm packages which contain a symlink. Work around the issue by copying the dtb file to the symlink location. Signed-off-by: John Toomey Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3-54-g00ecf From 3048f2525996e582e00d8091f6a31c2088cee513 Mon Sep 17 00:00:00 2001 From: Jonathan Stroud Date: Fri, 22 Mar 2024 17:04:46 -0600 Subject: Change u-boot-xlnx-scr to use copies instead of symlinks symlinks don't work on the /boot FAT partition, so change to copy Signed-off-by: Jonathan Stroud Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 -- cgit v1.2.3-54-g00ecf From 4f542f6e2b1fd110c0766fd5067ac5158b14623c Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 29 Mar 2024 13:23:12 -0600 Subject: microblaze: binutils: Fix objdump/disassembly Signed-off-by: Mark Hatle (cherry picked from commit f4a0582919c0fead055615e63283b9f2df80bf95) Signed-off-by: Mark Hatle --- .../binutils/binutils-microblaze.inc | 2 ++ .../0035-Fix-for-objdump-issue-for-mb32-el.patch | 37 ++++++++++++++++++++++ ...0036-Fix-for-missing-instructions-in-dump.patch | 34 ++++++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 meta-microblaze/recipes-devtools/binutils/binutils/0035-Fix-for-objdump-issue-for-mb32-el.patch create mode 100644 meta-microblaze/recipes-devtools/binutils/binutils/0036-Fix-for-missing-instructions-in-dump.patch diff --git a/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc b/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc index 5e85eedc..191d69ef 100644 --- a/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc +++ b/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc @@ -35,6 +35,8 @@ SRC_URI:append = " \ file://0032-Patch-MicroBlaze-Double-free-with-ld-no-keep-memory.patch \ file://0033-Patch-MB-MB-binutils-Upstream-port-issues.patch \ file://0034-Patch-MicroBlaze-By-default-the-linker-will-generate.patch \ + file://0035-Fix-for-objdump-issue-for-mb32-el.patch \ + file://0036-Fix-for-missing-instructions-in-dump.patch \ " LDGOLD_ALTS:microblaze = "" diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0035-Fix-for-objdump-issue-for-mb32-el.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0035-Fix-for-objdump-issue-for-mb32-el.patch new file mode 100644 index 00000000..b63d368a --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils/0035-Fix-for-objdump-issue-for-mb32-el.patch @@ -0,0 +1,37 @@ +From f070f81107d4b1e497207c1668f079dabb0b4417 Mon Sep 17 00:00:00 2001 +From: Aayush Misra +Date: Mon, 24 Jul 2023 21:49:14 +0530 +Subject: [PATCH 35/36] Fix for objdump issue for mb32-el + +--- + opcodes/microblaze-dis.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/opcodes/microblaze-dis.c b/opcodes/microblaze-dis.c +index b76a5935a34..237a6081377 100644 +--- a/opcodes/microblaze-dis.c ++++ b/opcodes/microblaze-dis.c +@@ -36,7 +36,7 @@ + #define get_int_field_imml(instr) ((instr & IMML_MASK) >> IMM_LOW) + #define get_int_field_r1(instr) ((instr & RA_MASK) >> RA_LOW) + +-#define NUM_STRBUFS 3 ++#define NUM_STRBUFS 4 + #define STRBUF_SIZE 25 + + struct string_buf +@@ -466,8 +466,9 @@ print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info) + case INST_TYPE_NONE: + break; + case INST_TYPE_RD_IMML: +- print_func (stream, "\t%s, %s", get_field_rd (&buf, inst), get_field_imm16 (&buf, inst)); +- break; ++ if(info->insn_type != dis_noninsn) ++ print_func (stream, "\t%s, %s", get_field_rd (&buf, inst), get_field_imm16 (&buf, inst)); ++ break; + /* For bit field insns. */ + case INST_TYPE_RD_R1_IMMW_IMMS: + print_func (stream, "\t%s, %s, %s, %s", get_field_rd (&buf, inst),get_field_r1(&buf, inst),get_field_immw (&buf, inst), get_field_imms (&buf, inst)); +-- +2.34.1 + diff --git a/meta-microblaze/recipes-devtools/binutils/binutils/0036-Fix-for-missing-instructions-in-dump.patch b/meta-microblaze/recipes-devtools/binutils/binutils/0036-Fix-for-missing-instructions-in-dump.patch new file mode 100644 index 00000000..e48dfe84 --- /dev/null +++ b/meta-microblaze/recipes-devtools/binutils/binutils/0036-Fix-for-missing-instructions-in-dump.patch @@ -0,0 +1,34 @@ +From 834cc7ca420d3fb783fb813b336e76960eb5b28e Mon Sep 17 00:00:00 2001 +From: Aayush Misra +Date: Thu, 28 Mar 2024 16:33:40 +0530 +Subject: [PATCH 36/36] Fix for missing instructions in dump + +--- + opcodes/microblaze-dis.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/opcodes/microblaze-dis.c b/opcodes/microblaze-dis.c +index 237a6081377..a83e00e282b 100644 +--- a/opcodes/microblaze-dis.c ++++ b/opcodes/microblaze-dis.c +@@ -266,7 +266,7 @@ print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info) + + inst = read_insn_microblaze (memaddr, info, &op); + if (inst == 0) +- return -1; ++ return 4; + + if (prev_insn_vma == curr_insn_vma) + { +@@ -274,7 +274,7 @@ print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info) + { + prev_inst = read_insn_microblaze (prev_insn_addr, info, &pop); + if (prev_inst == 0) +- return -1; ++ return 4; + if (pop->instr == imm) + { + immval = (get_int_field_imm (prev_inst) << 16) & 0xffff0000; +-- +2.34.1 + -- cgit v1.2.3-54-g00ecf From 4465bd1a1ce21948c5ebc3af936cddc22870c6b3 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 29 Mar 2024 13:23:43 -0600 Subject: microblaze: gdb: Fix crash on startup Signed-off-by: Mark Hatle (cherry picked from commit 9fc4fc9e03f25ddcc60629b83db7c5b855046229) Signed-off-by: Mark Hatle --- .../recipes-devtools/gdb/gdb-microblaze.inc | 1 + ...b-gdserver-Fix-ABI-settings-for-gdbserver.patch | 33 ++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 meta-microblaze/recipes-devtools/gdb/gdb/0009-gdb-gdserver-Fix-ABI-settings-for-gdbserver.patch diff --git a/meta-microblaze/recipes-devtools/gdb/gdb-microblaze.inc b/meta-microblaze/recipes-devtools/gdb/gdb-microblaze.inc index 5eae0577..d3618229 100644 --- a/meta-microblaze/recipes-devtools/gdb/gdb-microblaze.inc +++ b/meta-microblaze/recipes-devtools/gdb/gdb-microblaze.inc @@ -13,4 +13,5 @@ SRC_URI:append:microblaze = " \ file://0006-Patch-MicroBlaze-these-changes-will-make-64-bit-vect.patch \ file://0007-Patch-MicroBlaze-Added-m64-abi-for-64-bit-target-des.patch \ file://0008-Patch-MicroBlaze.patch \ + file://0009-gdb-gdserver-Fix-ABI-settings-for-gdbserver.patch \ " diff --git a/meta-microblaze/recipes-devtools/gdb/gdb/0009-gdb-gdserver-Fix-ABI-settings-for-gdbserver.patch b/meta-microblaze/recipes-devtools/gdb/gdb/0009-gdb-gdserver-Fix-ABI-settings-for-gdbserver.patch new file mode 100644 index 00000000..93f67800 --- /dev/null +++ b/meta-microblaze/recipes-devtools/gdb/gdb/0009-gdb-gdserver-Fix-ABI-settings-for-gdbserver.patch @@ -0,0 +1,33 @@ +From 53b76bb548720367032a51a6d604c975b10bb30e Mon Sep 17 00:00:00 2001 +From: Aayush Misra +Date: Fri, 29 Mar 2024 14:59:16 +0530 +Subject: [PATCH] gdb/gdserver: Fix ABI settings for gdbserver + +--- + gdb/microblaze-tdep.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/gdb/microblaze-tdep.c b/gdb/microblaze-tdep.c +index 38ba38e8c7d..35cec286d8f 100644 +--- a/gdb/microblaze-tdep.c ++++ b/gdb/microblaze-tdep.c +@@ -1120,12 +1120,13 @@ void _initialize_microblaze_tdep (); + void + _initialize_microblaze_tdep () + { ++ //Setting abi to auto manually, should be able to modify in 'arch'_gdbarch_init function ++ microblaze_abi_string = microblaze_abi_strings[0]; ++ + register_gdbarch_init (bfd_arch_microblaze, microblaze_gdbarch_init); +-// static struct cmd_list_element *setmicroblazecmdlist = NULL; +-// static struct cmd_list_element *showmicroblazecmdlist = NULL; + +- /* Add root prefix command for all "set microblaze"/"show microblaze" commands. */ + ++ /* Add root prefix command for all "set microblaze"/"show microblaze" commands. */ + add_setshow_prefix_cmd ("microblaze", no_class, + _("Various microblaze specific commands."), + _("Various microblaze specific commands."), +-- +2.34.1 + -- cgit v1.2.3-54-g00ecf From cdeb46c57358e579be9f1c1be95a544fd0e713e4 Mon Sep 17 00:00:00 2001 From: John Toomey Date: Wed, 3 Apr 2024 15:36:31 +0100 Subject: xilinx-bootbin: Add optional data section to BIF Add optional data section to BIF file generation code to be used with version or other information Signed-off-by: John Toomey Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-versal.inc | 3 +++ meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb | 4 ++++ 2 files changed, 7 insertions(+) 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: -- cgit v1.2.3-54-g00ecf From c6ae24ee38a69e4bcd463337aed43276d70845df Mon Sep 17 00:00:00 2001 From: John Toomey Date: Wed, 3 Apr 2024 15:36:32 +0100 Subject: bootbin-version-string: Add text version file Add a version header file in plain text format required for Versal machines using the optional data field in the BIF file for version information Signed-off-by: John Toomey Signed-off-by: Mark Hatle --- .../recipes-bsp/bootbin/bootbin-version-string.bb | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-string.bb 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 -- cgit v1.2.3-54-g00ecf