Skip to contentSkip to conversation

pruss-fw: am57xx: Update hsr/prp/sw/dual-emac firmware

PATCH In review praneeth 3 participants 7 messages Mar 4, 2022 1 message not in the archive

lore
Share & tools
lore

praneeth

author
#0 lore raw

PATCH 1/1 pruss-fw: am57xx: Update hsr/prp/sw/dual-emac firmware

commit 5a05d0b ("ti-pruss: Update AM57x PRP firmware to 002.020.035") commit d88ee87 ("ti-pruss: Update AM57x HSR firmware to 002.020.035") commit bc428f2 ("ti-pruss: Update AM57x Switch firmware to 003.002.012") commit f154d9e ("ti-pruss: Update AM57x Dual-EMAC firmware to 005.006.018")

has updated hsr/prp/sw/dual-emac pruss firmware version for am57xx.

This fix is to update the version for am57xx and while at it rename the recipes and capture the fix version for am335x, am437x and am57xx in ti-linux-fw.inc.

---
 .../{prueth-fw_5.6.15.bb => prueth-fw.bb}          |  3 +++
 .../{pruhsr-fw_2.17.25.bb => pruhsr-fw.bb}         |  3 +++
 .../{pruprp-fw_2.17.25.bb => pruprp-fw.bb}         |  3 +++
 .../prusw-fw/{prusw-fw_3.2.9.bb => prusw-fw.bb}    |  3 +++
 recipes-bsp/ti-linux-fw/ti-linux-fw.inc            | 14 +++++++++++++-
 5 files changed, 25 insertions(+), 1 deletion(-)
 rename recipes-bsp/prueth-fw/{prueth-fw_5.6.15.bb => prueth-fw.bb} (88%)
 rename recipes-bsp/pruhsr-fw/{pruhsr-fw_2.17.25.bb => pruhsr-fw.bb} (88%)
 rename recipes-bsp/pruprp-fw/{pruprp-fw_2.17.25.bb => pruprp-fw.bb} (88%)
 rename recipes-bsp/prusw-fw/{prusw-fw_3.2.9.bb => prusw-fw.bb} (88%)
recipes-bsp/prueth-fw/prueth-fw.bb renamed from recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb +3 -0
similarity index 88%
rename from recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb
rename to recipes-bsp/prueth-fw/prueth-fw.bb
index f7336fb1..e41bb3c0 100644
@@ -2,6 +2,9 @@ SUMMARY = "PRU Ethernet firmware for AM57xx, AM437x and AM335x"
 
 require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
 
+PV = "${PRUETH_FW_AM335X_VERSION}"
+PV = "${PRUETH_FW_AM437X_VERSION}"
+PV = "${PRUETH_FW_AM57XX_VERSION}"
 PR = "${INC_PR}.0"
 
 CLEANBROKEN = "1"
recipes-bsp/pruhsr-fw/pruhsr-fw.bb renamed from recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb +3 -0
similarity index 88%
rename from recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb
rename to recipes-bsp/pruhsr-fw/pruhsr-fw.bb
index 507a500b..1decd3d6 100644
@@ -3,6 +3,9 @@ SUMMARY = "PRU HSR firmware for AM335x/AM437x/AM57xx"
 require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
 
 PE = "1"
+PV = "${PRUHSR_FW_AM335X_VERSION}"
+PV = "${PRUHSR_FW_AM437X_VERSION}"
+PV = "${PRUHSR_FW_AM57XX_VERSION}"
 PR = "${INC_PR}.0"
 
 CLEANBROKEN = "1"
recipes-bsp/pruprp-fw/pruprp-fw.bb renamed from recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb +3 -0
similarity index 88%
rename from recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb
rename to recipes-bsp/pruprp-fw/pruprp-fw.bb
index ba203948..656a640b 100644
@@ -3,6 +3,9 @@ SUMMARY = "PRU PRP firmware for AM335x/AM437x/AM57xx"
 require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
 
 PE = "1"
