Skip to contentSkip to conversation

arm: trusted-firmware-a variable name misuse

PATCH In review Jon Mason 3 participants 6 messages Aug 25, 2020 – Aug 31, 2020

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/1 arm: trusted-firmware-a variable name misuse

"processes" should be "processed" in trusted-firmware-a.inc, as it signifies if the relevant part has been installed/processed.

Change-Id I2d1ffbb0c6d14d280b6f9c9cc45c04c7c32409a7
---
 .../trusted-firmware-a/trusted-firmware-a.inc        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +6 -6
index 4956c4f..e1cffdf 100644
@@ -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
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 1/1 arm-bsp: redundant entry in FVP TF-A

bl1 is specified twice in the FVP Arm32 include file, which seems erroneous.

Change-Id Ib2fc91b547151acfc28f57679e99f649bd0f49ab
---
 .../trusted-firmware-a/trusted-firmware-a-fvp-arm32.inc         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp-arm32.inc +1 -1
index 5684802..117c25f 100644
@@ -3,7 +3,7 @@
 COMPATIBLE_MACHINE = "fvp-base-arm32"
 TFA_PLATFORM = "fvp"
 TFA_UBOOT = "1"
-TFA_BUILD_TARGET = "dtbs bl1 bl1 bl32 fip"
+TFA_BUILD_TARGET = "dtbs bl1 bl32 fip"
 
 EXTRA_OEMAKE_append = " \
     ARCH=aarch32 \
Signature · 1 line
2.17.1
#2 lore raw

Re: [meta-arm] [PATCH] arm-bsp: redundant entry in FVP TF-A

Quoted 5 lines · Jon Mason

bl1 is specified twice in the FVP Arm32 include file, which seems erroneous.

Change-Id Ib2fc91b547151acfc28f57679e99f649bd0f49ab

Pulled into master.

Thanks,
Jon

Quoted 22 lines
---
 .../trusted-firmware-a/trusted-firmware-a-fvp-arm32.inc         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp-arm32.inc +1 -1
index 5684802..117c25f 100644
@@ -3,7 +3,7 @@
 COMPATIBLE_MACHINE = "fvp-base-arm32"
 TFA_PLATFORM = "fvp"
 TFA_UBOOT = "1"
-TFA_BUILD_TARGET = "dtbs bl1 bl1 bl32 fip"
+TFA_BUILD_TARGET = "dtbs bl1 bl32 fip"
 
 EXTRA_OEMAKE_append = " \
     ARCH=aarch32 \
Signature · 1 line
2.17.1
#3 lore raw
In reply to Jon Mason
Quoted 5 lines · Jon Mason

"processes" should be "processed" in trusted-firmware-a.inc, as it signifies if the relevant part has been installed/processed.

Change-Id I2d1ffbb0c6d14d280b6f9c9cc45c04c7c32409a7

Pulled into master.

Thanks,
Jon

Quoted 60 lines
---
 .../trusted-firmware-a/trusted-firmware-a.inc        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +6 -6
index 4956c4f..e1cffdf 100644
@@ -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
Signature · 1 line
2.17.1
#4 lore raw
Quoted 8 lines · Jon Mason
Quoted 5 lines · Jon Mason

"processes" should be "processed" in trusted-firmware-a.inc, as it signifies if the relevant part has been installed/processed.

Change-Id I2d1ffbb0c6d14d280b6f9c9cc45c04c7c32409a7

Pulled into master.

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

Quoted 66 lines

Thanks,
Jon

Quoted 60 lines
---
 .../trusted-firmware-a/trusted-firmware-a.inc        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +6 -6
index 4956c4f..e1cffdf 100644
@@ -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
Signature · 1 line
2.17.1
#5 lore raw
Quoted 5 lines · Denys Dmytriyenko
Quoted 4 lines · Jon Mason
Quoted 3 lines · Jon Mason

"processes" should be "processed" in trusted-firmware-a.inc, as it signifies if the relevant part has been installed/processed.

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Change-Id I2d1ffbb0c6d14d280b6f9c9cc45c04c7c32409a7

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

Quoted 71 lines
Quoted 68 lines

Thanks,
Jon

Quoted 60 lines
---
 .../trusted-firmware-a/trusted-firmware-a.inc        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +6 -6
index 4956c4f..e1cffdf 100644
@@ -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
Signature · 1 line
2.17.1