Re: [PATCH 2/3] prueth-fw: Package the firmware images from ti-linux-firmware


Suman Anna
 

Hi Denys,

On 8/21/20 1:53 PM, Denys Dmytriyenko wrote:
On Fri, Aug 21, 2020 at 01:02:37PM +0530, Lokesh Vutla wrote:
Directly take the images from ti-linux-firmware instead of using pdk
Aldo drop build for k2g as firmwares are not yet available.
Same comment for the version/PV use.

Also, are there any alternatives that need to be setup with symlinks for these
firmware images and PRU in general? E.g. pru-icss sets symlinks am335x-pru0-fw
and am57xx-pru1_0-fw to point to Halt vs. Echo images. Is this needed for
prueth, pruhsr, pruprp or prusw images? Suman?
PRU firmwares follow a mixed-style. The PRU remoteproc drivers do not support
remoteproc auto-boot and can let the PRU client drivers set the firmware name
(either through DT or coded up in the driver) before booting the corresponding
remoteprocs. PRU Ethernet follows the latter option, and chooses the right
firmware depending on the protocol it is configured for. The firmware names used
by the PRU remoteproc driver is therefore less relevant when compared to the
other remoteproc drivers.

regards
Suman



Signed-off-by: Lokesh Vutla <lokeshvutla@...>
---
recipes-bsp/prueth-fw/prueth-fw_5.2.7.bb | 38 ++++++++++++++++
recipes-bsp/prueth-fw/prueth-fw_git.bb | 47 --------------------
recipes-kernel/linux/linux-ti-staging_5.4.bb | 1 -
3 files changed, 38 insertions(+), 48 deletions(-)
create mode 100644 recipes-bsp/prueth-fw/prueth-fw_5.2.7.bb
delete mode 100644 recipes-bsp/prueth-fw/prueth-fw_git.bb

diff --git a/recipes-bsp/prueth-fw/prueth-fw_5.2.7.bb b/recipes-bsp/prueth-fw/prueth-fw_5.2.7.bb
new file mode 100644
index 00000000..1847c221
--- /dev/null
+++ b/recipes-bsp/prueth-fw/prueth-fw_5.2.7.bb
@@ -0,0 +1,38 @@
+DESCRIPTION = "PRU Ethernet firmware for AM57xx, AM437x and AM335x"
Use SUMMARY instead.


+LICENSE = "TI-TFL"
+LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
+
+PV = "5.2.7"
+PR = "r1"
Please drop PR for the new recipe.


+CLEANBROKEN = "1"
+
+COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|am57xx-hs-evm"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+SRCREV = "7ba9722b74608ad4472790972917e1205eb3c049"
+BRANCH ?= "ti-linux-firmware"
+
+SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"
+
+S = "${WORKDIR}/git"
+
+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-evm = "am57xx-pru0-prueth-fw.elf am57xx-pru1-prueth-fw.elf"
+TARGET_am57xx-hs-evm = "am57xx-pru0-prueth-fw.elf am57xx-pru1-prueth-fw.elf"
+
+do_install() {
+ install -d ${D}${base_libdir}/firmware/ti-pruss
+ for f in ${TARGET}; do
+ install -m 0644 ${S}/ti-pruss/$f ${D}${base_libdir}/firmware/ti-pruss/$f
+ done
+}
+
+
+FILES_${PN} = "${base_libdir}/firmware"
+
+INSANE_SKIP_${PN} = "arch"
diff --git a/recipes-bsp/prueth-fw/prueth-fw_git.bb b/recipes-bsp/prueth-fw/prueth-fw_git.bb
deleted file mode 100644
index f7718ad2..00000000
--- a/recipes-bsp/prueth-fw/prueth-fw_git.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-DESCRIPTION = "PRU Ethernet firmware for AM57xx, AM437x, AM335x and K2G"
-
-require recipes-ti/includes/ti-paths.inc
-require recipes-bsp/icss-emac-lld/icss-emac-lld.inc
-
-LICENSE = "TI-TFL"
-LIC_FILES_CHKSUM = "file://icss_dualemac/src/firmware_version.h;beginline=6;endline=53;md5=1f0a640a261059cdcbbcf01e6a739ff3"
-
-PR = "${INC_PR}.0"
-
-TI_PDK_COMP = "ti.drv.icss_emac.firmware"
-
-B = "${S}/icss_dualemac"
-
-COMPATIBLE_MACHINE = "am57xx-evm|am57xx-hs-evm|ti43x|ti33x|k2g"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-DEPENDS = "ti-cgt-pru-native"
-
-PRU_VERSION = ""
-PRU_VERSION_ti33x = "REV1"
-PRU_VERSION_ti43x = "REV1"
-PRU_VERSION_am57xx-evm = "REV2"
-PRU_VERSION_am57xx-hs-evm = "REV2"
-PRU_VERSION_k2g = "REV2"
-
-FW_PREFIX = ""
-FW_PREFIX_ti33x = "am335x"
-FW_PREFIX_ti43x = "am437x"
-FW_PREFIX_am57xx-evm = "am57xx"
-FW_PREFIX_am57xx-hs-evm = "am57xx"
-FW_PREFIX_k2g = "k2g"
-
-EXTRA_OEMAKE += "CL_PRU_INSTALL_PATH="${TI_CGT_PRU_INSTALL_DIR}" PRU_VERSION_LIST="${PRU_VERSION}""
-
-do_install() {
- install -d ${D}${base_libdir}/firmware/ti-pruss
- install -m 0644 ./elf/${PRU_VERSION}/icss_dualemac_PRU0.elf \
- ${D}${base_libdir}/firmware/ti-pruss/${FW_PREFIX}-pru0-prueth-fw.elf
- install -m 0644 ./elf/${PRU_VERSION}/icss_dualemac_PRU1.elf \
- ${D}${base_libdir}/firmware/ti-pruss/${FW_PREFIX}-pru1-prueth-fw.elf
-}
-
-FILES_${PN} = "${base_libdir}/firmware"
-
-INSANE_SKIP_${PN} = "arch"
diff --git a/recipes-kernel/linux/linux-ti-staging_5.4.bb b/recipes-kernel/linux/linux-ti-staging_5.4.bb
index 3a4fdd86..2a35bf1d 100644
--- a/recipes-kernel/linux/linux-ti-staging_5.4.bb
+++ b/recipes-kernel/linux/linux-ti-staging_5.4.bb
@@ -48,7 +48,6 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am57xx-evm = " prueth-fw prusw-fw pr
RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am57xx-hs-evm = " prueth-fw prusw-fw pruhsr-fw pruprp-fw"
RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_ti43x = " prueth-fw pruhsr-fw pruprp-fw"
RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_ti33x = " prueth-fw pruhsr-fw pruprp-fw"
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_k2g = " prueth-fw"
RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am65xx = " prueth-fw-am65x"
RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am65xx-evm = " prueth-fw-am65x-sr2"

--
2.23.0

Join meta-ti@lists.yoctoproject.org to automatically receive all group messages.