[PATCH v2 0/3] prueth: Update all prueth firmwares

[PATCH v2 0/3] prueth: Update all prueth firmwares

[Lokesh Vutla]

Update the following firmwares to latest version:
- Prueth dual emac
- Prueth switch firmware
- Prueth HSR firmware
- Prueth PRP firmware

Also change the recipe to pick the dual emac and swith firmwares from
ti-linux-firmware repos.

Re-sending this series after subscribing to lists.yoctoproject.org
as the previous post was rejected.

Changes since v1:
- Dropped duplicate PV from hsr/prp recipes
- Used SUMMARY instead of DESCRIPTION

Lokesh Vutla (3):
  prueth-hsr/prp: Update hsr/prp firmwares to latest
  prueth-fw: Package the firmware images from ti-linux-firmware
  prusw-fw: Package the firmware images from ti-linux-firmware

 recipes-bsp/prueth-fw/prueth-fw_5.2.7.bb      | 37 +++++++++++++++
 recipes-bsp/prueth-fw/prueth-fw_git.bb        | 47 -------------------
 ...{pruhsr-fw_git.bb => pruhsr-fw_2.15.23.bb} |  5 +-
 ...{pruprp-fw_git.bb => pruprp-fw_2.15.23.bb} |  5 +-
 recipes-bsp/prusw-fw/prusw-fw_3.0.3.bb        | 37 +++++++++++++++
 recipes-bsp/prusw-fw/prusw-fw_git.bb          | 40 ----------------
 recipes-kernel/linux/linux-ti-staging_5.4.bb  |  1 -
 7 files changed, 80 insertions(+), 92 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
 rename recipes-bsp/pruhsr-fw/{pruhsr-fw_git.bb => pruhsr-fw_2.15.23.bb} (93%)
 rename recipes-bsp/pruprp-fw/{pruprp-fw_git.bb => pruprp-fw_2.15.23.bb} (93%)
 create mode 100644 recipes-bsp/prusw-fw/prusw-fw_3.0.3.bb
 delete mode 100644 recipes-bsp/prusw-fw/prusw-fw_git.bb

-- 
2.23.0

[PATCH v2 1/3] prueth-hsr/prp: Update hsr/prp firmwares to latest

[Lokesh Vutla]

Update the hsr/prp firmwares to latest that includes support for
timestamping rx packets. Unfortunately version number is not
incremented for this update.

Also rename the bb file to add PV in it.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
 .../pruhsr-fw/{pruhsr-fw_git.bb => pruhsr-fw_2.15.23.bb}     | 5 +++--
 .../pruprp-fw/{pruprp-fw_git.bb => pruprp-fw_2.15.23.bb}     | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)
 rename recipes-bsp/pruhsr-fw/{pruhsr-fw_git.bb => pruhsr-fw_2.15.23.bb} (93%)
 rename recipes-bsp/pruprp-fw/{pruprp-fw_git.bb => pruprp-fw_2.15.23.bb} (93%)

diff --git a/recipes-bsp/pruhsr-fw/pruhsr-fw_git.bb b/recipes-bsp/pruhsr-fw/pruhsr-fw_2.15.23.bb
similarity index 93%
rename from recipes-bsp/pruhsr-fw/pruhsr-fw_git.bb
rename to recipes-bsp/pruhsr-fw/pruhsr-fw_2.15.23.bb
index 0c7e7148..1434363f 100644
--- a/recipes-bsp/pruhsr-fw/pruhsr-fw_git.bb
+++ b/recipes-bsp/pruhsr-fw/pruhsr-fw_2.15.23.bb
@@ -3,15 +3,16 @@ SUMMARY = "PRU HSR firmware for AM335x/AM437x/AM57xx"
 LICENSE = "TI-TFL"
 LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
 
-PV = "2.15.23"
 PE = "1"
 PR = "r0"
 
+CLEANBROKEN = "1"
+
 COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|am57xx-hs-evm"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-SRCREV = "313e20f312a286bc07b97ef9aca70ef3ce96af29"
+SRCREV = "7ba9722b74608ad4472790972917e1205eb3c049"
 BRANCH ?= "ti-linux-firmware"
 
 SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"
diff --git a/recipes-bsp/pruprp-fw/pruprp-fw_git.bb b/recipes-bsp/pruprp-fw/pruprp-fw_2.15.23.bb
similarity index 93%
rename from recipes-bsp/pruprp-fw/pruprp-fw_git.bb
rename to recipes-bsp/pruprp-fw/pruprp-fw_2.15.23.bb
index 046e8dad..da381eb0 100644
--- a/recipes-bsp/pruprp-fw/pruprp-fw_git.bb
+++ b/recipes-bsp/pruprp-fw/pruprp-fw_2.15.23.bb
@@ -3,15 +3,16 @@ SUMMARY = "PRU PRP firmware for AM335x/AM437x/AM57xx"
 LICENSE = "TI-TFL"
 LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
 
