From 2c4db5806986359b0c7c17ea503801a3b65531ec Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Tue, 12 Mar 2024 10:42:42 -0500 Subject: prusw-fw: Combine PRU-Switch firmwares into single package The firmware for different machines and versions are named differently so there is no need to have machine specific packages for each of these firmwares. Move all the PRU-Switch firmwares into single package. Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon --- meta-ti-bsp/conf/machine/am65xx-evm.conf | 2 +- meta-ti-bsp/conf/machine/include/am64xx.inc | 2 +- .../recipes-bsp/prusw-fw/prusw-fw-am65x-sr2_git.bb | 24 ---------------------- meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb | 24 ++++++++++++++-------- 4 files changed, 18 insertions(+), 34 deletions(-) delete mode 100644 meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw-am65x-sr2_git.bb diff --git a/meta-ti-bsp/conf/machine/am65xx-evm.conf b/meta-ti-bsp/conf/machine/am65xx-evm.conf index 7df93db7..60eed90f 100644 --- a/meta-ti-bsp/conf/machine/am65xx-evm.conf +++ b/meta-ti-bsp/conf/machine/am65xx-evm.conf @@ -6,4 +6,4 @@ require conf/machine/include/am65xx.inc UBOOT_MACHINE = "am65x_evm_a53_defconfig" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw pruhsr-fw prusw-fw-am65x-sr2" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw pruhsr-fw prusw-fw" diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc index de65829c..cfade2fa 100644 --- a/meta-ti-bsp/conf/machine/include/am64xx.inc +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc @@ -21,4 +21,4 @@ TFA_BOARD = "lite" OPTEEMACHINE = "k3-am64x" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw pruhsr-fw prusw-fw-am65x-sr2" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw pruhsr-fw prusw-fw" diff --git a/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw-am65x-sr2_git.bb b/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw-am65x-sr2_git.bb deleted file mode 100644 index 6e296e7c..00000000 --- a/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw-am65x-sr2_git.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "PRU Ethernet Switch firmware for AM65xx SR2.0" - -require recipes-bsp/ti-linux-fw/ti-linux-fw.inc - -PV = "${PRUETH_FW_AM65X_SR2_VERSION}" -PR = "${INC_PR}.0" - -COMPATIBLE_MACHINE = "am65xx-evm|am64xx" - -TARGET = " \ - am65x-sr2-pru0-prusw-fw.elf \ - am65x-sr2-pru1-prusw-fw.elf \ - am65x-sr2-rtu0-prusw-fw.elf \ - am65x-sr2-rtu1-prusw-fw.elf \ - am65x-sr2-txpru0-prusw-fw.elf \ - am65x-sr2-txpru1-prusw-fw.elf \ -" - -do_install() { - install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss - for f in ${TARGET}; do - install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f - done -} diff --git a/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb b/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb index 755f93b9..be407363 100644 --- a/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb +++ b/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb @@ -1,17 +1,25 @@ -SUMMARY = "PRU Switch firmware for AM57xx, AM437x and AM335x" +SUMMARY = "PRU Switch firmware" require recipes-bsp/ti-linux-fw/ti-linux-fw.inc PR = "${INC_PR}.0" -COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx" +COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx|am65xx|am64xx" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -TARGET = "" -TARGET:ti33x = "am335x-pru0-prusw-fw.elf am335x-pru1-prusw-fw.elf" -TARGET:ti43x = "am437x-pru0-prusw-fw.elf am437x-pru1-prusw-fw.elf" -TARGET:am57xx = "am57xx-pru0-prusw-fw.elf am57xx-pru1-prusw-fw.elf" +TARGET = " \ + am335x-pru0-prusw-fw.elf \ + am335x-pru1-prusw-fw.elf \ + am437x-pru0-prusw-fw.elf \ + am437x-pru1-prusw-fw.elf \ + am57xx-pru0-prusw-fw.elf \ + am57xx-pru1-prusw-fw.elf \ + am65x-sr2-pru0-prusw-fw.elf \ + am65x-sr2-pru1-prusw-fw.elf \ + am65x-sr2-rtu0-prusw-fw.elf \ + am65x-sr2-rtu1-prusw-fw.elf \ + am65x-sr2-txpru0-prusw-fw.elf \ + am65x-sr2-txpru1-prusw-fw.elf \ +" do_install() { install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss -- cgit v1.2.3-54-g00ecf