+PV = "${PRUPRP_FW_AM335X_VERSION}"
+PV = "${PRUPRP_FW_AM437X_VERSION}"
+PV = "${PRUPRP_FW_AM57XX_VERSION}"
 PR = "${INC_PR}.0"
 
 CLEANBROKEN = "1"
recipes-bsp/prusw-fw/prusw-fw.bb renamed from recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb +3 -0
similarity index 88%
rename from recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb
rename to recipes-bsp/prusw-fw/prusw-fw.bb
index ec0a15f4..ce0e5013 100644
@@ -2,6 +2,9 @@ SUMMARY = "PRU Switch firmware for AM57xx, AM437x and AM335x"
 
 require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
 
+PV = "${PRUSW_FW_AM335X_VERSION}"
+PV = "${PRUSW_FW_AM437X_VERSION}"
+PV = "${PRUSW_FW_AM57XX_VERSION}"
 PR = "${INC_PR}.0"
 
 CLEANBROKEN = "1"
recipes-bsp/ti-linux-fw/ti-linux-fw.inc +13 -1
index fced78fd..368b203f 100644
@@ -12,14 +12,26 @@ SERDES_FW_VERSION = "3.3.0.2c"
 NETCP_SA_FW_VERSION = "1.0.0"
 NETCP_PA_FW_VERSION = "3.0.2.3"
 QMSS_PDSP_FW_VERSION = "1.0.0.9"
+PRUETH_FW_AM335X_VERSION = "REL.PDK_ICSS_EMAC_FW_08.01.00"
+PRUETH_FW_AM437X_VERSION "REL.PDK_ICSS_EMAC_FW_08.01.00"
+PRUETH_FW_AM57XX_VERSION = "5.6.18"
 PRUETH_FW_AM65X_VERSION = "08.00.00.20"
 PRUETH_FW_AM65X_SR2_VERSION = "02.02.09.07"
+PRUHSR_FW_AM335X_VERSION = "2.17.25"
+PRUHSR_FW_AM437X_VERSION = "2.17.25"
+PRUHSR_FW_AM57XX_VERSION = "2.20.35"
+PRUPRP_FW_AM335X_VERSION = "2.17.25"
+PRUPRP_FW_AM437X_VERSION = "2.17.25"
+PRUPRP_FW_AM57XX_VERSION = "2.20.35"
+PRUSW_FW_AM335X_VERSION = "3.2.7"
+PRUSW_FW_AM437X_VERSION = "3.2.7"
+PRUSW_FW_AM57XX_VERSION = "3.2.12"
 GOODIX_FW_VERSION = "1.0.0.0"
 CADENCE_MHDP_FW_VERSION = "1.2.17"
 IMG_DEC_FW_VERSION = "1.0"
 CNM_WAVE521_FW_VERSION = "1.0.00"
 
-TI_LINUX_FW_SRCREV ?= "8810faf0c51a80554150e185122e43bee1553c37"
+TI_LINUX_FW_SRCREV ?= "0f4905088d24e474063f33777559149e11538be5"
 SRCREV = "${TI_LINUX_FW_SRCREV}"
 
 BRANCH ?= "ti-linux-firmware"
Signature · 1 line
2.17.1
author
#1 lore raw
Quoted 11 lines · Praneeth Bajjuri

commit 5a05d0b ("ti-pruss: Update AM57x PRP firmware to 002.020.035") commit d88ee87 ("ti-pruss: Update AM57x HSR firmware to 002.020.035") commit bc428f2 ("ti-pruss: Update AM57x Switch firmware to 003.002.012") commit f154d9e ("ti-pruss: Update AM57x Dual-EMAC firmware to 005.006.018")

has updated hsr/prp/sw/dual-emac pruss firmware version for am57xx.

This fix is to update the version for am57xx and while at it rename the recipes and capture the fix version for am335x, am437x and am57xx in ti-linux-fw.inc.

Ryan,
Have not chance to test this patch. Please review and verify.

Quoted 113 lines
---
  .../{prueth-fw_5.6.15.bb => prueth-fw.bb}          |  3 +++
  .../{pruhsr-fw_2.17.25.bb => pruhsr-fw.bb}         |  3 +++
  .../{pruprp-fw_2.17.25.bb => pruprp-fw.bb}         |  3 +++
  .../prusw-fw/{prusw-fw_3.2.9.bb => prusw-fw.bb}    |  3 +++
  recipes-bsp/ti-linux-fw/ti-linux-fw.inc            | 14 +++++++++++++-
  5 files changed, 25 insertions(+), 1 deletion(-)

rename recipes-bsp/prueth-fw/{prueth-fw_5.6.15.bb => prueth-fw.bb} (88%) rename recipes-bsp/pruhsr-fw/{pruhsr-fw_2.17.25.bb => pruhsr-fw.bb} (88%) rename recipes-bsp/pruprp-fw/{pruprp-fw_2.17.25.bb => pruprp-fw.bb} (88%) rename recipes-bsp/prusw-fw/{prusw-fw_3.2.9.bb => prusw-fw.bb} (88%)

recipes-bsp/prueth-fw/prueth-fw.bb renamed from recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb +3 -0
similarity index 88%
rename from recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb
rename to recipes-bsp/prueth-fw/prueth-fw.bb
index f7336fb1..e41bb3c0 100644
@@ -2,6 +2,9 @@ SUMMARY = "PRU Ethernet firmware for AM57xx, AM437x and AM335x"
 
  require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
 
+PV = "${PRUETH_FW_AM335X_VERSION}"
+PV = "${PRUETH_FW_AM437X_VERSION}"
+PV = "${PRUETH_FW_AM57XX_VERSION}"
  PR = "${INC_PR}.0"
 
  CLEANBROKEN = "1"
recipes-bsp/pruhsr-fw/pruhsr-fw.bb renamed from recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb +3 -0
similarity index 88%
rename from recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb
rename to recipes-bsp/pruhsr-fw/pruhsr-fw.bb
index 507a500b..1decd3d6 100644
@@ -3,6 +3,9 @@ SUMMARY = "PRU HSR firmware for AM335x/AM437x/AM57xx"
  require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
 
  PE = "1"
+PV = "${PRUHSR_FW_AM335X_VERSION}"
+PV = "${PRUHSR_FW_AM437X_VERSION}"
+PV = "${PRUHSR_FW_AM57XX_VERSION}"
  PR = "${INC_PR}.0"
 
  CLEANBROKEN = "1"
recipes-bsp/pruprp-fw/pruprp-fw.bb renamed from recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb +3 -0
similarity index 88%
rename from recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb
rename to recipes-bsp/pruprp-fw/pruprp-fw.bb
index ba203948..656a640b 100644
@@ -3,6 +3,9 @@ SUMMARY = "PRU PRP firmware for AM335x/AM437x/AM57xx"
  require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
 
  PE = "1"
+PV = "${PRUPRP_FW_AM335X_VERSION}"
+PV = "${PRUPRP_FW_AM437X_VERSION}"
+PV = "${PRUPRP_FW_AM57XX_VERSION}"
  PR = "${INC_PR}.0"
 
  CLEANBROKEN = "1"
recipes-bsp/prusw-fw/prusw-fw.bb renamed from recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb +3 -0
similarity index 88%
rename from recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb
rename to recipes-bsp/prusw-fw/prusw-fw.bb
index ec0a15f4..ce0e5013 100644
@@ -2,6 +2,9 @@ SUMMARY = "PRU Switch firmware for AM57xx, AM437x and AM335x"
 
  require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
 
+PV = "${PRUSW_FW_AM335X_VERSION}"
+PV = "${PRUSW_FW_AM437X_VERSION}"
+PV = "${PRUSW_FW_AM57XX_VERSION}"
  PR = "${INC_PR}.0"
 
  CLEANBROKEN = "1"
recipes-bsp/ti-linux-fw/ti-linux-fw.inc +13 -1
index fced78fd..368b203f 100644
@@ -12,14 +12,26 @@ SERDES_FW_VERSION = "3.3.0.2c"
  NETCP_SA_FW_VERSION = "1.0.0"
  NETCP_PA_FW_VERSION = "3.0.2.3"
  QMSS_PDSP_FW_VERSION = "1.0.0.9"
+PRUETH_FW_AM335X_VERSION = "REL.PDK_ICSS_EMAC_FW_08.01.00"
+PRUETH_FW_AM437X_VERSION "REL.PDK_ICSS_EMAC_FW_08.01.00"
+PRUETH_FW_AM57XX_VERSION = "5.6.18"
  PRUETH_FW_AM65X_VERSION = "08.00.00.20"
  PRUETH_FW_AM65X_SR2_VERSION = "02.02.09.07"
+PRUHSR_FW_AM335X_VERSION = "2.17.25"
+PRUHSR_FW_AM437X_VERSION = "2.17.25"
+PRUHSR_FW_AM57XX_VERSION = "2.20.35"
+PRUPRP_FW_AM335X_VERSION = "2.17.25"
+PRUPRP_FW_AM437X_VERSION = "2.17.25"
+PRUPRP_FW_AM57XX_VERSION = "2.20.35"
+PRUSW_FW_AM335X_VERSION = "3.2.7"
+PRUSW_FW_AM437X_VERSION = "3.2.7"
+PRUSW_FW_AM57XX_VERSION = "3.2.12"
  GOODIX_FW_VERSION = "1.0.0.0"
  CADENCE_MHDP_FW_VERSION = "1.2.17"
  IMG_DEC_FW_VERSION = "1.0"
  CNM_WAVE521_FW_VERSION = "1.0.00"
 
-TI_LINUX_FW_SRCREV ?= "8810faf0c51a80554150e185122e43bee1553c37"
+TI_LINUX_FW_SRCREV ?= "0f4905088d24e474063f33777559149e11538be5"
  SRCREV = "${TI_LINUX_FW_SRCREV}"
 
  BRANCH ?= "ti-linux-firmware"
#2 lore raw
In reply to praneeth
Quoted 32 lines · Praneeth Bajjuri

commit 5a05d0b ("ti-pruss: Update AM57x PRP firmware to 002.020.035") commit d88ee87 ("ti-pruss: Update AM57x HSR firmware to 002.020.035") commit bc428f2 ("ti-pruss: Update AM57x Switch firmware to 003.002.012") commit f154d9e ("ti-pruss: Update AM57x Dual-EMAC firmware to 005.006.018")

has updated hsr/prp/sw/dual-emac pruss firmware version for am57xx.

This fix is to update the version for am57xx and while at it rename the recipes and capture the fix version for am335x, am437x and am57xx in ti-linux-fw.inc.

---
  .../{prueth-fw_5.6.15.bb => prueth-fw.bb}          |  3 +++
  .../{pruhsr-fw_2.17.25.bb => pruhsr-fw.bb}         |  3 +++
  .../{pruprp-fw_2.17.25.bb => pruprp-fw.bb}         |  3 +++
  .../prusw-fw/{prusw-fw_3.2.9.bb => prusw-fw.bb}    |  3 +++
  recipes-bsp/ti-linux-fw/ti-linux-fw.inc            | 14 +++++++++++++-
  5 files changed, 25 insertions(+), 1 deletion(-)

rename recipes-bsp/prueth-fw/{prueth-fw_5.6.15.bb => prueth-fw.bb} (88%) rename recipes-bsp/pruhsr-fw/{pruhsr-fw_2.17.25.bb => pruhsr-fw.bb} (88%) rename recipes-bsp/pruprp-fw/{pruprp-fw_2.17.25.bb => pruprp-fw.bb} (88%) rename recipes-bsp/prusw-fw/{prusw-fw_3.2.9.bb => prusw-fw.bb} (88%)

recipes-bsp/prueth-fw/prueth-fw.bb renamed from recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb +0 -0
similarity index 88%
rename from recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb
rename to recipes-bsp/prueth-fw/prueth-fw.bb
index f7336fb1..e41bb3c0 100644

recipes-bsp/prueth-fw/prueth-fw.bb SUMMARY = "PRU Ethernet firmware for AM57xx, AM437x and AM335x" · line 8

Quoted 7 lines
recipes-bsp/prueth-fw/prueth-fw.bb renamed from recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb +3 -0
@@ -2,6 +2,9 @@ SUMMARY = "PRU Ethernet firmware for AM57xx, AM437x and AM335x"
 
  require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
 
+PV = "${PRUETH_FW_AM335X_VERSION}"
+PV = "${PRUETH_FW_AM437X_VERSION}"
+PV = "${PRUETH_FW_AM57XX_VERSION}"
  PR = "${INC_PR}.0"

I think you need to uniquify the PV variable for each platform. Right now you are just resetting each time and not overriding it.

PV_am335x-evm = "${PRUETH_FW_AM335X_VERSION}"
etc...

Quoted 9 lines
recipes-bsp/prueth-fw/prueth-fw.bb renamed from recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb +0 -0
  CLEANBROKEN = "1"
recipes-bsp/pruhsr-fw/pruhsr-fw.bb renamed from recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb +0 -0
similarity index 88%
rename from recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb
rename to recipes-bsp/pruhsr-fw/pruhsr-fw.bb
index 507a500b..1decd3d6 100644

recipes-bsp/pruhsr-fw/pruhsr-fw.bb SUMMARY = "PRU HSR firmware for AM335x/AM437x/AM57xx" · line 9

Quoted 7 lines
recipes-bsp/pruhsr-fw/pruhsr-fw.bb renamed from recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb +3 -0
@@ -3,6 +3,9 @@ SUMMARY = "PRU HSR firmware for AM335x/AM437x/AM57xx"
  require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
 
  PE = "1"
+PV = "${PRUHSR_FW_AM335X_VERSION}"
+PV = "${PRUHSR_FW_AM437X_VERSION}"
+PV = "${PRUHSR_FW_AM57XX_VERSION}"
  PR = "${INC_PR}.0"

Same here.

Quoted 9 lines
recipes-bsp/pruhsr-fw/pruhsr-fw.bb renamed from recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb +0 -0
  CLEANBROKEN = "1"
recipes-bsp/pruprp-fw/pruprp-fw.bb renamed from recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb +0 -0
similarity index 88%
rename from recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb
rename to recipes-bsp/pruprp-fw/pruprp-fw.bb
index ba203948..656a640b 100644

recipes-bsp/pruprp-fw/pruprp-fw.bb SUMMARY = "PRU PRP firmware for AM335x/AM437x/AM57xx" · line 9

Quoted 7 lines
recipes-bsp/pruprp-fw/pruprp-fw.bb renamed from recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb +3 -0
@@ -3,6 +3,9 @@ SUMMARY = "PRU PRP firmware for AM335x/AM437x/AM57xx"
  require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
 
  PE = "1"
+PV = "${PRUPRP_FW_AM335X_VERSION}"
+PV = "${PRUPRP_FW_AM437X_VERSION}"
+PV = "${PRUPRP_FW_AM57XX_VERSION}"
  PR = "${INC_PR}.0"

Same here.

Quoted 9 lines
recipes-bsp/pruprp-fw/pruprp-fw.bb renamed from recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb +0 -0
  CLEANBROKEN = "1"
recipes-bsp/prusw-fw/prusw-fw.bb renamed from recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb +0 -0
similarity index 88%
rename from recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb
rename to recipes-bsp/prusw-fw/prusw-fw.bb
index ec0a15f4..ce0e5013 100644

recipes-bsp/prusw-fw/prusw-fw.bb SUMMARY = "PRU Switch firmware for AM57xx, AM437x and AM335x" · line 8

