meta-pynq updates to Petalinux 2022.1

* Recipes changed to conform to yocto honister API update https://docs.yoctoproject.org/migration-guides/migration-3.4.html * BBFILE_PRIORITY changed 6->7 so devicetree segments and kernel settings can be applied in the correct order
Xilinx · Sep 28, 2022 · 5512aff · 5512aff
1 parent ce946f1
commit 5512aff
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 59 deletions.
diff --git a/sdbuild/boot/image_aarch64.its b/sdbuild/boot/image_aarch64.its
@@ -5,7 +5,7 @@
     #address-cells = <1>;
 
     images {
-        kernel@0 {
+        kernel-0 {
             description = "Linux Kernel";
             data = /incbin/("./Image");
             type = "kernel";
@@ -14,28 +14,28 @@
             compression = "none";
             load = <0x80000>;
             entry = <0x80000>;
-            hash@1 {
+            hash-1 {
                 algo = "sha1";
             };
         };
-        fdt@0 {
+        fdt-0 {
             description = "Flattened Device Tree blob";
             data = /incbin/("./system.dtb");
             type = "flat_dt";
             arch = "arm64";
             compression = "none";
-            hash@1 {
+            hash-1 {
                 algo = "sha1";
             };
         };
     };
     configurations {
-        default = "conf@1";
-        conf@1 {
+        default = "conf-1";
+        conf-1 {
             description = "Boot Linux kernel with FDT blob";
-            kernel = "kernel@0";
-            fdt = "fdt@0";
-            hash@1 {
+            kernel = "kernel-0";
+            fdt = "fdt-0";
+            hash-1 {
                 algo = "sha1";
             };
         };

diff --git a/sdbuild/boot/image_arm.its b/sdbuild/boot/image_arm.its
@@ -5,7 +5,7 @@
     #address-cells = <1>;
 
     images {
-        kernel@0 {
+        kernel-0 {
             description = "Linux Kernel";
             data = /incbin/("./zImage");
             type = "kernel";
@@ -14,28 +14,28 @@
             compression = "none";
             load = <0x80000>;
             entry = <0x80000>;
-            hash@1 {
+            hash-1 {
                 algo = "sha1";
             };
         };
-        fdt@0 {
+        fdt-0 {
             description = "Flattened Device Tree blob";
             data = /incbin/("./system.dtb");
             type = "flat_dt";
             arch = "arm";
             compression = "none";
-            hash@1 {
+            hash-1 {
                 algo = "sha1";
             };
         };
     };
     configurations {
-        default = "conf@1";
-        conf@1 {
+        default = "conf-1";
+        conf-1 {
             description = "Boot Linux kernel with FDT blob";
-            kernel = "kernel@0";
-            fdt = "fdt@0";
-            hash@1 {
+            kernel = "kernel-0";
+            fdt = "fdt-0";
+            hash-1 {
                 algo = "sha1";
             };
         };

diff --git a/sdbuild/boot/meta-pynq/classes/pynq-package.bbclass b/sdbuild/boot/meta-pynq/classes/pynq-package.bbclass
@@ -2,12 +2,12 @@ PYNQ_NOTEBOOK_DIR ?= "/home/root/notebooks"
 
 PYNQ_BOARD ?= ZCU104
 
-do_compile_prepend() {
+do_compile:prepend() {
 export PYNQ_JUPYTER_NOTEBOOKS="${D}${PYNQ_NOTEBOOK_DIR}"
 export BOARD=${PYNQ_BOARD}
 }
 
-do_install_prepend() {
+do_install:prepend() {
 export PYNQ_JUPYTER_NOTEBOOKS="${D}${PYNQ_NOTEBOOK_DIR}"
 export BOARD=${PYNQ_BOARD}
 }

diff --git a/sdbuild/boot/meta-pynq/conf/layer.conf b/sdbuild/boot/meta-pynq/conf/layer.conf
@@ -7,6 +7,6 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "pynq"
 BBFILE_PATTERN_pynq = "^${LAYERDIR}/"
-BBFILE_PRIORITY_pynq = "6"
+BBFILE_PRIORITY_pynq = "7"
 
-LAYERSERIES_COMPAT_pynq = "zeus"
+LAYERSERIES_COMPAT_pynq = "honister"
diff --git a/sdbuild/boot/meta-pynq/recipes-bsp/device-tree/device-tree.bbappend b/sdbuild/boot/meta-pynq/recipes-bsp/device-tree/device-tree.bbappend
@@ -1,5 +1,5 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI_append = "\
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+SRC_URI:append = "\
     file://pynq_xlnk_zynq.dtsi \
     file://pynq_xlnk_zynqmp.dtsi \
     file://pynq_zocl_poll_zynq.dtsi \
@@ -16,7 +16,7 @@ SRC_URI_append = "\
 # PYNQ_BOARDNAME="${BB_ORIGENV[PYNQ_BOARDNAME]}"
 # FPGA_MANAGER="${BB_ORIGENV[FPGA_MANAGER]}"
 
-do_configure_append_zynq () {
+do_configure:append:zynq () {
     PYNQ_BOARDNAME="${@d.getVar('BB_ORIGENV', False).getVar('PYNQ_BOARDNAME', True)}"
     FPGA_MANAGER="${@d.getVar('BB_ORIGENV', False).getVar('FPGA_MANAGER', True)}"
     echo '/include/ "pynq_zynq.dtsi"' >> ${DT_FILES_PATH}/system-top.dts
@@ -33,7 +33,7 @@ do_configure_append_zynq () {
         exit 1
     fi
 }
-do_configure_append_zynqmp () {
+do_configure:append:zynqmp () {
     PYNQ_BOARDNAME="${@d.getVar('BB_ORIGENV', False).getVar('PYNQ_BOARDNAME', True)}"
 	FPGA_MANAGER="${@d.getVar('BB_ORIGENV', False).getVar('FPGA_MANAGER', True)}"
     echo '/include/ "pynq_zynqmp.dtsi"' >> ${DT_FILES_PATH}/system-top.dts

diff --git a/sdbuild/boot/meta-pynq/recipes-bsp/device-tree/files/pynq_uio_zynq.dtsi b/sdbuild/boot/meta-pynq/recipes-bsp/device-tree/files/pynq_uio_zynq.dtsi
@@ -1,11 +1,8 @@
 / {
-	amba {
-
-		fabric@40000000 {
-			compatible = "generic-uio";
-			reg = <0x40000000 0x10000>;
-			interrupt-parent = <&intc>;
-			interrupts = <0x0 0x1d 0x4>;
-		};
+	fabric@40000000 {
+		compatible = "generic-uio";
+		reg = <0x40000000 0x10000>;
+		interrupt-parent = <&intc>;
+		interrupts = <0x0 0x1d 0x4>;
 	};
 };
diff --git a/sdbuild/boot/meta-pynq/recipes-bsp/device-tree/files/pynq_uio_zynqmp.dtsi b/sdbuild/boot/meta-pynq/recipes-bsp/device-tree/files/pynq_uio_zynqmp.dtsi
@@ -1,11 +1,8 @@
 / {
-	amba {
-
-		fabric@A0000000 {
-			compatible = "generic-uio";
-			reg = <0x0 0xA0000000 0x0 0x10000>;
-			interrupt-parent = <&gic>;
-			interrupts = <0x0 0x59 0x4>;
-		};
+	fabric@A0000000 {
+		compatible = "generic-uio";
+		reg = <0x0 0xA0000000 0x0 0x10000>;
+		interrupt-parent = <&gic>;
+		interrupts = <0x0 0x59 0x4>;
 	};
 };
diff --git a/sdbuild/boot/meta-pynq/recipes-core/images/petalinux-image-full.bbappend b/sdbuild/boot/meta-pynq/recipes-core/images/petalinux-image-full.bbappend
@@ -1,5 +1,5 @@
-IMAGE_INSTALL_append = " xrt-dev"
-IMAGE_INSTALL_append = " xrt"
-IMAGE_INSTALL_append = " zocl"
-IMAGE_INSTALL_append = " opencl-headers-dev"
-IMAGE_INSTALL_append = " opencl-clhpp-dev"
+IMAGE_INSTALL:append = " xrt-dev"
+IMAGE_INSTALL:append = " xrt"
+IMAGE_INSTALL:append = " zocl"
+IMAGE_INSTALL:append = " opencl-headers-dev"
+IMAGE_INSTALL:append = " opencl-clhpp-dev"
diff --git a/sdbuild/boot/meta-pynq/recipes-filesystem/python/python-pynq.inc b/sdbuild/boot/meta-pynq/recipes-filesystem/python/python-pynq.inc
@@ -34,18 +34,18 @@ CMA_ARCH_aarch64 = "64"
 SRC_URI = "gitsm://${THISDIR}/../../../../../;usehead=1;protocol=file"
 SRCREV = "${AUTOREV}"
 
-SRC_URI += " file://pl_server_init"
-FILESEXTRAPATHS_prepend := "${THISDIR}:"
+#SRC_URI += " file://pl_server_init"
+FILESEXTRAPATHS:prepend := "${THISDIR}:"
 S = "${WORKDIR}/git"
 INSANE_SKIP_${PN} = "staticdev"
 BBCLASSEXTEND = "native nativesdk"
 
 inherit update-rc.d
 INITSCRIPT_PACKAGES = "${PN}"
-INITSCRIPT_NAME = "pl_server_init"
+#INITSCRIPT_NAME = "pl_server_init"
 INITSCRIPT_PARAMS = "start 99 S ."
 
-do_compile_prepend() {
+do_compile:prepend() {
 install -d "${D}/home/root/notebooks"
 export PYNQ_JUPYTER_NOTEBOOKS="${D}/home/root/notebooks"
 export PYNQ_BUILD_ARCH="${PYNQ_ARCH_${TARGET_ARCH}}"
@@ -54,22 +54,22 @@ export PYNQ_BUILD_ROOT="${STAGING_DIR_TARGET}"
 
 }
 
-do_install_prepend() {
+do_install:prepend() {
 install -d "${D}/home/root/notebooks"
 export PYNQ_JUPYTER_NOTEBOOKS="${D}/home/root/notebooks"
 export PYNQ_BUILD_ARCH="${PYNQ_ARCH_${TARGET_ARCH}}"
 export PYNQ_BUILD_ROOT="${STAGING_DIR_TARGET}"
 }
 
-do_install_append() {
+do_install:append() {
  install -d ${D}${INIT_D_DIR}
- install -m 755 ${WORKDIR}/pl_server_init ${D}${INIT_D_DIR}/pl_server_init
+ #install -m 755 ${WORKDIR}/pl_server_init ${D}${INIT_D_DIR}/pl_server_init
  (cd ${S}/sdbuild/packages/libsds/libcma && CMA_ARCH=${CMA_ARCH_${TARGET_ARCH}} make install DESTDIR=${D})
  rm -rf ${D}/home/root/notebooks_*
 }
 
 SOLIBS = ".so"
 FILES_SOLIBSDEV = ""
-FILES_${PN} += " ${INIT_D_DIR}/pl_server_init /usr/lib/libcma.so"
+FILES_${PN} += "/usr/lib/libcma.so"
 FILES_${PN}-notebooks = "/home/root/notebooks"
 PACKAGES += "${PN}-notebooks"
diff --git a/sdbuild/boot/meta-pynq/recipes-kernel/linux/linux-xlnx_%.bbappend b/sdbuild/boot/meta-pynq/recipes-kernel/linux/linux-xlnx_%.bbappend
@@ -6,4 +6,4 @@ SRC_URI += " file://0001-irps5401.patch"
 SRC_URI += " file://docker.cfg"
 SRC_URI += " file://0001-Change-bMaxBurst-and-qlen-to-the-highest-number.patch"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/sdbuild/boot/meta-pynq/recipes-xrt/zocl/zocl_git.bb b/sdbuild/boot/meta-pynq/recipes-xrt/zocl/zocl_git.bb
@@ -4,13 +4,13 @@ DESCRIPTION = "Xilinx Runtime driver module provides memory management and compu
 LICENSE = "GPLv2 & Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8"
 
-BRANCH ?= "2020.1"
+BRANCH ?= "2022.1"
 REPO ?= "git://github.com/Xilinx/XRT.git;protocol=https"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
 
-PV = "202010.2.6.0"
-SRCREV ?= "2d6bfe4ce91051d4e5b499d38fc493586dd4859a"
+PV = "202210.2.13.0"
+SRCREV ?= "f5505e402c2ca1ffe45eb6d3a9399b23a0dc8776"
 
 S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl"