* [PATCH v2] pru-icss_git.bb: Add am65x PRU_Halt
@ 2018-08-14 15:50 Nick Saulnier
2018-08-14 18:35 ` Denys Dmytriyenko
0 siblings, 1 reply; 3+ messages in thread
From: Nick Saulnier @ 2018-08-14 15:50 UTC (permalink / raw)
To: meta-ti
Updated SRCREV to point to an updated version of the PRU Software Support
Package which includes PRU_Halt and RTU_Halt examples for am65x. PV will
get updated in the next patch.
Added PRU_Halt and RTU_Halt to do_install_append_am65xx-evm(). Decided to leave
the installation of PRU_Halt examples in each processor's do_install_append
function for now since PRU_Halt and RTU_Halt for am65x have different output
file names than the previous ICSS processors. Those different output names can
be seen in the lines ALTERNATIVE_TARGET_pru-icss-halt[am65x....].
The previous commit made several changes to account for the fact that am65x Halt
examples had not yet been added to the PRU Software Support Package. Those
changes were removed in this commit.
Signed-off-by: Nick Saulnier <nsaulnier@ti.com>
---
recipes-bsp/pru/pru-icss_git.bb | 32 +++++++++++++++++++++++---------
1 file changed, 23 insertions(+), 9 deletions(-)
diff --git a/recipes-bsp/pru/pru-icss_git.bb b/recipes-bsp/pru/pru-icss_git.bb
index 3c871b70e3f0..e150076ec0a2 100644
--- a/recipes-bsp/pru/pru-icss_git.bb
+++ b/recipes-bsp/pru/pru-icss_git.bb
@@ -8,10 +8,10 @@ inherit update-alternatives
BRANCH = "master"
SRC_URI = "git://git.ti.com/pru-software-support-package/pru-software-support-package.git;protocol=git;branch=${BRANCH}"
-SRCREV = "81b568741b8b98e6f590271a9aea5956d2b2d9ce"
+SRCREV = "1d9249c012005a669a6ffb2f76255d72ed5c0e4c"
PV = "5.2.1"
-PR = "r1"
+PR = "r2"
require recipes-ti/includes/ti-paths.inc
@@ -103,6 +103,13 @@ do_install_append_k2g() {
}
do_install_append_am65xx-evm() {
+ for i in 0 1
+ do
+ install -m 644 ${S}/examples/${PLATFORM}/PRU_Halt/gen/PRU${i}/PRU_Halt_${i}.out \
+ ${D}/lib/firmware/pru
+ install -m 644 ${S}/examples/${PLATFORM}/RTU_Halt/gen/RTU${i}/RTU_Halt_${i}.out \
+ ${D}/lib/firmware/pru
+ done
for i in 0 1 2
do
for j in 0 1
@@ -116,7 +123,7 @@ do_install_append_am65xx-evm() {
done
}
-FILES_${PN}-halt = "/lib/firmware/pru/PRU_Halt.out"
+FILES_${PN}-halt = "/lib/firmware/pru/PRU_Halt* /lib/firmware/pru/RTU_Halt*"
FILES_${PN}-rpmsg-echo = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt* /lib/firmware/pru/RTU_RPMsg_Echo_Interrupt*"
# Set up names for the firmwares
@@ -161,9 +168,6 @@ ALTERNATIVE_LINK_NAME[am65x-rtu2_1-fw] = "/lib/firmware/am65x-rtu2_1-fw"
# Create the pru-icss-halt firmware alternatives
ALTERNATIVE_pru-icss-halt = "${PRU_ICSS_ALTERNATIVES}"
-# am65xx doesn't have halt FW for now
-ALTERNATIVE_pru-icss-halt_am65xx-evm = ""
-
ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru0-fw] = "/lib/firmware/pru/PRU_Halt.out"
ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru1-fw] = "/lib/firmware/pru/PRU_Halt.out"
@@ -182,6 +186,19 @@ ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru0_1-fw] = "/lib/firmware/pru/PRU_Halt.ou
ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru1_0-fw] = "/lib/firmware/pru/PRU_Halt.out"
ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru1_1-fw] = "/lib/firmware/pru/PRU_Halt.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru0_0-fw] = "/lib/firmware/pru/PRU_Halt_0.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru0_1-fw] = "/lib/firmware/pru/PRU_Halt_1.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru1_0-fw] = "/lib/firmware/pru/PRU_Halt_0.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru1_1-fw] = "/lib/firmware/pru/PRU_Halt_1.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru2_0-fw] = "/lib/firmware/pru/PRU_Halt_0.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru2_1-fw] = "/lib/firmware/pru/PRU_Halt_1.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu0_0-fw] = "/lib/firmware/pru/RTU_Halt_0.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu0_1-fw] = "/lib/firmware/pru/RTU_Halt_1.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu1_0-fw] = "/lib/firmware/pru/RTU_Halt_0.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu1_1-fw] = "/lib/firmware/pru/RTU_Halt_1.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu2_0-fw] = "/lib/firmware/pru/RTU_Halt_0.out"
+ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu2_1-fw] = "/lib/firmware/pru/RTU_Halt_1.out"
+
ALTERNATIVE_PRIORITY_pru-icss-halt = "50"
# Create the pru-icss-rpmsg-echo firmware alternatives
@@ -220,9 +237,6 @@ ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-rtu2_1-fw] = "/lib/firmware/pru/RTU
ALTERNATIVE_PRIORITY_pru-icss-rpmsg-echo = "100"
-# am65xx doesn't have halt FW for now
-ALLOW_EMPTY_${PN}-halt = "1"
-
ALLOW_EMPTY_${PN} = "1"
# This installs PRU firmware, so skip "arch" QA check
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2] pru-icss_git.bb: Add am65x PRU_Halt
2018-08-14 15:50 [PATCH v2] pru-icss_git.bb: Add am65x PRU_Halt Nick Saulnier
@ 2018-08-14 18:35 ` Denys Dmytriyenko
2018-08-14 22:01 ` Saulnier, Nick
0 siblings, 1 reply; 3+ messages in thread
From: Denys Dmytriyenko @ 2018-08-14 18:35 UTC (permalink / raw)
To: Nick Saulnier; +Cc: meta-ti
On Tue, Aug 14, 2018 at 10:50:21AM -0500, Nick Saulnier wrote:
> Updated SRCREV to point to an updated version of the PRU Software Support
> Package which includes PRU_Halt and RTU_Halt examples for am65x. PV will
> get updated in the next patch.
Not that it's critical, but I thought you were going to update PV here as
well...
> Added PRU_Halt and RTU_Halt to do_install_append_am65xx-evm(). Decided to leave
> the installation of PRU_Halt examples in each processor's do_install_append
> function for now since PRU_Halt and RTU_Halt for am65x have different output
> file names than the previous ICSS processors. Those different output names can
> be seen in the lines ALTERNATIVE_TARGET_pru-icss-halt[am65x....].
>
> The previous commit made several changes to account for the fact that am65x Halt
> examples had not yet been added to the PRU Software Support Package. Those
> changes were removed in this commit.
>
> Signed-off-by: Nick Saulnier <nsaulnier@ti.com>
> ---
> recipes-bsp/pru/pru-icss_git.bb | 32 +++++++++++++++++++++++---------
> 1 file changed, 23 insertions(+), 9 deletions(-)
>
> diff --git a/recipes-bsp/pru/pru-icss_git.bb b/recipes-bsp/pru/pru-icss_git.bb
> index 3c871b70e3f0..e150076ec0a2 100644
> --- a/recipes-bsp/pru/pru-icss_git.bb
> +++ b/recipes-bsp/pru/pru-icss_git.bb
> @@ -8,10 +8,10 @@ inherit update-alternatives
>
> BRANCH = "master"
> SRC_URI = "git://git.ti.com/pru-software-support-package/pru-software-support-package.git;protocol=git;branch=${BRANCH}"
> -SRCREV = "81b568741b8b98e6f590271a9aea5956d2b2d9ce"
> +SRCREV = "1d9249c012005a669a6ffb2f76255d72ed5c0e4c"
>
> PV = "5.2.1"
> -PR = "r1"
> +PR = "r2"
>
> require recipes-ti/includes/ti-paths.inc
>
> @@ -103,6 +103,13 @@ do_install_append_k2g() {
> }
>
> do_install_append_am65xx-evm() {
> + for i in 0 1
> + do
> + install -m 644 ${S}/examples/${PLATFORM}/PRU_Halt/gen/PRU${i}/PRU_Halt_${i}.out \
> + ${D}/lib/firmware/pru
> + install -m 644 ${S}/examples/${PLATFORM}/RTU_Halt/gen/RTU${i}/RTU_Halt_${i}.out \
> + ${D}/lib/firmware/pru
> + done
> for i in 0 1 2
> do
> for j in 0 1
> @@ -116,7 +123,7 @@ do_install_append_am65xx-evm() {
> done
> }
>
> -FILES_${PN}-halt = "/lib/firmware/pru/PRU_Halt.out"
> +FILES_${PN}-halt = "/lib/firmware/pru/PRU_Halt* /lib/firmware/pru/RTU_Halt*"
> FILES_${PN}-rpmsg-echo = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt* /lib/firmware/pru/RTU_RPMsg_Echo_Interrupt*"
>
> # Set up names for the firmwares
> @@ -161,9 +168,6 @@ ALTERNATIVE_LINK_NAME[am65x-rtu2_1-fw] = "/lib/firmware/am65x-rtu2_1-fw"
> # Create the pru-icss-halt firmware alternatives
> ALTERNATIVE_pru-icss-halt = "${PRU_ICSS_ALTERNATIVES}"
>
> -# am65xx doesn't have halt FW for now
> -ALTERNATIVE_pru-icss-halt_am65xx-evm = ""
> -
> ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru0-fw] = "/lib/firmware/pru/PRU_Halt.out"
> ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru1-fw] = "/lib/firmware/pru/PRU_Halt.out"
>
> @@ -182,6 +186,19 @@ ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru0_1-fw] = "/lib/firmware/pru/PRU_Halt.ou
> ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru1_0-fw] = "/lib/firmware/pru/PRU_Halt.out"
> ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru1_1-fw] = "/lib/firmware/pru/PRU_Halt.out"
>
> +ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru0_0-fw] = "/lib/firmware/pru/PRU_Halt_0.out"
> +ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru0_1-fw] = "/lib/firmware/pru/PRU_Halt_1.out"
> +ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru1_0-fw] = "/lib/firmware/pru/PRU_Halt_0.out"
> +ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru1_1-fw] = "/lib/firmware/pru/PRU_Halt_1.out"
> +ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru2_0-fw] = "/lib/firmware/pru/PRU_Halt_0.out"
> +ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru2_1-fw] = "/lib/firmware/pru/PRU_Halt_1.out"
> +ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu0_0-fw] = "/lib/firmware/pru/RTU_Halt_0.out"
> +ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu0_1-fw] = "/lib/firmware/pru/RTU_Halt_1.out"
> +ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu1_0-fw] = "/lib/firmware/pru/RTU_Halt_0.out"
> +ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu1_1-fw] = "/lib/firmware/pru/RTU_Halt_1.out"
> +ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu2_0-fw] = "/lib/firmware/pru/RTU_Halt_0.out"
> +ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu2_1-fw] = "/lib/firmware/pru/RTU_Halt_1.out"
> +
> ALTERNATIVE_PRIORITY_pru-icss-halt = "50"
>
> # Create the pru-icss-rpmsg-echo firmware alternatives
> @@ -220,9 +237,6 @@ ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-rtu2_1-fw] = "/lib/firmware/pru/RTU
>
> ALTERNATIVE_PRIORITY_pru-icss-rpmsg-echo = "100"
>
> -# am65xx doesn't have halt FW for now
> -ALLOW_EMPTY_${PN}-halt = "1"
> -
> ALLOW_EMPTY_${PN} = "1"
>
> # This installs PRU firmware, so skip "arch" QA check
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2] pru-icss_git.bb: Add am65x PRU_Halt
2018-08-14 18:35 ` Denys Dmytriyenko
@ 2018-08-14 22:01 ` Saulnier, Nick
0 siblings, 0 replies; 3+ messages in thread
From: Saulnier, Nick @ 2018-08-14 22:01 UTC (permalink / raw)
To: Dmytriyenko, Denys; +Cc: meta-ti@yoctoproject.org
This patch needs to get into core SDK 2018.3. I want PV to match the Software Support Package tag, but there are outstanding issues I will fix in the next 2 weeks (unrelated to PRU_Halt). Once those issues are addressed, I'll tag the commit we will use for Proc SDK5.1 and update PV to match.
Thanks,
Nick
-----Original Message-----
From: Dmytriyenko, Denys
Sent: Tuesday, August 14, 2018 1:36 PM
To: Saulnier, Nick
Cc: meta-ti@yoctoproject.org; Stiffler, Jacob
Subject: Re: [meta-ti][PATCH v2] pru-icss_git.bb: Add am65x PRU_Halt
On Tue, Aug 14, 2018 at 10:50:21AM -0500, Nick Saulnier wrote:
> Updated SRCREV to point to an updated version of the PRU Software Support
> Package which includes PRU_Halt and RTU_Halt examples for am65x. PV will
> get updated in the next patch.
Not that it's critical, but I thought you were going to update PV here as
well...
> Added PRU_Halt and RTU_Halt to do_install_append_am65xx-evm(). Decided to leave
> the installation of PRU_Halt examples in each processor's do_install_append
> function for now since PRU_Halt and RTU_Halt for am65x have different output
> file names than the previous ICSS processors. Those different output names can
> be seen in the lines ALTERNATIVE_TARGET_pru-icss-halt[am65x....].
>
> The previous commit made several changes to account for the fact that am65x Halt
> examples had not yet been added to the PRU Software Support Package. Those
> changes were removed in this commit.
>
> Signed-off-by: Nick Saulnier <nsaulnier@ti.com>
> ---
> recipes-bsp/pru/pru-icss_git.bb | 32 +++++++++++++++++++++++---------
> 1 file changed, 23 insertions(+), 9 deletions(-)
>
> diff --git a/recipes-bsp/pru/pru-icss_git.bb b/recipes-bsp/pru/pru-icss_git.bb
> index 3c871b70e3f0..e150076ec0a2 100644
> --- a/recipes-bsp/pru/pru-icss_git.bb
> +++ b/recipes-bsp/pru/pru-icss_git.bb
> @@ -8,10 +8,10 @@ inherit update-alternatives
>
> BRANCH = "master"
> SRC_URI = "git://git.ti.com/pru-software-support-package/pru-software-support-package.git;protocol=git;branch=${BRANCH}"
> -SRCREV = "81b568741b8b98e6f590271a9aea5956d2b2d9ce"
> +SRCREV = "1d9249c012005a669a6ffb2f76255d72ed5c0e4c"
>
> PV = "5.2.1"
> -PR = "r1"
> +PR = "r2"
>
> require recipes-ti/includes/ti-paths.inc
>
> @@ -103,6 +103,13 @@ do_install_append_k2g() {
> }
>
> do_install_append_am65xx-evm() {
> + for i in 0 1
> + do
> + install -m 644 ${S}/examples/${PLATFORM}/PRU_Halt/gen/PRU${i}/PRU_Halt_${i}.out \
> + ${D}/lib/firmware/pru
> + install -m 644 ${S}/examples/${PLATFORM}/RTU_Halt/gen/RTU${i}/RTU_Halt_${i}.out \
> + ${D}/lib/firmware/pru
> + done
> for i in 0 1 2
> do
> for j in 0 1
> @@ -116,7 +123,7 @@ do_install_append_am65xx-evm() {
> done
> }
>
> -FILES_${PN}-halt = "/lib/firmware/pru/PRU_Halt.out"
> +FILES_${PN}-halt = "/lib/firmware/pru/PRU_Halt* /lib/firmware/pru/RTU_Halt*"
> FILES_${PN}-rpmsg-echo = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt* /lib/firmware/pru/RTU_RPMsg_Echo_Interrupt*"
>
> # Set up names for the firmwares
> @@ -161,9 +168,6 @@ ALTERNATIVE_LINK_NAME[am65x-rtu2_1-fw] = "/lib/firmware/am65x-rtu2_1-fw"
> # Create the pru-icss-halt firmware alternatives
> ALTERNATIVE_pru-icss-halt = "${PRU_ICSS_ALTERNATIVES}"
>
> -# am65xx doesn't have halt FW for now
> -ALTERNATIVE_pru-icss-halt_am65xx-evm = ""
> -
> ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru0-fw] = "/lib/firmware/pru/PRU_Halt.out"
> ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru1-fw] = "/lib/firmware/pru/PRU_Halt.out"
>
> @@ -182,6 +186,19 @@ ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru0_1-fw] = "/lib/firmware/pru/PRU_Halt.ou
> ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru1_0-fw] = "/lib/firmware/pru/PRU_Halt.out"
> ALTERNATIVE_TARGET_pru-icss-halt[k2g-pru1_1-fw] = "/lib/firmware/pru/PRU_Halt.out"
>
> +ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru0_0-fw] = "/lib/firmware/pru/PRU_Halt_0.out"
> +ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru0_1-fw] = "/lib/firmware/pru/PRU_Halt_1.out"
> +ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru1_0-fw] = "/lib/firmware/pru/PRU_Halt_0.out"
> +ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru1_1-fw] = "/lib/firmware/pru/PRU_Halt_1.out"
> +ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru2_0-fw] = "/lib/firmware/pru/PRU_Halt_0.out"
> +ALTERNATIVE_TARGET_pru-icss-halt[am65x-pru2_1-fw] = "/lib/firmware/pru/PRU_Halt_1.out"
> +ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu0_0-fw] = "/lib/firmware/pru/RTU_Halt_0.out"
> +ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu0_1-fw] = "/lib/firmware/pru/RTU_Halt_1.out"
> +ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu1_0-fw] = "/lib/firmware/pru/RTU_Halt_0.out"
> +ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu1_1-fw] = "/lib/firmware/pru/RTU_Halt_1.out"
> +ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu2_0-fw] = "/lib/firmware/pru/RTU_Halt_0.out"
> +ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu2_1-fw] = "/lib/firmware/pru/RTU_Halt_1.out"
> +
> ALTERNATIVE_PRIORITY_pru-icss-halt = "50"
>
> # Create the pru-icss-rpmsg-echo firmware alternatives
> @@ -220,9 +237,6 @@ ALTERNATIVE_TARGET_pru-icss-rpmsg-echo[am65x-rtu2_1-fw] = "/lib/firmware/pru/RTU
>
> ALTERNATIVE_PRIORITY_pru-icss-rpmsg-echo = "100"
>
> -# am65xx doesn't have halt FW for now
> -ALLOW_EMPTY_${PN}-halt = "1"
> -
> ALLOW_EMPTY_${PN} = "1"
>
> # This installs PRU firmware, so skip "arch" QA check
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-08-14 22:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-14 15:50 [PATCH v2] pru-icss_git.bb: Add am65x PRU_Halt Nick Saulnier
2018-08-14 18:35 ` Denys Dmytriyenko
2018-08-14 22:01 ` Saulnier, Nick
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.