diff options
6 files changed, 14 insertions, 8 deletions
diff --git a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf index 045e9422..f31c10cf 100644 --- a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf @@ -5,6 +5,9 @@ require conf/machine/include/soc-zynqmp.inc require conf/machine/include/machine-xilinx-default.inc +require conf/machine/include/xilinx-board.inc + +BOARD = "ultra96" MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget wifi bluetooth mipi" diff --git a/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware_%.bbappend index a1e4cb0b..eb64045a 100644 --- a/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware_%.bbappend +++ b/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware_%.bbappend @@ -1,14 +1,14 @@ # TIInit_11.8.32.bts is required for bluetooth support but this particular # version is not available in the linux-firmware repository. # -SRC_URI_append_ultra96-zynqmp = "\ +SRC_URI_append_ultra96 = "\ https://git.ti.com/ti-bt/service-packs/blobs/raw/c290f8af9e388f37e509ecb111a1b64572b7c225/initscripts/TIInit_11.8.32.bts;name=TIInit_11.8.32 \ " SRC_URI[TIInit_11.8.32.md5sum] = "b1e142773e8ef0537b93895ebe2fcae3" SRC_URI[TIInit_11.8.32.sha256sum] = "962322c05857ad6b1fb81467bdfc59c125e04a6a8eaabf7f24b742ddd68c3bfa" -do_install_append_ultra96-zynqmp() { +do_install_append_ultra96() { cp ${WORKDIR}/TIInit_11.8.32.bts ${D}${nonarch_base_libdir}/firmware/ti-connectivity/ ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . ) rm -f ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_7* @@ -17,12 +17,13 @@ do_install_append_ultra96-zynqmp() { INSANE_SKIP_${PN} += "installed-vs-shipped" -PACKAGES_remove_ultra96-zynqmp = "${PN}-wl12xx" +PACKAGES_remove_ultra96 = "${PN}-wl12xx" -FILES_${PN}-wl18xx_ultra96-zynqmp = " \ +FILES_${PN}-wl18xx_ultra96 = " \ ${nonarch_base_libdir}/firmware/wl18* \ ${nonarch_base_libdir}/firmware/TI* \ ${nonarch_base_libdir}/firmware/ti-connectivity/wl18* \ ${nonarch_base_libdir}/firmware/ti-connectivity/TI* \ " +PACKAGE_ARCH_ultra96 = "${BOARD_ARCH}" diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc index 6b4264f5..df01ebdd 100644 --- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc +++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc @@ -60,6 +60,6 @@ KERNEL_FEATURES_append_zynqmp = "${@' features/xilinx/overlay/overlay_of.scc' if KERNEL_FEATURES_append_versal = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' features/xen/xen.scc', '', d)} features/xilinx/hdmi-module/hdmi-module.scc" -KERNEL_FEATURES_append_ultra96-zynqmp = " bsp/xilinx/ultra96-zynqmp/mipi-config-ultra96.scc" +KERNEL_FEATURES_append_ultra96 = " bsp/xilinx/ultra96-zynqmp/mipi-config-ultra96.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', ' features/ocicontainer/ocicontainer.scc', '', d)}" diff --git a/meta-xilinx-pynq/classes/xilinx-pynq.bbclass b/meta-xilinx-pynq/classes/xilinx-pynq.bbclass index 645d1da2..a183a78e 100644 --- a/meta-xilinx-pynq/classes/xilinx-pynq.bbclass +++ b/meta-xilinx-pynq/classes/xilinx-pynq.bbclass @@ -14,7 +14,7 @@ INSANE_SKIP_${PN} += "staticdev dev-so" inherit python3-dir # Used for setup.py on PYNQ -BOARD_NAME_ultra96-zynqmp = "Ultra96" +BOARD_NAME_ultra96 = "Ultra96" BOARD_NAME_zcu104-zynqmp = "ZCU104" do_compile_prepend() { diff --git a/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb b/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb index 6a69ea21..c20ac5d6 100644 --- a/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb +++ b/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb @@ -22,7 +22,7 @@ RDEPENDS_${PN}-notebooks += "\ " COMPATIBLE_MACHINE = "^$" -COMPATIBLE_MACHINE_ultra96-zynqmp = "ultra96-zynqmp" +COMPATIBLE_MACHINE_ultra96 = "${MACHINE}" S = "${WORKDIR}/git" @@ -55,3 +55,4 @@ do_install () { cp -r ${S}/notebooks/* ${JUPYTER_NOTEBOOKS}/bnn_examples/ } +PACKAGE_ARCH_ultra96 = "${BOARD_ARCH}" diff --git a/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb b/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb index 1cddb602..d1aabb7d 100644 --- a/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb +++ b/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb @@ -15,7 +15,7 @@ SRC_URI = "git://github.com/Xilinx/PYNQ-HelloWorld.git;protocol=https \ " COMPATIBLE_MACHINE = "^$" -COMPATIBLE_MACHINE_ultra96-zynqmp = "ultra96-zynqmp" +COMPATIBLE_MACHINE_ultra96 = "${MACHINE}" SRC_URI[md5sum] = "ac1bfe94a18301b26ae5110ea26ca596" SRC_URI[sha256sum] = "f522c54c9418d1b1fdb6098cd7139439d47b041900000812c51200482d423460" @@ -37,3 +37,4 @@ do_install() { } +PACKAGE_ARCH_ultra96 = "${BOARD_ARCH}" |