summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@amd.com>2025-03-30 11:01:16 -0600
committerMark Hatle <mark.hatle@amd.com>2025-03-30 11:01:16 -0600
commita54f33f0e2a29aeb81450477b5931d54c61e3058 (patch)
treebfb5debc8cd2420c2f0bc64a6572394466f3d2a3
parent10531c26195f97f9565e9770c21977805e53c46b (diff)
parent31d35f73ebe29c1ada5a111f106d30dd0127a372 (diff)
downloadmeta-xilinx-a54f33f0e2a29aeb81450477b5931d54c61e3058.tar.gz
Merge remote-tracking branch 'origin/rel-v2024.2' into scarthgap-next
Merge in latest 2024.2 changes
-rw-r--r--meta-xilinx-core/conf/layer.conf1
-rw-r--r--meta-xilinx-core/lib/devtool/boot-jtag.py6
-rw-r--r--meta-xilinx-core/recipes-apps/image-update/image-update_1.4.bb (renamed from meta-xilinx-core/recipes-apps/image-update/image-update_1.3.bb)2
-rw-r--r--meta-xilinx-core/recipes-apps/raft/raft_2024.2.bb65
-rw-r--r--meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2024.2.bb2
-rw-r--r--meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2024.2.inc2
-rw-r--r--meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/hwmon/hwmon_modules.cfg1
-rw-r--r--meta-xilinx-core/recipes-xrt/xrt/xrt_202420.2.18.0.bb2
-rw-r--r--meta-xilinx-demos/recipes-firmware/vek280-pl-aie-vdu-fw/vek280-pl-aie-vdu-fw_1.0-2024.2.bb29
-rw-r--r--meta-xilinx-demos/recipes-firmware/vek280-pl-bram-uart-gpio-fw/vek280-pl-bram-uart-gpio-fw_1.0-2024.2.bb4
-rw-r--r--meta-xilinx-demos/recipes-firmware/zcu104-pl-vcu-fw/zcu104-pl-vcu-fw_1.0-2024.2.bb4
-rwxr-xr-xmeta-xilinx-demos/scripts/generate-machines-sdt.sh1
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/0001-sw_apps-zynqmp_pmufw-Correct-IOU-register-base-addre.patch54
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/esw-conf_2024.1.bb (renamed from meta-xilinx-standalone-sdt/recipes-bsp/embeddedsw/esw-conf_2024.1.bb)0
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/esw-conf_2024.2.bb (renamed from meta-xilinx-standalone-sdt/recipes-bsp/embeddedsw/esw-conf_2024.2.bb)0
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.2+git-xsct.inc5
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.2.bb1
17 files changed, 167 insertions, 12 deletions
diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf
index 399011a7..a054ce56 100644
--- a/meta-xilinx-core/conf/layer.conf
+++ b/meta-xilinx-core/conf/layer.conf
@@ -72,6 +72,7 @@ XILINX_UBOOT_VERSION[v2024.2] = "1:2024.01-xilinx-v2024.2%"
72 72
73PREFERRED_VERSION_u-boot-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" 73PREFERRED_VERSION_u-boot-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
74PREFERRED_VERSION_u-boot-tools-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" 74PREFERRED_VERSION_u-boot-tools-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
75PREFERRED_VERSION_u-boot-tools-xlnx-native ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
75 76
76XILINX_LINUX_VERSION[v2022.1] = "5.15.19%" 77XILINX_LINUX_VERSION[v2022.1] = "5.15.19%"
77XILINX_LINUX_VERSION[v2022.2] = "5.15.36%" 78XILINX_LINUX_VERSION[v2022.2] = "5.15.36%"
diff --git a/meta-xilinx-core/lib/devtool/boot-jtag.py b/meta-xilinx-core/lib/devtool/boot-jtag.py
index 2d8a7d8f..ce38edf9 100644
--- a/meta-xilinx-core/lib/devtool/boot-jtag.py
+++ b/meta-xilinx-core/lib/devtool/boot-jtag.py
@@ -68,7 +68,7 @@ def bootjtag(args, config, basepath, workspace):
68 print("INFO: MACHINE: " + machine) 68 print("INFO: MACHINE: " + machine)
69 69
70 if arch != 'microblazeel': 70 if arch != 'microblazeel':
71 if "fpga-overaly" in machine_features: 71 if "fpga-overlay" in machine_features:
72 print("INFO: fpga-overlay MACHINE_FEATURES is enabled, Hence PL bitstream or PDI will not be loaded at initial boot, User can load from u-boot or linux.") 72 print("INFO: fpga-overlay MACHINE_FEATURES is enabled, Hence PL bitstream or PDI will not be loaded at initial boot, User can load from u-boot or linux.")
73 else: 73 else:
74 print("INFO: fpga-overlay MACHINE_FEATURES is not enabled, Hence PL bitstream or PDI will be loaded at initial boot.") 74 print("INFO: fpga-overlay MACHINE_FEATURES is not enabled, Hence PL bitstream or PDI will be loaded at initial boot.")
@@ -78,7 +78,7 @@ def bootjtag(args, config, basepath, workspace):
78 78
79 # For MB, Zynq 7000 and ZynqMP. 79 # For MB, Zynq 7000 and ZynqMP.
80 if arch == 'microblazeel' or soc == 'zynq' or soc == 'zynqmp': 80 if arch == 'microblazeel' or soc == 'zynq' or soc == 'zynqmp':
81 if not "fpga-overaly" in machine_features: 81 if not "fpga-overlay" in machine_features:
82 data['bit'] = glob.glob(os.path.join(deploy_dir, '*' + machine + '.bit'))[0] 82 data['bit'] = glob.glob(os.path.join(deploy_dir, '*' + machine + '.bit'))[0]
83 data['uboot'] = os.path.join(deploy_dir, 'u-boot.elf') 83 data['uboot'] = os.path.join(deploy_dir, 'u-boot.elf')
84 data['dtb'] = os.path.join(deploy_dir, machine + '-system.dtb') 84 data['dtb'] = os.path.join(deploy_dir, machine + '-system.dtb')
@@ -122,7 +122,7 @@ def bootjtag(args, config, basepath, workspace):
122 lines.append(' if { [ta] != "" } break;') 122 lines.append(' if { [ta] != "" } break;')
123 lines.append(' after 50') 123 lines.append(' after 50')
124 lines.append('}') 124 lines.append('}')
125 if not "fpga-overaly" in machine_features: 125 if not "fpga-overlay" in machine_features:
126 lines.append('') 126 lines.append('')
127 lines.append('puts stderr "INFO: Configuring the PL ..."') 127 lines.append('puts stderr "INFO: Configuring the PL ..."')
128 lines.append('puts stderr "INFO: Downloading bitstream: ' + data['bit'] + '"') 128 lines.append('puts stderr "INFO: Downloading bitstream: ' + data['bit'] + '"')
diff --git a/meta-xilinx-core/recipes-apps/image-update/image-update_1.3.bb b/meta-xilinx-core/recipes-apps/image-update/image-update_1.4.bb
index 828a3ca1..86efabb3 100644
--- a/meta-xilinx-core/recipes-apps/image-update/image-update_1.3.bb
+++ b/meta-xilinx-core/recipes-apps/image-update/image-update_1.4.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSES/MIT;md5=2ac09a7a37dd6ee0ba23c
8 8
9BRANCH = "master" 9BRANCH = "master"
10SRC_URI = "git://github.com/Xilinx/linux-image_update.git;branch=${BRANCH};protocol=https" 10SRC_URI = "git://github.com/Xilinx/linux-image_update.git;branch=${BRANCH};protocol=https"
11SRCREV = "1bd7d7405b484d808176c6e711691a846c18b4f0" 11SRCREV = "068a27fc30e065ddd96eb873595926cf65a37ba8"
12 12
13RDEPENDS:${PN} += "freeipmi" 13RDEPENDS:${PN} += "freeipmi"
14 14
diff --git a/meta-xilinx-core/recipes-apps/raft/raft_2024.2.bb b/meta-xilinx-core/recipes-apps/raft/raft_2024.2.bb
new file mode 100644
index 00000000..a763bfbf
--- /dev/null
+++ b/meta-xilinx-core/recipes-apps/raft/raft_2024.2.bb
@@ -0,0 +1,65 @@
1SUMMARY = "RAFT python application"
2LICENSE = "MIT & BSD-3-Clause"
3LIC_FILES_CHKSUM = " \
4 file://${WORKDIR}/git/LICENSE;md5=cc21c526211d34984839aa67dd16f172 \
5 file://${WORKDIR}/git/docs/LICENSE;md5=d8f0ffdbc8d019bc821a5a07bdca1406 \
6"
7BRANCH = "2024.2"
8SRC_URI = "git://github.com/Xilinx/RAFT;protocol=https;branch=${BRANCH}"
9SRCREV = "f5fc2a0bfa4a6dc18065b08455836e450f2ac054"
10
11inherit update-rc.d systemd
12
13S = "${WORKDIR}/git"
14COMPATIBLE_MACHINE = "^$"
15COMPATIBLE_MACHINE:zcu208-zynqmp = "${MACHINE}"
16COMPATIBLE_MACHINE:zcu216-zynqmp = "${MACHINE}"
17COMPATIBLE_MACHINE:system-controller = "${MACHINE}"
18
19PACKAGE_ARCH = "${MACHINE_ARCH}"
20
21INITSCRIPT_NAME = "raft-startup"
22INITSCRIPT_PARAMS = "start 99 S ."
23
24SYSTEMD_PACKAGES = "${PN}"
25SYSTEMD_SERVICE:${PN} = "raft-startup.service"
26SYSTEMD_AUTO_ENABLE:${PN}="enable"
27
28DEPENDS += "libmetal"
29
30RDEPENDS:${PN} += "\
31 python3 \
32 python3-pyro4 \
33 python3-cffi \
34 python3-serpent \
35 bash \
36 "
37
38PACKAGECONFIG[raftnotebooks] = "enabled,disabled,,packagegroup-xilinx-jupyter"
39PACKAGECONFIG[raftstartup] = "enabled,disabled,,librfdc librfclk libmetal"
40PACKAGECONFIG[raftstartupsc] = "enabled,disabled,,python3-psutil python3-periphery"
41
42do_install() {
43 if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
44 SYSCONFDIR=${D}${sysconfdir}/init.d/
45 else
46 SYSCONFDIR=''
47 fi
48 oe_runmake install DESTDIR=${D}\
49 NOTEBOOKS=${@bb.utils.contains('PACKAGECONFIG','raftnotebooks','enabled','', d)}\
50 STARTUPSC=${@bb.utils.contains('PACKAGECONFIG','raftstartupsc','enabled','',d)}\
51 STARTUP=${@bb.utils.contains('PACKAGECONFIG','raftstartup','enabled','',d)}\
52 BINDIR=${D}${bindir}\
53 SYSTEM_UNIT_DIR=${D}${systemd_system_unitdir}\
54 SYSCONF_DIR=${SYSCONFDIR}
55}
56
57PACKAGECONFIG:append:zcu208-zynqmp = "raftnotebooks raftstartup"
58PACKAGECONFIG:append:zcu216-zynqmp = "raftnotebooks raftstartup"
59PACKAGECONFIG:append:system-controller = "raftstartupsc"
60
61FILES:${PN} += " \
62 ${datadir}/raft/* \
63 ${datadir}/notebooks \
64 ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','${sysconfdir}/*', '', d)} \
65 "
diff --git a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2024.2.bb b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2024.2.bb
index 88dec7b8..8c04150b 100644
--- a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2024.2.bb
+++ b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2024.2.bb
@@ -9,7 +9,7 @@ BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '
9SRC_URI = "${REPO};${BRANCHARG}" 9SRC_URI = "${REPO};${BRANCHARG}"
10 10
11BRANCH = "xlnx_rel_v2024.2" 11BRANCH = "xlnx_rel_v2024.2"
12SRCREV = "839e8e646c54a63326e36c48a7bd879f5e8efa31" 12SRCREV = "fd6fb8e0c90c0b66e8f840ccaf484159e1b4008d"
13SOMAJOR = "2" 13SOMAJOR = "2"
14SOMINOR = "0" 14SOMINOR = "0"
15SOVERSION = "${SOMAJOR}.${SOMINOR}" 15SOVERSION = "${SOMAJOR}.${SOMINOR}"
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2024.2.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2024.2.inc
index feb9bbcd..f54b5d6b 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2024.2.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2024.2.inc
@@ -1,6 +1,6 @@
1UBRANCH = "xlnx_rebase_v2024.01" 1UBRANCH = "xlnx_rebase_v2024.01"
2 2
3SRCREV = "7f6ec94aac7eacfec07bd45c83a6d17df4b7d383" 3SRCREV = "20b67799856b578b1c79f29575448421c86b6161"
4 4
5LICENSE = "GPL-2.0-or-later" 5LICENSE = "GPL-2.0-or-later"
6LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897" 6LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897"
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/hwmon/hwmon_modules.cfg b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/hwmon/hwmon_modules.cfg
index b6db5f90..cf3004cb 100644
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/hwmon/hwmon_modules.cfg
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/hwmon/hwmon_modules.cfg
@@ -1,2 +1,3 @@
1CONFIG_SENSORS_TPS53679=m 1CONFIG_SENSORS_TPS53679=m
2CONFIG_SENSORS_UCD9000=m
2 3
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202420.2.18.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202420.2.18.0.bb
index d538f947..0df1da62 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202420.2.18.0.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202420.2.18.0.bb
@@ -18,8 +18,6 @@ S = "${WORKDIR}/git/src"
18 18
19inherit cmake pkgconfig 19inherit cmake pkgconfig
20 20
21BBCLASSEXTEND = "native nativesdk"
22
23PACKAGECONFIG ??= "aie" 21PACKAGECONFIG ??= "aie"
24PACKAGECONFIG[aie] = ",,libxaiengine aiefal,libxaiengine aiefal" 22PACKAGECONFIG[aie] = ",,libxaiengine aiefal,libxaiengine aiefal"
25 23
diff --git a/meta-xilinx-demos/recipes-firmware/vek280-pl-aie-vdu-fw/vek280-pl-aie-vdu-fw_1.0-2024.2.bb b/meta-xilinx-demos/recipes-firmware/vek280-pl-aie-vdu-fw/vek280-pl-aie-vdu-fw_1.0-2024.2.bb
new file mode 100644
index 00000000..9a546002
--- /dev/null
+++ b/meta-xilinx-demos/recipes-firmware/vek280-pl-aie-vdu-fw/vek280-pl-aie-vdu-fw_1.0-2024.2.bb
@@ -0,0 +1,29 @@
1SUMMARY = "VEK280 Segemented Configuration(DFx Full) firmware using dfx_user_dts bbclass"
2DESCRIPTION = "VEK280 Segemented Configuration(DFx Full) PL AIE and VDU firmware application"
3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
5
6inherit dfx_user_dts
7
8
9SRC_URI = "https://petalinux.xilinx.com/sswreleases/rel-v2024.2/sdt/2024.2/2024.2_1111_2_02260716/external/vek280-pl-aie-vdu-fw/vek280-pl-aie-vdu-fw_2024.2_1111_1.tar.gz"
10
11SRC_URI[sha256sum] = "6d42c9679e9615c6560a8b095957e5490aacbe9a22ae607794cb914ce790df0f"
12
13COMPATIBLE_MACHINE:versal-vek280-sdt-seg = "${MACHINE}"
14
15# When do_upack is exectuted it will extract tar file with original directory
16# name so set the FW_DIR pointing to pdi and dtsi files.
17FW_DIR = "vek280-pl-aie-vdu-fw"
18
19# fw files doesn't install on rootfs using dfx_user_dts bbclass using artifactory
20# method. To workaround this issue we are using copy_fw_files pre-functions.
21# copy_fw_files prefuncs needs to be called before find_firmware_file to update
22# the firmware-name to ${PN}.
23do_configure[prefuncs] =+ "copy_fw_files"
24python copy_fw_files () {
25 import shutil
26 fw_file_src = d.getVar('WORKDIR') + '/' + d.getVar("FW_DIR")
27 fw_file_dest = d.getVar('S')
28 shutil.copytree(fw_file_src, fw_file_dest, dirs_exist_ok=True)
29}
diff --git a/meta-xilinx-demos/recipes-firmware/vek280-pl-bram-uart-gpio-fw/vek280-pl-bram-uart-gpio-fw_1.0-2024.2.bb b/meta-xilinx-demos/recipes-firmware/vek280-pl-bram-uart-gpio-fw/vek280-pl-bram-uart-gpio-fw_1.0-2024.2.bb
index 045b88d5..7a144446 100644
--- a/meta-xilinx-demos/recipes-firmware/vek280-pl-bram-uart-gpio-fw/vek280-pl-bram-uart-gpio-fw_1.0-2024.2.bb
+++ b/meta-xilinx-demos/recipes-firmware/vek280-pl-bram-uart-gpio-fw/vek280-pl-bram-uart-gpio-fw_1.0-2024.2.bb
@@ -5,9 +5,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
5 5
6inherit dfx_user_dts 6inherit dfx_user_dts
7 7
8SRC_URI = "https://petalinux.xilinx.com/sswreleases/rel-v2024.2/sdt/2024.2/2024.2_1106_1_11061206/external/vek280-pl-bram-gpio-fw/vek280-pl-bram-gpio-fw_2024.2_1106_1.tar.gz" 8SRC_URI = "https://petalinux.xilinx.com/sswreleases/rel-v2024.2/sdt/2024.2/2024.2_1111_2_02260716/external/vek280-pl-bram-gpio-fw/vek280-pl-bram-gpio-fw_2024.2_1111_1.tar.gz"
9 9
10SRC_URI[sha256sum] = "bf7688694a27a0f81e7d59d16c2b819994aa5fb8adfb0d94656da4040e4bc279" 10SRC_URI[sha256sum] = "0c31d5595368ae796c7aac0344e084225fb9abe3ecf4c2f17583191a8196aed4"
11 11
12COMPATIBLE_MACHINE:versal-vek280-sdt-seg = "${MACHINE}" 12COMPATIBLE_MACHINE:versal-vek280-sdt-seg = "${MACHINE}"
13COMPATIBLE_MACHINE:versal-vek280-sdt-seg-ospi = "${MACHINE}" 13COMPATIBLE_MACHINE:versal-vek280-sdt-seg-ospi = "${MACHINE}"
diff --git a/meta-xilinx-demos/recipes-firmware/zcu104-pl-vcu-fw/zcu104-pl-vcu-fw_1.0-2024.2.bb b/meta-xilinx-demos/recipes-firmware/zcu104-pl-vcu-fw/zcu104-pl-vcu-fw_1.0-2024.2.bb
index 0dcb2be2..f7ece0ff 100644
--- a/meta-xilinx-demos/recipes-firmware/zcu104-pl-vcu-fw/zcu104-pl-vcu-fw_1.0-2024.2.bb
+++ b/meta-xilinx-demos/recipes-firmware/zcu104-pl-vcu-fw/zcu104-pl-vcu-fw_1.0-2024.2.bb
@@ -5,9 +5,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
5 5
6inherit dfx_user_dts 6inherit dfx_user_dts
7 7
8SRC_URI = "https://petalinux.xilinx.com/sswreleases/rel-v2024.2/sdt/2024.2/2024.2_1106_1_11061206/external/zcu104-pl-vcu-fw/zcu104-pl-vcu-fw_2024.2_1106_1.tar.gz" 8SRC_URI = "https://petalinux.xilinx.com/sswreleases/rel-v2024.2/sdt/2024.2/2024.2_1111_2_02260716/external/zcu104-pl-vcu-fw/zcu104-pl-vcu-fw_2024.2_1111_1.tar.gz"
9 9
10SRC_URI[sha256sum] = "1eef872153d2373c944c20752bc374e371159395a42d8353bd1a397fadc59231" 10SRC_URI[sha256sum] = "c4457697a50ecf70f5008797932feb55db18d8afbd5592e3a7ed2cc9ee9fac31"
11 11
12 12
13COMPATIBLE_MACHINE:zynqmp-zcu104-sdt-full = "${MACHINE}" 13COMPATIBLE_MACHINE:zynqmp-zcu104-sdt-full = "${MACHINE}"
diff --git a/meta-xilinx-demos/scripts/generate-machines-sdt.sh b/meta-xilinx-demos/scripts/generate-machines-sdt.sh
index aaeef385..44c77a88 100755
--- a/meta-xilinx-demos/scripts/generate-machines-sdt.sh
+++ b/meta-xilinx-demos/scripts/generate-machines-sdt.sh
@@ -3,6 +3,7 @@
3### The following table controls the automatic generated of the firmware demos 3### The following table controls the automatic generated of the firmware demos
4### Machine Recipe 4### Machine Recipe
5#M# vek280-pl-bram-gpio-fw recipes-firmware/vek280-pl-bram-uart-gpio-fw/vek280-pl-bram-uart-gpio-fw_1.0-2024.2.bb 5#M# vek280-pl-bram-gpio-fw recipes-firmware/vek280-pl-bram-uart-gpio-fw/vek280-pl-bram-uart-gpio-fw_1.0-2024.2.bb
6#M# vek280-pl-aie-vdu-fw recipes-firmware/vek280-pl-aie-vdu-fw/vek280-pl-aie-vdu-fw_1.0-2024.2.bb
6#M# zcu104-pl-vcu-fw recipes-firmware/zcu104-pl-vcu-fw/zcu104-pl-vcu-fw_1.0-2024.2.bb 7#M# zcu104-pl-vcu-fw recipes-firmware/zcu104-pl-vcu-fw/zcu104-pl-vcu-fw_1.0-2024.2.bb
7 8
8this=$(realpath $0) 9this=$(realpath $0)
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/0001-sw_apps-zynqmp_pmufw-Correct-IOU-register-base-addre.patch b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/0001-sw_apps-zynqmp_pmufw-Correct-IOU-register-base-addre.patch
new file mode 100644
index 00000000..07062cdc
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw/2024.2+git/0001-sw_apps-zynqmp_pmufw-Correct-IOU-register-base-addre.patch
@@ -0,0 +1,54 @@
1From 7b6276c77c0be40006a7cb9f53bacf93fd493d49 Mon Sep 17 00:00:00 2001
2From: "Jain, Ronak" <ronak.jain@amd.com>
3Date: Sun, 20 Oct 2024 20:48:29 -1200
4Subject: [PATCH] sw_apps: zynqmp_pmufw: Correct IOU register base address for
5 GEM2 in SGMII mode
6
7Fix an issue where enabling GEM2 in SGMII mode causes QSPI access to
8fail on Kria K26 SOM and KV260 base boards. The failure was due to
9the PMUFW using the IOU_SLCR_BASEADDR instead of the
10IOU_SECURE_SLCR_BASEADDR when accessing the IOU_AXI_WPRTCN and
11IOU_AXI_RPRTCN registers, which caused an IO mux malfunction.
12
13This patch corrects the base addresses for these registers to ensure
14proper operation of GEM2 and QSPI.
15
16Signed-off-by: Ronak Jain <ronak.jain@amd.com>
17Acked-by: Buddhabhatti, Jay <jay.buddhabhatti@amd.com>
18---
19 lib/sw_apps/zynqmp_pmufw/src/iou_secure_slcr.h | 7 ++++---
20 1 file changed, 4 insertions(+), 3 deletions(-)
21
22diff --git a/lib/sw_apps/zynqmp_pmufw/src/iou_secure_slcr.h b/lib/sw_apps/zynqmp_pmufw/src/iou_secure_slcr.h
23index f462268ad0..79fc790f20 100644
24--- a/lib/sw_apps/zynqmp_pmufw/src/iou_secure_slcr.h
25+++ b/lib/sw_apps/zynqmp_pmufw/src/iou_secure_slcr.h
26@@ -1,5 +1,6 @@
27 /******************************************************************************
28-* Copyright (c) 2021 Xilinx, Inc. All rights reserved.
29+* Copyright (c) 2021 - 2022 Xilinx, Inc. All rights reserved.
30+* Copyright (c) 2022 - 2024 Advanced Micro Devices, Inc. All Rights Reserved.
31 * SPDX-License-Identifier: MIT
32 ******************************************************************************/
33
34@@ -19,7 +20,7 @@ extern "C" {
35 /**
36 * Register: IOU_AXI_WPRTCN
37 */
38-#define IOU_AXI_WPRTCN ( ( IOU_SLCR_BASEADDR ) + ((u32)0X00000000U) )
39+#define IOU_AXI_WPRTCN ( ( IOU_SECURE_SLCR_BASEADDR ) + ((u32)0X00000000U) )
40
41 #define GEM0_AXI_AWPROT_SHIFT 0U
42 #define GEM0_AXI_AWPROT_MASK ((u32)0x00000007U)
43@@ -37,7 +38,7 @@ extern "C" {
44 /**
45 * Register: IOU_AXI_RPRTCN
46 */
47-#define IOU_AXI_RPRTCN ( ( IOU_SLCR_BASEADDR ) + ((u32)0X00000004U) )
48+#define IOU_AXI_RPRTCN ( ( IOU_SECURE_SLCR_BASEADDR ) + ((u32)0X00000004U) )
49
50 #define GEM0_AXI_ARPROT_SHIFT 0U
51 #define GEM0_AXI_ARPROT_MASK ((u32)0x00000007U)
52--
532.34.1
54
diff --git a/meta-xilinx-standalone-sdt/recipes-bsp/embeddedsw/esw-conf_2024.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/esw-conf_2024.1.bb
index f99db010..f99db010 100644
--- a/meta-xilinx-standalone-sdt/recipes-bsp/embeddedsw/esw-conf_2024.1.bb
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/esw-conf_2024.1.bb
diff --git a/meta-xilinx-standalone-sdt/recipes-bsp/embeddedsw/esw-conf_2024.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/esw-conf_2024.2.bb
index f99db010..f99db010 100644
--- a/meta-xilinx-standalone-sdt/recipes-bsp/embeddedsw/esw-conf_2024.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/esw-conf_2024.2.bb
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.2+git-xsct.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.2+git-xsct.inc
new file mode 100644
index 00000000..de8e4a25
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.2+git-xsct.inc
@@ -0,0 +1,5 @@
1FILESPATH .= ":${FILE_DIRNAME}/embeddedsw/${PV}:${FILE_DIRNAME}/embeddedsw"
2
3SRC_URI += " \
4 file://0001-sw_apps-zynqmp_pmufw-Correct-IOU-register-base-addre.patch \
5 "
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.2.bb
index 3ec0c10f..07c44b6a 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2024.2.bb
@@ -1,3 +1,4 @@
1require pmu-firmware.inc 1require pmu-firmware.inc
2require ${@'pmu-firmware_generic.inc' if d.getVar('XILINX_WITH_ESW') == 'generic' else ''} 2require ${@'pmu-firmware_generic.inc' if d.getVar('XILINX_WITH_ESW') == 'generic' else ''}
3require ${@'pmu-firmware_${PV}-generic.inc' if d.getVar('XILINX_WITH_ESW') == 'generic' else ''} 3require ${@'pmu-firmware_${PV}-generic.inc' if d.getVar('XILINX_WITH_ESW') == 'generic' else ''}
4require ${@'pmu-firmware_${PV}-xsct.inc' if d.getVar('XILINX_WITH_ESW') == 'xsct' else ''}