Quoted 7 lines
recipes-bsp/prusw-fw/prusw-fw.bb renamed from recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb +3 -0
@@ -2,6 +2,9 @@ SUMMARY = "PRU Switch firmware for AM57xx, AM437x and AM335x"
 
  require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
 
+PV = "${PRUSW_FW_AM335X_VERSION}"
+PV = "${PRUSW_FW_AM437X_VERSION}"
+PV = "${PRUSW_FW_AM57XX_VERSION}"
  PR = "${INC_PR}.0"

Same here.

Quoted 33 lines
recipes-bsp/prusw-fw/prusw-fw.bb renamed from recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb +0 -0
  CLEANBROKEN = "1"
recipes-bsp/ti-linux-fw/ti-linux-fw.inc +13 -1
index fced78fd..368b203f 100644
@@ -12,14 +12,26 @@ SERDES_FW_VERSION = "3.3.0.2c"
  NETCP_SA_FW_VERSION = "1.0.0"
  NETCP_PA_FW_VERSION = "3.0.2.3"
  QMSS_PDSP_FW_VERSION = "1.0.0.9"
+PRUETH_FW_AM335X_VERSION = "REL.PDK_ICSS_EMAC_FW_08.01.00"
+PRUETH_FW_AM437X_VERSION "REL.PDK_ICSS_EMAC_FW_08.01.00"
+PRUETH_FW_AM57XX_VERSION = "5.6.18"
  PRUETH_FW_AM65X_VERSION = "08.00.00.20"
  PRUETH_FW_AM65X_SR2_VERSION = "02.02.09.07"
+PRUHSR_FW_AM335X_VERSION = "2.17.25"
+PRUHSR_FW_AM437X_VERSION = "2.17.25"
+PRUHSR_FW_AM57XX_VERSION = "2.20.35"
+PRUPRP_FW_AM335X_VERSION = "2.17.25"
+PRUPRP_FW_AM437X_VERSION = "2.17.25"
+PRUPRP_FW_AM57XX_VERSION = "2.20.35"
+PRUSW_FW_AM335X_VERSION = "3.2.7"
+PRUSW_FW_AM437X_VERSION = "3.2.7"
+PRUSW_FW_AM57XX_VERSION = "3.2.12"
  GOODIX_FW_VERSION = "1.0.0.0"
  CADENCE_MHDP_FW_VERSION = "1.2.17"
  IMG_DEC_FW_VERSION = "1.0"
  CNM_WAVE521_FW_VERSION = "1.0.00"
 
-TI_LINUX_FW_SRCREV ?= "8810faf0c51a80554150e185122e43bee1553c37"
+TI_LINUX_FW_SRCREV ?= "0f4905088d24e474063f33777559149e11538be5"
  SRCREV = "${TI_LINUX_FW_SRCREV}"
 
  BRANCH ?= "ti-linux-firmware"
Signature · 2 lines
Ryan Eatmon
[email protected]
author
#3 lore raw
Quoted 17 lines · Ryan Eatmon
Quoted 13 lines
recipes-bsp/prueth-fw/prueth-fw.bb renamed from recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb +0 -0
similarity index 88%
rename from recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb
rename to recipes-bsp/prueth-fw/prueth-fw.bb
index f7336fb1..e41bb3c0 100644
@@ -2,6 +2,9 @@ SUMMARY = "PRU Ethernet firmware for AM57xx, AM437x 

and AM335x"
  require recipes-bsp/ti-linux-fw/ti-linux-fw.inc

recipes-bsp/prueth-fw/prueth-fw.bb renamed from recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb +3 -0
+PV = "${PRUETH_FW_AM335X_VERSION}"
+PV = "${PRUETH_FW_AM437X_VERSION}"
+PV = "${PRUETH_FW_AM57XX_VERSION}"
Quoted 1 line

  PR = "${INC_PR}.0"

I think you need to uniquify the PV variable for each platform.  Right now you are just resetting each time and not overriding it.

Quoted 2 lines

