* [PATCH 0/3] prueth: Update all prueth firmwares
@ 2020-08-21 7:32 lokeshvutla
2020-08-21 7:32 ` [PATCH 1/3] prueth-hsr/prp: Update hsr/prp firmwares to latest Lokesh Vutla
` (3 more replies)
0 siblings, 4 replies; 15+ messages in thread
From: lokeshvutla @ 2020-08-21 7:32 UTC (permalink / raw)
To: meta-ti, denys; +Cc: Sekhar Nori, m-erdahl, m-karicheri2, 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.
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 | 38 +++++++++++++++
recipes-bsp/prueth-fw/prueth-fw_git.bb | 47 -------------------
...{pruhsr-fw_git.bb => pruhsr-fw_2.15.23.bb} | 4 +-
...{pruprp-fw_git.bb => pruprp-fw_2.15.23.bb} | 4 +-
recipes-bsp/prusw-fw/prusw-fw_3.0.0.bb | 38 +++++++++++++++
recipes-bsp/prusw-fw/prusw-fw_git.bb | 40 ----------------
recipes-kernel/linux/linux-ti-staging_5.4.bb | 1 -
7 files changed, 82 insertions(+), 90 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.0.bb
delete mode 100644 recipes-bsp/prusw-fw/prusw-fw_git.bb
--
2.23.0
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 1/3] prueth-hsr/prp: Update hsr/prp firmwares to latest
2020-08-21 7:32 [PATCH 0/3] prueth: Update all prueth firmwares lokeshvutla
@ 2020-08-21 7:32 ` Lokesh Vutla
2020-08-21 18:40 ` Denys Dmytriyenko
2020-08-21 7:32 ` [PATCH 2/3] prueth-fw: Package the firmware images from ti-linux-firmware Lokesh Vutla
` (2 subsequent siblings)
3 siblings, 1 reply; 15+ messages in thread
From: Lokesh Vutla @ 2020-08-21 7:32 UTC (permalink / raw)
To: meta-ti, denys; +Cc: Sekhar Nori, m-erdahl, m-karicheri2, 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} | 4 +++-
.../pruprp-fw/{pruprp-fw_git.bb => pruprp-fw_2.15.23.bb} | 4 +++-
2 files changed, 6 insertions(+), 2 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..aebe255e 100644
--- a/recipes-bsp/pruhsr-fw/pruhsr-fw_git.bb
+++ b/recipes-bsp/pruhsr-fw/pruhsr-fw_2.15.23.bb
@@ -7,11 +7,13 @@ 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..e0e36c2d 100644
--- a/recipes-bsp/pruprp-fw/pruprp-fw_git.bb
+++ b/recipes-bsp/pruprp-fw/pruprp-fw_2.15.23.bb
@@ -7,11 +7,13 @@ 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
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 2/3] prueth-fw: Package the firmware images from ti-linux-firmware
2020-08-21 7:32 [PATCH 0/3] prueth: Update all prueth firmwares lokeshvutla
2020-08-21 7:32 ` [PATCH 1/3] prueth-hsr/prp: Update hsr/prp firmwares to latest Lokesh Vutla
@ 2020-08-21 7:32 ` Lokesh Vutla
2020-08-21 18:53 ` Denys Dmytriyenko
2020-08-21 7:32 ` [PATCH 3/3] prusw-fw: " Lokesh Vutla
2020-08-21 18:34 ` [PATCH 0/3] prueth: Update all prueth firmwares Denys Dmytriyenko
3 siblings, 1 reply; 15+ messages in thread
From: Lokesh Vutla @ 2020-08-21 7:32 UTC (permalink / raw)
To: meta-ti, denys; +Cc: Sekhar Nori, m-erdahl, m-karicheri2, 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 | 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"
+
+LICENSE = "TI-TFL"
+LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
+
+PV = "5.2.7"
+PR = "r1"
+
+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
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 3/3] prusw-fw: Package the firmware images from ti-linux-firmware
2020-08-21 7:32 [PATCH 0/3] prueth: Update all prueth firmwares lokeshvutla
2020-08-21 7:32 ` [PATCH 1/3] prueth-hsr/prp: Update hsr/prp firmwares to latest Lokesh Vutla
2020-08-21 7:32 ` [PATCH 2/3] prueth-fw: Package the firmware images from ti-linux-firmware Lokesh Vutla
@ 2020-08-21 7:32 ` Lokesh Vutla
2020-08-21 18:54 ` Denys Dmytriyenko
2020-08-21 18:34 ` [PATCH 0/3] prueth: Update all prueth firmwares Denys Dmytriyenko
3 siblings, 1 reply; 15+ messages in thread
From: Lokesh Vutla @ 2020-08-21 7:32 UTC (permalink / raw)
To: meta-ti, denys; +Cc: Sekhar Nori, m-erdahl, m-karicheri2, 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.0.bb | 38 ++++++++++++++++++++++++
recipes-bsp/prusw-fw/prusw-fw_git.bb | 40 --------------------------
2 files changed, 38 insertions(+), 40 deletions(-)
create mode 100644 recipes-bsp/prusw-fw/prusw-fw_3.0.0.bb
delete mode 100644 recipes-bsp/prusw-fw/prusw-fw_git.bb
diff --git a/recipes-bsp/prusw-fw/prusw-fw_3.0.0.bb b/recipes-bsp/prusw-fw/prusw-fw_3.0.0.bb
new file mode 100644
index 00000000..514237eb
--- /dev/null
+++ b/recipes-bsp/prusw-fw/prusw-fw_3.0.0.bb
@@ -0,0 +1,38 @@
+DESCRIPTION = "PRU Switch firmware for AM57xx, AM437x and AM335x"
+
+LICENSE = "TI-TFL"
+LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
+
+PV = "3.0.3"
+PR = "r1"
+
+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
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 0/3] prueth: Update all prueth firmwares
2020-08-21 7:32 [PATCH 0/3] prueth: Update all prueth firmwares lokeshvutla
` (2 preceding siblings ...)
2020-08-21 7:32 ` [PATCH 3/3] prusw-fw: " Lokesh Vutla
@ 2020-08-21 18:34 ` Denys Dmytriyenko
3 siblings, 0 replies; 15+ messages in thread
From: Denys Dmytriyenko @ 2020-08-21 18:34 UTC (permalink / raw)
To: Lokesh Vutla; +Cc: meta-ti, Sekhar Nori, m-erdahl, m-karicheri2
Thanks, Lokesh. Overall this looks fine, I had few minor comments.
On Fri, Aug 21, 2020 at 01:02:35PM +0530, Lokesh Vutla wrote:
> 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.
>
> 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 | 38 +++++++++++++++
> recipes-bsp/prueth-fw/prueth-fw_git.bb | 47 -------------------
> ...{pruhsr-fw_git.bb => pruhsr-fw_2.15.23.bb} | 4 +-
> ...{pruprp-fw_git.bb => pruprp-fw_2.15.23.bb} | 4 +-
> recipes-bsp/prusw-fw/prusw-fw_3.0.0.bb | 38 +++++++++++++++
> recipes-bsp/prusw-fw/prusw-fw_git.bb | 40 ----------------
> recipes-kernel/linux/linux-ti-staging_5.4.bb | 1 -
> 7 files changed, 82 insertions(+), 90 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.0.bb
> delete mode 100644 recipes-bsp/prusw-fw/prusw-fw_git.bb
>
> --
> 2.23.0
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/3] prueth-hsr/prp: Update hsr/prp firmwares to latest
2020-08-21 7:32 ` [PATCH 1/3] prueth-hsr/prp: Update hsr/prp firmwares to latest Lokesh Vutla
@ 2020-08-21 18:40 ` Denys Dmytriyenko
2020-08-23 9:40 ` Lokesh Vutla
0 siblings, 1 reply; 15+ messages in thread
From: Denys Dmytriyenko @ 2020-08-21 18:40 UTC (permalink / raw)
To: Lokesh Vutla; +Cc: meta-ti, Sekhar Nori, m-erdahl, m-karicheri2
On Fri, Aug 21, 2020 at 01:02:36PM +0530, Lokesh Vutla wrote:
> 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.
This is fine, but you need to choose which one provides the correct PV.
Currently you have it duplicated:
pruhsr-fw_2.15.23.bb will set PV = "2.15.23" automatically from the filename,
but you also have existing PV = "2.15.23" inside the recipe. Same for other
recipe.
The recommendation is to set PV in the filename for released tarballs.
When the code is pulled directly from git, it is acceptable (and sometimes
even preferred) to use _git in the filename and set PV explicitly inside the
recipe. And if you expect these to be updated regularly, you can avoid churn
of renaming the recipe with the new version. Also that's preferred for
packages (probably not in this case) that need to be AUTOREV-ed to the latest
for any nightly CI atuomation...
--
Denys
> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
> ---
> .../pruhsr-fw/{pruhsr-fw_git.bb => pruhsr-fw_2.15.23.bb} | 4 +++-
> .../pruprp-fw/{pruprp-fw_git.bb => pruprp-fw_2.15.23.bb} | 4 +++-
> 2 files changed, 6 insertions(+), 2 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..aebe255e 100644
> --- a/recipes-bsp/pruhsr-fw/pruhsr-fw_git.bb
> +++ b/recipes-bsp/pruhsr-fw/pruhsr-fw_2.15.23.bb
> @@ -7,11 +7,13 @@ 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..e0e36c2d 100644
> --- a/recipes-bsp/pruprp-fw/pruprp-fw_git.bb
> +++ b/recipes-bsp/pruprp-fw/pruprp-fw_2.15.23.bb
> @@ -7,11 +7,13 @@ 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
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/3] prueth-fw: Package the firmware images from ti-linux-firmware
2020-08-21 7:32 ` [PATCH 2/3] prueth-fw: Package the firmware images from ti-linux-firmware Lokesh Vutla
@ 2020-08-21 18:53 ` Denys Dmytriyenko
2020-08-24 15:29 ` Suman Anna
0 siblings, 1 reply; 15+ messages in thread
From: Denys Dmytriyenko @ 2020-08-21 18:53 UTC (permalink / raw)
To: Lokesh Vutla; +Cc: meta-ti, Sekhar Nori, m-erdahl, m-karicheri2, s-anna
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?
> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
> ---
> 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
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 3/3] prusw-fw: Package the firmware images from ti-linux-firmware
2020-08-21 7:32 ` [PATCH 3/3] prusw-fw: " Lokesh Vutla
@ 2020-08-21 18:54 ` Denys Dmytriyenko
2020-08-23 9:54 ` Lokesh Vutla
0 siblings, 1 reply; 15+ messages in thread
From: Denys Dmytriyenko @ 2020-08-21 18:54 UTC (permalink / raw)
To: Lokesh Vutla; +Cc: meta-ti, Sekhar Nori, m-erdahl, m-karicheri2
On Fri, Aug 21, 2020 at 01:02:38PM +0530, Lokesh Vutla wrote:
> 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.0.bb | 38 ++++++++++++++++++++++++
> recipes-bsp/prusw-fw/prusw-fw_git.bb | 40 --------------------------
> 2 files changed, 38 insertions(+), 40 deletions(-)
> create mode 100644 recipes-bsp/prusw-fw/prusw-fw_3.0.0.bb
> delete mode 100644 recipes-bsp/prusw-fw/prusw-fw_git.bb
>
> diff --git a/recipes-bsp/prusw-fw/prusw-fw_3.0.0.bb b/recipes-bsp/prusw-fw/prusw-fw_3.0.0.bb
> new file mode 100644
> index 00000000..514237eb
> --- /dev/null
> +++ b/recipes-bsp/prusw-fw/prusw-fw_3.0.0.bb
> @@ -0,0 +1,38 @@
> +DESCRIPTION = "PRU Switch firmware for AM57xx, AM437x and AM335x"
Use SUMMARY here
> +LICENSE = "TI-TFL"
> +LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
> +
> +PV = "3.0.3"
So, the filename sets PV to 3.0.0, but here it's 3.0.3?
> +PR = "r1"
Drop PR
> +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
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/3] prueth-hsr/prp: Update hsr/prp firmwares to latest
2020-08-21 18:40 ` Denys Dmytriyenko
@ 2020-08-23 9:40 ` Lokesh Vutla
2020-08-25 16:54 ` Denys Dmytriyenko
0 siblings, 1 reply; 15+ messages in thread
From: Lokesh Vutla @ 2020-08-23 9:40 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-ti, Sekhar Nori, m-erdahl, m-karicheri2
Hi Denys,
On 22/08/20 12:10 am, Denys Dmytriyenko wrote:
> On Fri, Aug 21, 2020 at 01:02:36PM +0530, Lokesh Vutla wrote:
>> 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.
>
> This is fine, but you need to choose which one provides the correct PV.
> Currently you have it duplicated:
>
> pruhsr-fw_2.15.23.bb will set PV = "2.15.23" automatically from the filename,
> but you also have existing PV = "2.15.23" inside the recipe. Same for other
> recipe.
>
> The recommendation is to set PV in the filename for released tarballs.
>
> When the code is pulled directly from git, it is acceptable (and sometimes
> even preferred) to use _git in the filename and set PV explicitly inside the
> recipe. And if you expect these to be updated regularly, you can avoid churn
> of renaming the recipe with the new version. Also that's preferred for
> packages (probably not in this case) that need to be AUTOREV-ed to the latest
> for any nightly CI atuomation...
Thanks for the explanation. Will remove the duplicate inside the FILE. Also what
about PE and PR?
Thanks and regards,
Lokesh
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 3/3] prusw-fw: Package the firmware images from ti-linux-firmware
2020-08-21 18:54 ` Denys Dmytriyenko
@ 2020-08-23 9:54 ` Lokesh Vutla
2020-08-25 16:23 ` Lokesh Vutla
2020-08-25 16:57 ` Denys Dmytriyenko
0 siblings, 2 replies; 15+ messages in thread
From: Lokesh Vutla @ 2020-08-23 9:54 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-ti, Sekhar Nori, m-erdahl, m-karicheri2
On 22/08/20 12:24 am, Denys Dmytriyenko wrote:
> On Fri, Aug 21, 2020 at 01:02:38PM +0530, Lokesh Vutla wrote:
>> 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.0.bb | 38 ++++++++++++++++++++++++
>> recipes-bsp/prusw-fw/prusw-fw_git.bb | 40 --------------------------
>> 2 files changed, 38 insertions(+), 40 deletions(-)
>> create mode 100644 recipes-bsp/prusw-fw/prusw-fw_3.0.0.bb
>> delete mode 100644 recipes-bsp/prusw-fw/prusw-fw_git.bb
>>
>> diff --git a/recipes-bsp/prusw-fw/prusw-fw_3.0.0.bb b/recipes-bsp/prusw-fw/prusw-fw_3.0.0.bb
>> new file mode 100644
>> index 00000000..514237eb
>> --- /dev/null
>> +++ b/recipes-bsp/prusw-fw/prusw-fw_3.0.0.bb
>> @@ -0,0 +1,38 @@
>> +DESCRIPTION = "PRU Switch firmware for AM57xx, AM437x and AM335x"
>
> Use SUMMARY here
Sure
>
>
>> +LICENSE = "TI-TFL"
>> +LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
>> +
>> +PV = "3.0.3"
>
> So, the filename sets PV to 3.0.0, but here it's 3.0.3?
3.0.3 will fix the file name.
>
>
>> +PR = "r1"
>
> Drop PR
If PR is not added, the below error occurs. What could be wrong?
ERROR: prusw-fw-3.0.3-r0 do_packagedata: QA Issue: Package version for package prusw-fw-src went backwards which would break package feeds (from 0:3.0.3-r1.0 to 0:3.0.3-r0.1) [version-going-backwards]
ERROR: prusw-fw-3.0.3-r0 do_packagedata: QA Issue: Package version for package prusw-fw-dbg went backwards which would break package feeds (from 0:3.0.3-r1.0 to 0:3.0.3-r0.1) [version-going-backwards]
Thanks and regards,
Lokesh
>
>
>> +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
>>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/3] prueth-fw: Package the firmware images from ti-linux-firmware
2020-08-21 18:53 ` Denys Dmytriyenko
@ 2020-08-24 15:29 ` Suman Anna
2020-08-25 16:45 ` Denys Dmytriyenko
0 siblings, 1 reply; 15+ messages in thread
From: Suman Anna @ 2020-08-24 15:29 UTC (permalink / raw)
To: Denys Dmytriyenko, Lokesh Vutla
Cc: meta-ti, Sekhar Nori, m-erdahl, m-karicheri2
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@ti.com>
>> ---
>> 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
>>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 3/3] prusw-fw: Package the firmware images from ti-linux-firmware
2020-08-23 9:54 ` Lokesh Vutla
@ 2020-08-25 16:23 ` Lokesh Vutla
2020-08-25 16:57 ` Denys Dmytriyenko
1 sibling, 0 replies; 15+ messages in thread
From: Lokesh Vutla @ 2020-08-25 16:23 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-ti, Sekhar Nori, m-erdahl, m-karicheri2
Hi Denys,
On 23/08/20 3:24 pm, Lokesh Vutla wrote:
>
>
> On 22/08/20 12:24 am, Denys Dmytriyenko wrote:
>> On Fri, Aug 21, 2020 at 01:02:38PM +0530, Lokesh Vutla wrote:
>>> 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.0.bb | 38 ++++++++++++++++++++++++
>>> recipes-bsp/prusw-fw/prusw-fw_git.bb | 40 --------------------------
>>> 2 files changed, 38 insertions(+), 40 deletions(-)
>>> create mode 100644 recipes-bsp/prusw-fw/prusw-fw_3.0.0.bb
>>> delete mode 100644 recipes-bsp/prusw-fw/prusw-fw_git.bb
>>>
>>> diff --git a/recipes-bsp/prusw-fw/prusw-fw_3.0.0.bb b/recipes-bsp/prusw-fw/prusw-fw_3.0.0.bb
>>> new file mode 100644
>>> index 00000000..514237eb
>>> --- /dev/null
>>> +++ b/recipes-bsp/prusw-fw/prusw-fw_3.0.0.bb
>>> @@ -0,0 +1,38 @@
>>> +DESCRIPTION = "PRU Switch firmware for AM57xx, AM437x and AM335x"
>>
>> Use SUMMARY here
>
> Sure
>
>>
>>
>>> +LICENSE = "TI-TFL"
>>> +LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
>>> +
>>> +PV = "3.0.3"
>>
>> So, the filename sets PV to 3.0.0, but here it's 3.0.3?
>
> 3.0.3 will fix the file name.
>
>>
>>
>>> +PR = "r1"
>>
>> Drop PR
>
> If PR is not added, the below error occurs. What could be wrong?
>
> ERROR: prusw-fw-3.0.3-r0 do_packagedata: QA Issue: Package version for package prusw-fw-src went backwards which would break package feeds (from 0:3.0.3-r1.0 to 0:3.0.3-r0.1) [version-going-backwards]
> ERROR: prusw-fw-3.0.3-r0 do_packagedata: QA Issue: Package version for package prusw-fw-dbg went backwards which would break package feeds (from 0:3.0.3-r1.0 to 0:3.0.3-r0.1) [version-going-backwards
Any idea why this could happen?
Thanks and regards,
Lokesh
>
> Thanks and regards,
> Lokesh
>
>>
>>
>>> +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
>>>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/3] prueth-fw: Package the firmware images from ti-linux-firmware
2020-08-24 15:29 ` Suman Anna
@ 2020-08-25 16:45 ` Denys Dmytriyenko
0 siblings, 0 replies; 15+ messages in thread
From: Denys Dmytriyenko @ 2020-08-25 16:45 UTC (permalink / raw)
To: Suman Anna; +Cc: Lokesh Vutla, meta-ti, Sekhar Nori, m-erdahl, m-karicheri2
On Mon, Aug 24, 2020 at 10:29:40AM -0500, Suman Anna wrote:
> 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.
Thanks, Suman, sounds good.
> regards
> Suman
>
> >
> >
> >> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
> >> ---
> >> 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
> >>
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/3] prueth-hsr/prp: Update hsr/prp firmwares to latest
2020-08-23 9:40 ` Lokesh Vutla
@ 2020-08-25 16:54 ` Denys Dmytriyenko
0 siblings, 0 replies; 15+ messages in thread
From: Denys Dmytriyenko @ 2020-08-25 16:54 UTC (permalink / raw)
To: Lokesh Vutla; +Cc: meta-ti, Sekhar Nori, m-erdahl, m-karicheri2
On Sun, Aug 23, 2020 at 03:10:20PM +0530, Lokesh Vutla wrote:
> Hi Denys,
>
> On 22/08/20 12:10 am, Denys Dmytriyenko wrote:
> > On Fri, Aug 21, 2020 at 01:02:36PM +0530, Lokesh Vutla wrote:
> >> 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.
> >
> > This is fine, but you need to choose which one provides the correct PV.
> > Currently you have it duplicated:
> >
> > pruhsr-fw_2.15.23.bb will set PV = "2.15.23" automatically from the filename,
> > but you also have existing PV = "2.15.23" inside the recipe. Same for other
> > recipe.
> >
> > The recommendation is to set PV in the filename for released tarballs.
> >
> > When the code is pulled directly from git, it is acceptable (and sometimes
> > even preferred) to use _git in the filename and set PV explicitly inside the
> > recipe. And if you expect these to be updated regularly, you can avoid churn
> > of renaming the recipe with the new version. Also that's preferred for
> > packages (probably not in this case) that need to be AUTOREV-ed to the latest
> > for any nightly CI atuomation...
>
> Thanks for the explanation. Will remove the duplicate inside the FILE. Also what
> about PE and PR?
PE - Package Epoch, default "0"
PV - Package Version, default "0.0", but normally set in filename or recipe
PR - Package Revision, default "r0"
Normally PV comes from the component version. When there are any changes to
the recipe, but PV stays the same, you want to bump the PR, though PR server
does that function now and in most cases there's no need to do that manually.
And when the PV version goes backwards for some reason (re-version, downgrade
or revert), then it is necessary to bump PE.
> Thanks and regards,
> Lokesh
>
> >
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 3/3] prusw-fw: Package the firmware images from ti-linux-firmware
2020-08-23 9:54 ` Lokesh Vutla
2020-08-25 16:23 ` Lokesh Vutla
@ 2020-08-25 16:57 ` Denys Dmytriyenko
1 sibling, 0 replies; 15+ messages in thread
From: Denys Dmytriyenko @ 2020-08-25 16:57 UTC (permalink / raw)
To: Lokesh Vutla; +Cc: meta-ti, Sekhar Nori, m-erdahl, m-karicheri2
On Sun, Aug 23, 2020 at 03:24:29PM +0530, Lokesh Vutla wrote:
>
>
> On 22/08/20 12:24 am, Denys Dmytriyenko wrote:
> > On Fri, Aug 21, 2020 at 01:02:38PM +0530, Lokesh Vutla wrote:
> >> 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.0.bb | 38 ++++++++++++++++++++++++
> >> recipes-bsp/prusw-fw/prusw-fw_git.bb | 40 --------------------------
> >> 2 files changed, 38 insertions(+), 40 deletions(-)
> >> create mode 100644 recipes-bsp/prusw-fw/prusw-fw_3.0.0.bb
> >> delete mode 100644 recipes-bsp/prusw-fw/prusw-fw_git.bb
> >>
> >> diff --git a/recipes-bsp/prusw-fw/prusw-fw_3.0.0.bb b/recipes-bsp/prusw-fw/prusw-fw_3.0.0.bb
> >> new file mode 100644
> >> index 00000000..514237eb
> >> --- /dev/null
> >> +++ b/recipes-bsp/prusw-fw/prusw-fw_3.0.0.bb
> >> @@ -0,0 +1,38 @@
> >> +DESCRIPTION = "PRU Switch firmware for AM57xx, AM437x and AM335x"
> >
> > Use SUMMARY here
>
> Sure
>
> >
> >
> >> +LICENSE = "TI-TFL"
> >> +LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
> >> +
> >> +PV = "3.0.3"
> >
> > So, the filename sets PV to 3.0.0, but here it's 3.0.3?
>
> 3.0.3 will fix the file name.
>
> >
> >
> >> +PR = "r1"
> >
> > Drop PR
>
> If PR is not added, the below error occurs. What could be wrong?
Right, you are keeping the same PV as before, so you can't remove PR (or
reset it to "r0"). I got confused and thought it was an upgrade (i.e. 3.0.0
vs. 3.0.3 above).
> ERROR: prusw-fw-3.0.3-r0 do_packagedata: QA Issue: Package version for package prusw-fw-src went backwards which would break package feeds (from 0:3.0.3-r1.0 to 0:3.0.3-r0.1) [version-going-backwards]
> ERROR: prusw-fw-3.0.3-r0 do_packagedata: QA Issue: Package version for package prusw-fw-dbg went backwards which would break package feeds (from 0:3.0.3-r1.0 to 0:3.0.3-r0.1) [version-going-backwards]
>
> Thanks and regards,
> Lokesh
>
> >
> >
> >> +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
> >>
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2020-08-25 16:57 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-21 7:32 [PATCH 0/3] prueth: Update all prueth firmwares lokeshvutla
2020-08-21 7:32 ` [PATCH 1/3] prueth-hsr/prp: Update hsr/prp firmwares to latest Lokesh Vutla
2020-08-21 18:40 ` Denys Dmytriyenko
2020-08-23 9:40 ` Lokesh Vutla
2020-08-25 16:54 ` Denys Dmytriyenko
2020-08-21 7:32 ` [PATCH 2/3] prueth-fw: Package the firmware images from ti-linux-firmware Lokesh Vutla
2020-08-21 18:53 ` Denys Dmytriyenko
2020-08-24 15:29 ` Suman Anna
2020-08-25 16:45 ` Denys Dmytriyenko
2020-08-21 7:32 ` [PATCH 3/3] prusw-fw: " Lokesh Vutla
2020-08-21 18:54 ` Denys Dmytriyenko
2020-08-23 9:54 ` Lokesh Vutla
2020-08-25 16:23 ` Lokesh Vutla
2020-08-25 16:57 ` Denys Dmytriyenko
2020-08-21 18:34 ` [PATCH 0/3] prueth: Update all prueth firmwares Denys Dmytriyenko
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.