Skip to contentSkip to conversation

arm/edk2-firmware: explicitly set level of parallelisation

PATCH Applied Ross Burton 2 participants 4 messages Jan 11, 2022 – Jan 12, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 arm/edk2-firmware: explicitly set level of parallelisation

Explicitly set the level of parallelisation instead of letting build.sh determine it.

---
 meta-arm/recipes-bsp/uefi/edk2-firmware.inc | 1 +
 1 file changed, 1 insertion(+)
meta-arm/recipes-bsp/uefi/edk2-firmware.inc +1 -0
index d8c744df..8057e887 100644
@@ -98,6 +98,7 @@ do_compile() {
        --buildtarget ${EDK2_BUILD_MODE} \
        --tagname ${EDK_COMPILER} \
        --platform ${EDK2_PLATFORM_DSC} \
+       ${@oe.utils.parallel_make_argument(d, "-n %d")} \
        ${EDK2_EXTRA_BUILD}
 }
 
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/3 arm-bsp/edk2-firmware: enable building EDK2 for Juno

This doesn't build successfully with Clang, so for now the build forces the use of GCC.

---
 meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-juno.inc   | 10 ++++++++++
 meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_%.bbappend |  1 +
 2 files changed, 11 insertions(+)
 create mode 100644 meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-juno.inc
meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-juno.inc new file +10 -0
new file mode 100644
index 00000000..076c551a
@@ -0,0 +1,10 @@
+EDK2_PLATFORM      = "ArmJuno"
+EDK2_PLATFORM_DSC  = "Platform/ARM/JunoPkg/ArmJuno.dsc"
+EDK2_BIN_NAME      = "BL33_AP_UEFI.fd"
+
+COMPATIBLE_MACHINE = "juno"
+
+# As of 2022-01-10 the Juno build fails with Clang:
+# edk2-firmware/202111-r0/edk2/edk2-platforms/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c:216:11:
+# error: variable 'FileSize' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized]
+TOOLCHAIN = "gcc"
meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_%.bbappend +1 -0
index bb3845d1..e5018bb0 100644
@@ -3,6 +3,7 @@
 MACHINE_EDK2_REQUIRE ?= ""
 
 MACHINE_EDK2_REQUIRE:fvp-base = "edk2-firmware-fvp-base.inc"
+MACHINE_EDK2_REQUIRE:juno = "edk2-firmware-juno.inc"
 MACHINE_EDK2_REQUIRE:sgi575 = "edk2-firmware-sgi575.inc"
 MACHINE_EDK2_REQUIRE:n1sdp = "edk2-firmware-n1sdp.inc"
 
Signature · 1 line
2.25.1
#2 lore raw

PATCH 3/3 arm-bsp/juno: also build EDK2 firmware

In reply to Ross Burton

So that all possible combinations are built, add edk2-firmware to the default image dependencies too.

---
 meta-arm-bsp/conf/machine/juno.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-arm-bsp/conf/machine/juno.conf +1 -1
index 86253adf..18d52b30 100644
@@ -22,7 +22,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 PREFERRED_VERSION_linux-yocto ?= "5.4%"
 PREFERRED_VERSION_u-boot ?= "2020.07"
 
-EXTRA_IMAGEDEPENDS += "trusted-firmware-a u-boot firmware-image-juno"
+EXTRA_IMAGEDEPENDS += "trusted-firmware-a edk2-firmware u-boot firmware-image-juno"
 
 # Juno u-boot configuration
 UBOOT_MACHINE = "vexpress_aemv8a_juno_defconfig"
Signature · 1 line
2.25.1
Applied
#3 lore raw
In reply to Ross Burton
Quoted 2 lines · Ross Burton

Explicitly set the level of parallelisation instead of letting build.sh determine it.

Applied, thanks!

[1/3] arm/edk2-firmware: explicitly set level of parallelisation

      commit: 0b1f4967b71527113814ec86b1d4cf19e8d29a80
[2/3] arm-bsp/edk2-firmware: enable building EDK2 for Juno
      commit: 24ef21c36b52aaf5f3c542b27faf6e2f4e288ddd
[3/3] arm-bsp/juno: also build EDK2 firmware
      commit: 44ea1e59a29372f72a9053dcf133ebb148308d8a

Best regards,

Signature · 1 line
Jon Mason <[email protected]>