PV_am335x-evm = "${PRUETH_FW_AM335X_VERSION}"
etc...

Thanks for the quick review,
Does this work instead? PV_ti-soc?

The FW version for each platform could be different as the mentioned commit in commitmessage points to updating the firmware only for am57xx but not for am335x/am437x.

Quoted 1 line
#4 lore raw
Quoted 20 lines · Praneeth
Quoted 17 lines · Ryan Eatmon
Quoted 13 lines
recipes-bsp/prueth-fw/prueth-fw.bb renamed from recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb +0 -0
similarity index 88%
rename from recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb
rename to recipes-bsp/prueth-fw/prueth-fw.bb
index f7336fb1..e41bb3c0 100644
@@ -2,6 +2,9 @@ SUMMARY = "PRU Ethernet firmware for AM57xx, AM437x 

and AM335x"
  require recipes-bsp/ti-linux-fw/ti-linux-fw.inc

recipes-bsp/prueth-fw/prueth-fw.bb renamed from recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb +3 -0
+PV = "${PRUETH_FW_AM335X_VERSION}"
+PV = "${PRUETH_FW_AM437X_VERSION}"
+PV = "${PRUETH_FW_AM57XX_VERSION}"
Quoted 1 line

  PR = "${INC_PR}.0"

I think you need to uniquify the PV variable for each platform.  Right now you are just resetting each time and not overriding it.

Quoted 7 lines
Quoted 2 lines

PV_am335x-evm = "${PRUETH_FW_AM335X_VERSION}"
etc...

Thanks for the quick review,
Does this work instead? PV_ti-soc?

The FW version for each platform could be different as the mentioned commit in commitmessage points to updating the firmware only for am57xx but not for am335x/am437x.

While I think that might technically work, there are only three machines that come into these recipes. I think it would be more confusing for someone reading the recipe to wonder what all makes up ti-soc, rather than just seeing the three specific variables called out. Plus you created three variables in the ti-linux-fw.inc. It would fit more in line with other things in the same recipe to just list them out:

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"

and

PV = ""
PV_ti33x = "${PRUETH_FW_AM335X_VERSION}"
PV_ti43x = "${PRUETH_FW_AM437X_VERSION}"
PV_am57xx-evm = "${PRUETH_FW_AM57XX_VERSION}"
PV_am57xx-hs-evm = "${PRUETH_FW_AM57XX_VERSION}"

Quoted 2 lines
Quoted 2 lines
Signature · 2 lines
Ryan Eatmon
[email protected]
#5 lore raw
Quoted 51 lines · Ryan Eatmon
Quoted 26 lines · Praneeth
Quoted 20 lines · Ryan Eatmon
Quoted 14 lines
recipes-bsp/prueth-fw/prueth-fw.bb renamed from recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb +0 -0
similarity index 88%
rename from recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb
rename to recipes-bsp/prueth-fw/prueth-fw.bb
index f7336fb1..e41bb3c0 100644
@@ -2,6 +2,9 @@ SUMMARY = "PRU Ethernet firmware for AM57xx,

AM437x and AM335x"
  require recipes-bsp/ti-linux-fw/ti-linux-fw.inc

recipes-bsp/prueth-fw/prueth-fw.bb renamed from recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb +3 -0
+PV = "${PRUETH_FW_AM335X_VERSION}"
+PV = "${PRUETH_FW_AM437X_VERSION}"
+PV = "${PRUETH_FW_AM57XX_VERSION}"
Quoted 1 line

  PR = "${INC_PR}.0"

I think you need to uniquify the PV variable for each platform. Right now you are just resetting each time and not overriding it.

Quoted 2 lines

PV_am335x-evm = "${PRUETH_FW_AM335X_VERSION}"
etc...

Quoted 6 lines

Thanks for the quick review,
Does this work instead? PV_ti-soc?

The FW version for each platform could be different as the mentioned commit in commitmessage points to updating the firmware only for am57xx but not for am335x/am437x.

