From: Andrew Davis <afd@ti.com>
To: Denys Dmytriyenko <denys@konsulko.com>,
Ryan Eatmon <reatmon@ti.com>, <meta-ti@lists.yoctoproject.org>
Cc: Andrew Davis <afd@ti.com>
Subject: [meta-ti][master][PATCH 4/5] prusw-fw: Combine PRU-Switch firmwares into single package
Date: Tue, 12 Mar 2024 10:42:42 -0500 [thread overview]
Message-ID: <20240312154243.17627-4-afd@ti.com> (raw)
In-Reply-To: <20240312154243.17627-1-afd@ti.com>
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 <afd@ti.com>
---
meta-ti-bsp/conf/machine/am65xx-evm.conf | 2 +-
meta-ti-bsp/conf/machine/include/am64xx.inc | 2 +-
.../prusw-fw/prusw-fw-am65x-sr2_git.bb | 24 -------------------
.../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
--
2.39.2
next prev parent reply other threads:[~2024-03-12 15:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-12 15:42 [meta-ti][master][PATCH 1/5] recipes-bsp: Do not use MACHINE_ARCH when package is not machine specific Andrew Davis
2024-03-12 15:42 ` [meta-ti][master][PATCH 2/5] prueth-fw: Combine PRU-ETH firmwares into single package Andrew Davis
2024-03-12 15:42 ` [meta-ti][master][PATCH 3/5] pruhsr-fw: Combine PRU-HSR " Andrew Davis
2024-03-12 15:42 ` Andrew Davis [this message]
2024-03-12 15:42 ` [meta-ti][master][PATCH 5/5] pruprp-fw: Do not make this firmware package machine specific Andrew Davis
2024-03-13 6:17 ` [EXTERNAL] [meta-ti][master][PATCH 1/5] recipes-bsp: Do not use MACHINE_ARCH when package is not " Chirag Shilwant
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240312154243.17627-4-afd@ti.com \
--to=afd@ti.com \
--cc=denys@konsulko.com \
--cc=meta-ti@lists.yoctoproject.org \
--cc=reatmon@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.