From 81b671424f5df102ab7a814454eef30fc89a0517 Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Tue, 12 Mar 2024 10:42:40 -0500 Subject: prueth-fw: Combine PRU-ETH 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-ETH 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 +- meta-ti-bsp/conf/machine/include/am65xx.inc | 2 +- .../prueth-fw/prueth-fw-am65x-sr2_git.bb | 24 ------------------- .../recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb | 22 ----------------- .../recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb | 28 +++++++++++++++------- 6 files changed, 23 insertions(+), 57 deletions(-) delete mode 100644 meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb delete mode 100644 meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb diff --git a/meta-ti-bsp/conf/machine/am65xx-evm.conf b/meta-ti-bsp/conf/machine/am65xx-evm.conf index f6eb6f0c..3d8e11b4 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-am65x-sr2 pruhsr-fw-am65x-sr2 prusw-fw-am65x-sr2" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw pruhsr-fw-am65x-sr2 prusw-fw-am65x-sr2" diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc index 85652eef..fb71d271 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-am65x-sr2 pruhsr-fw-am65x-sr2 prusw-fw-am65x-sr2" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw pruhsr-fw-am65x-sr2 prusw-fw-am65x-sr2" diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc index 7c9d5fb1..80a7744a 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc @@ -26,4 +26,4 @@ TFA_BOARD = "generic" OPTEEMACHINE = "k3-am65x" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw-am65x" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw" diff --git a/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb b/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb deleted file mode 100644 index 4b6ef75d..00000000 --- a/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "PRU Ethernet 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-prueth-fw.elf \ - am65x-sr2-pru1-prueth-fw.elf \ - am65x-sr2-rtu0-prueth-fw.elf \ - am65x-sr2-rtu1-prueth-fw.elf \ - am65x-sr2-txpru0-prueth-fw.elf \ - am65x-sr2-txpru1-prueth-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/prueth-fw/prueth-fw-am65x_git.bb b/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb deleted file mode 100644 index 20b2bfb9..00000000 --- a/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "PRU Ethernet firmware for AM65x SR1.0" - -require recipes-bsp/ti-linux-fw/ti-linux-fw.inc - -PV = "${PRUETH_FW_AM65X_VERSION}" -PR = "${INC_PR}.0" - -COMPATIBLE_MACHINE = "am65xx" - -TARGET = " \ - am65x-pru0-prueth-fw.elf \ - am65x-pru1-prueth-fw.elf \ - am65x-rtu0-prueth-fw.elf \ - am65x-rtu1-prueth-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/prueth-fw/prueth-fw_5.6.15.bb b/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb index 463f3faa..b85355e4 100644 --- a/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb +++ b/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb @@ -1,17 +1,29 @@ -SUMMARY = "PRU Ethernet firmware for AM57xx, AM437x and AM335x" +SUMMARY = "PRU Ethernet 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-prueth-fw.elf am335x-pru1-prueth-fw.elf" -TARGET:ti43x = "am437x-pru0-prueth-fw.elf am437x-pru1-prueth-fw.elf" -TARGET:am57xx = "am57xx-pru0-prueth-fw.elf am57xx-pru1-prueth-fw.elf" +TARGET = " \ + am335x-pru0-prueth-fw.elf \ + am335x-pru1-prueth-fw.elf \ + am437x-pru0-prueth-fw.elf \ + am437x-pru1-prueth-fw.elf \ + am57xx-pru0-prueth-fw.elf \ + am57xx-pru1-prueth-fw.elf \ + am65x-pru0-prueth-fw.elf \ + am65x-pru1-prueth-fw.elf \ + am65x-rtu0-prueth-fw.elf \ + am65x-rtu1-prueth-fw.elf \ + am65x-sr2-pru0-prueth-fw.elf \ + am65x-sr2-pru1-prueth-fw.elf \ + am65x-sr2-rtu0-prueth-fw.elf \ + am65x-sr2-rtu1-prueth-fw.elf \ + am65x-sr2-txpru0-prueth-fw.elf \ + am65x-sr2-txpru1-prueth-fw.elf \ +" do_install() { install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss -- cgit v1.2.3-54-g00ecf