While I think that might technically work, there are only three machines that come into these recipes. I think it would be more confusing for someone reading the recipe to wonder what all makes up ti-soc, rather than just seeing the three specific variables called out. Plus you created three variables in the ti-linux-fw.inc. It would fit more in line with other things in the same recipe to just list them out:

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"

Quoted 7 lines

and

PV = ""
PV_ti33x = "${PRUETH_FW_AM335X_VERSION}"
PV_ti43x = "${PRUETH_FW_AM437X_VERSION}"
PV_am57xx-evm = "${PRUETH_FW_AM57XX_VERSION}"
PV_am57xx-hs-evm = "${PRUETH_FW_AM57XX_VERSION}"

No, PV_ti-soc won't work, it will be the same as plain PV and won't use the correct value per platform.

What Ryan explains is correct - need an override per platform.

BTW, master uses a different override syntax, so this won't apply to master or kirkstone and would need to be updated...

Signature · 4 lines
Regards,
Denys Dmytriyenko <[email protected]>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964

A message that is not in the archive (sent off-list or not yet received): [email protected]

#7 lore raw
Quoted 9 lines · Denys Dmytriyenko
Quoted 8 lines · Ryan Eatmon
Quoted 5 lines · Praneeth
Quoted 2 lines · Ryan Eatmon

recipes-bsp/prueth-fw/prueth-fw.bb

Quoted 2 lines
recipes-bsp/prueth-fw/prueth-fw.bb renamed from recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb +0 -0

Also, might want to name it prueth-fw_git.bb - not required, just a naming convention to indicate it is pulled from git and version is set by recipe.

Quoted 58 lines
Quoted 43 lines
Quoted 21 lines
Quoted 18 lines
Quoted 12 lines

similarity index 88%
rename from recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb rename to recipes-bsp/prueth-fw/prueth-fw.bb index f7336fb1..e41bb3c0 100644

recipes-bsp/prueth-fw/prueth-fw.bb renamed from recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb +0 -0
@@ -2,6 +2,9 @@ SUMMARY = "PRU Ethernet firmware for AM57xx,

AM437x and AM335x"
  require recipes-bsp/ti-linux-fw/ti-linux-fw.inc

recipes-bsp/prueth-fw/prueth-fw.bb renamed from recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb +3 -0
+PV = "${PRUETH_FW_AM335X_VERSION}"
+PV = "${PRUETH_FW_AM437X_VERSION}"
+PV = "${PRUETH_FW_AM57XX_VERSION}"
Quoted 1 line

  PR = "${INC_PR}.0"

I think you need to uniquify the PV variable for each platform. Right now you are just resetting each time and not overriding it.

Quoted 2 lines

PV_am335x-evm = "${PRUETH_FW_AM335X_VERSION}"
etc...

Quoted 6 lines

Thanks for the quick review,
Does this work instead? PV_ti-soc?

The FW version for each platform could be different as the mentioned commit in commitmessage points to updating the firmware only for am57xx but not for am335x/am437x.

While I think that might technically work, there are only three machines that come into these recipes. I think it would be more confusing for someone reading the recipe to wonder what all makes up ti-soc, rather than just seeing the three specific variables called out. Plus you created three variables in the ti-linux-fw.inc. It would fit more in line with other things in the same recipe to just list them out:

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"

Quoted 7 lines

and

PV = ""
PV_ti33x = "${PRUETH_FW_AM335X_VERSION}"
PV_ti43x = "${PRUETH_FW_AM437X_VERSION}"
PV_am57xx-evm = "${PRUETH_FW_AM57XX_VERSION}"
PV_am57xx-hs-evm = "${PRUETH_FW_AM57XX_VERSION}"

No, PV_ti-soc won't work, it will be the same as plain PV and won't use the correct value per platform.

What Ryan explains is correct - need an override per platform.

BTW, master uses a different override syntax, so this won't apply to master or kirkstone and would need to be updated...

Signature · 4 lines
Regards,
Denys Dmytriyenko <[email protected]>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964