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-HSR firmwares into single package.
Signed-off-by: Andrew Davis <[email protected]> --- meta-ti-bsp/conf/machine/am65xx-evm.conf | 2 +- meta-ti-bsp/conf/machine/include/am64xx.inc | 2 +- .../pruhsr-fw/pruhsr-fw-am65x-sr2_git.bb | 24 ------------------- .../pruhsr-fw/pruhsr-fw_2.17.25.bb | 24 ++++++++++++------- 4 files changed, 18 insertions(+), 34 deletions(-) delete mode 100644 meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-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 3d8e11b4..7df93db7 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-am65x-sr2 prusw-fw-am65x-sr2" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw pruhsr-fw 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 fb71d271..de65829c 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-am65x-sr2 prusw-fw-am65x-sr2" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw pruhsr-fw prusw-fw-am65x-sr2" diff --git a/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw-am65x-sr2_git.bb b/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw-am65x-sr2_git.bb deleted file mode 100644 index bc731094..00000000 --- a/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw-am65x-sr2_git.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "PRU HSR 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-pruhsr-fw.elf \ - am65x-sr2-pru1-pruhsr-fw.elf \ - am65x-sr2-rtu0-pruhsr-fw.elf \ - am65x-sr2-rtu1-pruhsr-fw.elf \ - am65x-sr2-txpru0-pruhsr-fw.elf \ - am65x-sr2-txpru1-pruhsr-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/pruhsr-fw/pruhsr-fw_2.17.25.bb b/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb index fe99cb3e..3b06de9c 100644 --- a/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb +++ b/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb @@ -1,18 +1,26 @@ -SUMMARY = "PRU HSR firmware for AM335x/AM437x/AM57xx" +SUMMARY = "PRU HSR firmware" require recipes-bsp/ti-linux-fw/ti-linux-fw.inc PE = "1" 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-pruhsr-fw.elf am335x-pru1-pruhsr-fw.elf" -TARGET:ti43x = "am437x-pru0-pruhsr-fw.elf am437x-pru1-pruhsr-fw.elf" -TARGET:am57xx = "am57xx-pru0-pruhsr-fw.elf am57xx-pru1-pruhsr-fw.elf" +TARGET = " \ + am335x-pru0-pruhsr-fw.elf \ + am335x-pru1-pruhsr-fw.elf \ + am437x-pru0-pruhsr-fw.elf \ + am437x-pru1-pruhsr-fw.elf \ + am57xx-pru0-pruhsr-fw.elf \ + am57xx-pru1-pruhsr-fw.elf \ + am65x-sr2-pru0-pruhsr-fw.elf \ + am65x-sr2-pru1-pruhsr-fw.elf \ + am65x-sr2-rtu0-pruhsr-fw.elf \ + am65x-sr2-rtu1-pruhsr-fw.elf \ + am65x-sr2-txpru0-pruhsr-fw.elf \ + am65x-sr2-txpru1-pruhsr-fw.elf \ +" do_install() { install -d ${D}${nonarch_base_libdir}/firmware/ti-pruss -- 2.39.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#17514): https://lists.yoctoproject.org/g/meta-ti/message/17514 Mute This Topic: https://lists.yoctoproject.org/mt/104886930/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
