[meta-arm] arm: trusted-firmware-a variable name misuse

Submitted by Jon Mason on Aug. 25, 2020, 2:32 a.m. | Patch ID: 175641

Details

Message ID 20200825023220.27193-1-jon.mason@arm.com
State New
Headers show

Commit Message

Jon Mason Aug. 25, 2020, 2:32 a.m.
"processes" should be "processed" in trusted-firmware-a.inc, as it
signifies if the relevant part has been installed/processed.

Change-Id: I2d1ffbb0c6d14d280b6f9c9cc45c04c7c32409a7
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .../trusted-firmware-a/trusted-firmware-a.inc        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
index 4956c4f..e1cffdf 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
@@ -136,7 +136,7 @@  do_compile_append_aarch64_qemuall() {
 do_install() {
     install -d -m 755 ${D}/firmware
     for atfbin in ${TFA_INSTALL_TARGET}; do
-        processes="0"
+        processed="0"
         if [ "$atfbin" = "all" ]; then
             # Target all is not handled by default
             bberror "all as TFA_INSTALL_TARGET is not handled by do_install"
@@ -150,32 +150,32 @@  do_install() {
             install -m 0644 ${BUILD_DIR}/$atfbin.bin \
                 ${D}/firmware/$atfbin-${TFA_PLATFORM}.bin
             ln -sf $atfbin-${TFA_PLATFORM}.bin ${D}/firmware/$atfbin.bin
-            processes="1"
+            processed="1"
         fi
         if [ -f ${BUILD_DIR}/$atfbin/$atfbin.elf ]; then
             echo "Install $atfbin.elf"
             install -m 0644 ${BUILD_DIR}/$atfbin/$atfbin.elf \
                 ${D}/firmware/$atfbin-${TFA_PLATFORM}.elf
             ln -sf $atfbin-${TFA_PLATFORM}.elf ${D}/firmware/$atfbin.elf
-            processes="1"
+            processed="1"
         fi
         if [ -f ${BUILD_DIR}/$atfbin ]; then
             echo "Install $atfbin"
             install -m 0644 ${BUILD_DIR}/$atfbin \
                 ${D}/firmware/$atfbin-${TFA_PLATFORM}
             ln -sf $atfbin-${TFA_PLATFORM} ${D}/firmware/$atfbin
-            processes="1"
+            processed="1"
         fi
         if [ -f ${BUILD_DIR}/fdts/$atfbin.dtb ]; then
             echo "Install $atfbin.dtb"
             install -m 0644 "${BUILD_DIR}/fdts/$atfbin.dtb" \
                 "${D}/firmware/$atfbin.dtb"
-            processes="1"
+            processed="1"
         elif [ "$atfbin" = "dtbs" ]; then
             echo "dtbs install, skipped: set dtbs in TFA_INSTALL_TARGET"
         elif [ -f ${B}/tools/$atfbin/$atfbin ]; then
             echo "Tools $atfbin install, skipped"
-        elif [ "$processes" = "0" ]; then
+        elif [ "$processed" = "0" ]; then
             bberror "Unsupported TFA_INSTALL_TARGET target $atfbin"
             exit 1
         fi

Comments

Jon Mason Aug. 25, 2020, 8:11 p.m.
On Mon, Aug 24, 2020 at 10:32:19PM -0400, Jon Mason wrote:
> "processes" should be "processed" in trusted-firmware-a.inc, as it
> signifies if the relevant part has been installed/processed.
> 
> Change-Id: I2d1ffbb0c6d14d280b6f9c9cc45c04c7c32409a7
> Signed-off-by: Jon Mason <jon.mason@arm.com>

Pulled into master.

Thanks,
Jon

> ---
>  .../trusted-firmware-a/trusted-firmware-a.inc        | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
> index 4956c4f..e1cffdf 100644
> --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
> +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
> @@ -136,7 +136,7 @@ do_compile_append_aarch64_qemuall() {
>  do_install() {
>      install -d -m 755 ${D}/firmware
>      for atfbin in ${TFA_INSTALL_TARGET}; do
> -        processes="0"
> +        processed="0"
>          if [ "$atfbin" = "all" ]; then
>              # Target all is not handled by default
>              bberror "all as TFA_INSTALL_TARGET is not handled by do_install"
> @@ -150,32 +150,32 @@ do_install() {
>              install -m 0644 ${BUILD_DIR}/$atfbin.bin \
>                  ${D}/firmware/$atfbin-${TFA_PLATFORM}.bin
>              ln -sf $atfbin-${TFA_PLATFORM}.bin ${D}/firmware/$atfbin.bin
> -            processes="1"
> +            processed="1"
>          fi
>          if [ -f ${BUILD_DIR}/$atfbin/$atfbin.elf ]; then
>              echo "Install $atfbin.elf"
>              install -m 0644 ${BUILD_DIR}/$atfbin/$atfbin.elf \
>                  ${D}/firmware/$atfbin-${TFA_PLATFORM}.elf
>              ln -sf $atfbin-${TFA_PLATFORM}.elf ${D}/firmware/$atfbin.elf
> -            processes="1"
> +            processed="1"
>          fi
>          if [ -f ${BUILD_DIR}/$atfbin ]; then
>              echo "Install $atfbin"
>              install -m 0644 ${BUILD_DIR}/$atfbin \
>                  ${D}/firmware/$atfbin-${TFA_PLATFORM}
>              ln -sf $atfbin-${TFA_PLATFORM} ${D}/firmware/$atfbin
> -            processes="1"
> +            processed="1"
>          fi
>          if [ -f ${BUILD_DIR}/fdts/$atfbin.dtb ]; then
>              echo "Install $atfbin.dtb"
>              install -m 0644 "${BUILD_DIR}/fdts/$atfbin.dtb" \
>                  "${D}/firmware/$atfbin.dtb"
> -            processes="1"
> +            processed="1"
>          elif [ "$atfbin" = "dtbs" ]; then
>              echo "dtbs install, skipped: set dtbs in TFA_INSTALL_TARGET"
>          elif [ -f ${B}/tools/$atfbin/$atfbin ]; then
>              echo "Tools $atfbin install, skipped"
> -        elif [ "$processes" = "0" ]; then
> +        elif [ "$processed" = "0" ]; then
>              bberror "Unsupported TFA_INSTALL_TARGET target $atfbin"
>              exit 1
>          fi
> -- 
> 2.17.1
> 

>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#1071): https://lists.yoctoproject.org/g/meta-arm/message/1071
Mute This Topic: https://lists.yoctoproject.org/mt/76399763/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Denys Dmytriyenko Aug. 25, 2020, 9:10 p.m.
On Tue, Aug 25, 2020 at 04:11:41PM -0400, Jon Mason wrote:
> On Mon, Aug 24, 2020 at 10:32:19PM -0400, Jon Mason wrote:
> > "processes" should be "processed" in trusted-firmware-a.inc, as it
> > signifies if the relevant part has been installed/processed.
> > 
> > Change-Id: I2d1ffbb0c6d14d280b6f9c9cc45c04c7c32409a7
> > Signed-off-by: Jon Mason <jon.mason@arm.com>
> 
> Pulled into master.

Thanks! Again, sorry for making this typo in the first place :)
Do you want to backport this to dunfell?


> Thanks,
> Jon
> 
> > ---
> >  .../trusted-firmware-a/trusted-firmware-a.inc        | 12 ++++++------
> >  1 file changed, 6 insertions(+), 6 deletions(-)
> > 
> > diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
> > index 4956c4f..e1cffdf 100644
> > --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
> > +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
> > @@ -136,7 +136,7 @@ do_compile_append_aarch64_qemuall() {
> >  do_install() {
> >      install -d -m 755 ${D}/firmware
> >      for atfbin in ${TFA_INSTALL_TARGET}; do
> > -        processes="0"
> > +        processed="0"
> >          if [ "$atfbin" = "all" ]; then
> >              # Target all is not handled by default
> >              bberror "all as TFA_INSTALL_TARGET is not handled by do_install"
> > @@ -150,32 +150,32 @@ do_install() {
> >              install -m 0644 ${BUILD_DIR}/$atfbin.bin \
> >                  ${D}/firmware/$atfbin-${TFA_PLATFORM}.bin
> >              ln -sf $atfbin-${TFA_PLATFORM}.bin ${D}/firmware/$atfbin.bin
> > -            processes="1"
> > +            processed="1"
> >          fi
> >          if [ -f ${BUILD_DIR}/$atfbin/$atfbin.elf ]; then
> >              echo "Install $atfbin.elf"
> >              install -m 0644 ${BUILD_DIR}/$atfbin/$atfbin.elf \
> >                  ${D}/firmware/$atfbin-${TFA_PLATFORM}.elf
> >              ln -sf $atfbin-${TFA_PLATFORM}.elf ${D}/firmware/$atfbin.elf
> > -            processes="1"
> > +            processed="1"
> >          fi
> >          if [ -f ${BUILD_DIR}/$atfbin ]; then
> >              echo "Install $atfbin"
> >              install -m 0644 ${BUILD_DIR}/$atfbin \
> >                  ${D}/firmware/$atfbin-${TFA_PLATFORM}
> >              ln -sf $atfbin-${TFA_PLATFORM} ${D}/firmware/$atfbin
> > -            processes="1"
> > +            processed="1"
> >          fi
> >          if [ -f ${BUILD_DIR}/fdts/$atfbin.dtb ]; then
> >              echo "Install $atfbin.dtb"
> >              install -m 0644 "${BUILD_DIR}/fdts/$atfbin.dtb" \
> >                  "${D}/firmware/$atfbin.dtb"
> > -            processes="1"
> > +            processed="1"
> >          elif [ "$atfbin" = "dtbs" ]; then
> >              echo "dtbs install, skipped: set dtbs in TFA_INSTALL_TARGET"
> >          elif [ -f ${B}/tools/$atfbin/$atfbin ]; then
> >              echo "Tools $atfbin install, skipped"
> > -        elif [ "$processes" = "0" ]; then
> > +        elif [ "$processed" = "0" ]; then
> >              bberror "Unsupported TFA_INSTALL_TARGET target $atfbin"
> >              exit 1
> >          fi
> > -- 
> > 2.17.1
> > 
> 
> > 
> 

>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#1073): https://lists.yoctoproject.org/g/meta-arm/message/1073
Mute This Topic: https://lists.yoctoproject.org/mt/76399763/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Jon Mason Aug. 31, 2020, 8:24 p.m.
On Tue, Aug 25, 2020 at 05:10:33PM -0400, Denys Dmytriyenko wrote:
> On Tue, Aug 25, 2020 at 04:11:41PM -0400, Jon Mason wrote:
> > On Mon, Aug 24, 2020 at 10:32:19PM -0400, Jon Mason wrote:
> > > "processes" should be "processed" in trusted-firmware-a.inc, as it
> > > signifies if the relevant part has been installed/processed.
> > > 
> > > Change-Id: I2d1ffbb0c6d14d280b6f9c9cc45c04c7c32409a7
> > > Signed-off-by: Jon Mason <jon.mason@arm.com>
> > 
> > Pulled into master.
> 
> Thanks! Again, sorry for making this typo in the first place :)
> Do you want to backport this to dunfell?

Done.  Also, I pulled back all of Ross's TF-A build race fixes to dunfell.

Thanks,
Jon

> 
> 
> > Thanks,
> > Jon
> > 
> > > ---
> > >  .../trusted-firmware-a/trusted-firmware-a.inc        | 12 ++++++------
> > >  1 file changed, 6 insertions(+), 6 deletions(-)
> > > 
> > > diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
> > > index 4956c4f..e1cffdf 100644
> > > --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
> > > +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
> > > @@ -136,7 +136,7 @@ do_compile_append_aarch64_qemuall() {
> > >  do_install() {
> > >      install -d -m 755 ${D}/firmware
> > >      for atfbin in ${TFA_INSTALL_TARGET}; do
> > > -        processes="0"
> > > +        processed="0"
> > >          if [ "$atfbin" = "all" ]; then
> > >              # Target all is not handled by default
> > >              bberror "all as TFA_INSTALL_TARGET is not handled by do_install"
> > > @@ -150,32 +150,32 @@ do_install() {
> > >              install -m 0644 ${BUILD_DIR}/$atfbin.bin \
> > >                  ${D}/firmware/$atfbin-${TFA_PLATFORM}.bin
> > >              ln -sf $atfbin-${TFA_PLATFORM}.bin ${D}/firmware/$atfbin.bin
> > > -            processes="1"
> > > +            processed="1"
> > >          fi
> > >          if [ -f ${BUILD_DIR}/$atfbin/$atfbin.elf ]; then
> > >              echo "Install $atfbin.elf"
> > >              install -m 0644 ${BUILD_DIR}/$atfbin/$atfbin.elf \
> > >                  ${D}/firmware/$atfbin-${TFA_PLATFORM}.elf
> > >              ln -sf $atfbin-${TFA_PLATFORM}.elf ${D}/firmware/$atfbin.elf
> > > -            processes="1"
> > > +            processed="1"
> > >          fi
> > >          if [ -f ${BUILD_DIR}/$atfbin ]; then
> > >              echo "Install $atfbin"
> > >              install -m 0644 ${BUILD_DIR}/$atfbin \
> > >                  ${D}/firmware/$atfbin-${TFA_PLATFORM}
> > >              ln -sf $atfbin-${TFA_PLATFORM} ${D}/firmware/$atfbin
> > > -            processes="1"
> > > +            processed="1"
> > >          fi
> > >          if [ -f ${BUILD_DIR}/fdts/$atfbin.dtb ]; then
> > >              echo "Install $atfbin.dtb"
> > >              install -m 0644 "${BUILD_DIR}/fdts/$atfbin.dtb" \
> > >                  "${D}/firmware/$atfbin.dtb"
> > > -            processes="1"
> > > +            processed="1"
> > >          elif [ "$atfbin" = "dtbs" ]; then
> > >              echo "dtbs install, skipped: set dtbs in TFA_INSTALL_TARGET"
> > >          elif [ -f ${B}/tools/$atfbin/$atfbin ]; then
> > >              echo "Tools $atfbin install, skipped"
> > > -        elif [ "$processes" = "0" ]; then
> > > +        elif [ "$processed" = "0" ]; then
> > >              bberror "Unsupported TFA_INSTALL_TARGET target $atfbin"
> > >              exit 1
> > >          fi
> > > -- 
> > > 2.17.1
> > > 
> > 
> > > 
> > 
> 
> > 
> 

>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#1082): https://lists.yoctoproject.org/g/meta-arm/message/1082
Mute This Topic: https://lists.yoctoproject.org/mt/76399763/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-