-PV = "2.15.23"
 PE = "1"
 PR = "r0"
 
+CLEANBROKEN = "1"
+
 COMPATIBLE_MACHINE = "ti33x|ti43x|am57xx-evm|am57xx-hs-evm"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-SRCREV = "313e20f312a286bc07b97ef9aca70ef3ce96af29"
+SRCREV = "7ba9722b74608ad4472790972917e1205eb3c049"
 BRANCH ?= "ti-linux-firmware"
 
 SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"
-- 
2.23.0

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

[Lokesh Vutla]

Directly take the images from ti-linux-firmware instead of using pdk
Aldo drop build for k2g as firmwares are not yet available.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
 recipes-bsp/prueth-fw/prueth-fw_5.2.7.bb     | 37 +++++++++++++++
 recipes-bsp/prueth-fw/prueth-fw_git.bb       | 47 --------------------
 recipes-kernel/linux/linux-ti-staging_5.4.bb |  1 -
 3 files changed, 37 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..2840b2f1
--- /dev/null
+++ b/recipes-bsp/prueth-fw/prueth-fw_5.2.7.bb
@@ -0,0 +1,37 @@
+SUMMARY = "PRU Ethernet firmware for AM57xx, AM437x and AM335x"
+
+LICENSE = "TI-TFL"
+LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
+
+PR = "r0"
+
+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

[PATCH v2 3/3] prusw-fw: Package the firmware images from ti-linux-firmware

[Lokesh Vutla]

Directly take the images from ti-linux-firmware instead of using pdk

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
 recipes-bsp/prusw-fw/prusw-fw_3.0.3.bb | 37 ++++++++++++++++++++++++
 recipes-bsp/prusw-fw/prusw-fw_git.bb   | 40 --------------------------
 2 files changed, 37 insertions(+), 40 deletions(-)
 create mode 100644 recipes-bsp/prusw-fw/prusw-fw_3.0.3.bb
 delete mode 100644 recipes-bsp/prusw-fw/prusw-fw_git.bb

diff --git a/recipes-bsp/prusw-fw/prusw-fw_3.0.3.bb b/recipes-bsp/prusw-fw/prusw-fw_3.0.3.bb
new file mode 100644
index 00000000..6eac87c5
--- /dev/null
+++ b/recipes-bsp/prusw-fw/prusw-fw_3.0.3.bb
@@ -0,0 +1,37 @@
+SUMMARY = "PRU Switch firmware for AM57xx, AM437x and AM335x"
+
+LICENSE = "TI-TFL"
+LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
+
+PR = "r0"
+
+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-prusw-fw.elf am335x-pru1-prusw-fw.elf"
+TARGET_ti43x = "am437x-pru0-prusw-fw.elf am437x-pru1-prusw-fw.elf"
+TARGET_am57xx-evm = "am57xx-pru0-prusw-fw.elf am57xx-pru1-prusw-fw.elf"
+TARGET_am57xx-hs-evm = "am57xx-pru0-prusw-fw.elf am57xx-pru1-prusw-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/prusw-fw/prusw-fw_git.bb b/recipes-bsp/prusw-fw/prusw-fw_git.bb
deleted file mode 100644
index 2921fb1d..00000000
--- a/recipes-bsp/prusw-fw/prusw-fw_git.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-DESCRIPTION = "PRU Switch firmware for AM57xx"
-
-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_switch"
-
-COMPATIBLE_MACHINE = "dra7xx"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-DEPENDS = "ti-cgt-pru-native"
-
-PRU_VERSION = ""
-PRU_VERSION_dra7xx = "REV2"
-
-FW_PREFIX = ""
-FW_PREFIX_dra7xx = "am57xx"
-
-
-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_stp_switch_PRU0.elf \
-		${D}${base_libdir}/firmware/ti-pruss/${FW_PREFIX}-pru0-prusw-fw.elf
-	install -m 0644 ./elf/${PRU_VERSION}/icss_stp_switch_PRU1.elf \
-		${D}${base_libdir}/firmware/ti-pruss/${FW_PREFIX}-pru1-prusw-fw.elf
-}
-
-FILES_${PN} = "${base_libdir}/firmware"
-
-INSANE_SKIP_${PN} = "arch"
-- 
2.23.0