From patchwork Tue Jan 11 18:30:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 2284 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BECDFC433EF for ; Tue, 11 Jan 2022 18:30:49 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.12018.1641925849053361106 for ; Tue, 11 Jan 2022 10:30:49 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0BE96D6E for ; Tue, 11 Jan 2022 10:30:48 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id ABB783F766 for ; Tue, 11 Jan 2022 10:30:47 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/3] arm/edk2-firmware: explicitly set level of parallelisation Date: Tue, 11 Jan 2022 18:30:42 +0000 Message-Id: <20220111183044.3220036-1-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 11 Jan 2022 18:30:49 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2816 Explicitly set the level of parallelisation instead of letting build.sh determine it. Signed-off-by: Ross Burton --- meta-arm/recipes-bsp/uefi/edk2-firmware.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc index d8c744df..8057e887 100644 --- a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc +++ b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc @@ -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} } From patchwork Tue Jan 11 18:30:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 2285 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA571C433F5 for ; Tue, 11 Jan 2022 18:30:49 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.11751.1641925849052102615 for ; Tue, 11 Jan 2022 10:30:49 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 92DF8ED1 for ; Tue, 11 Jan 2022 10:30:48 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 3E7033F766 for ; Tue, 11 Jan 2022 10:30:48 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/3] arm-bsp/edk2-firmware: enable building EDK2 for Juno Date: Tue, 11 Jan 2022 18:30:43 +0000 Message-Id: <20220111183044.3220036-2-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220111183044.3220036-1-ross.burton@arm.com> References: <20220111183044.3220036-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 11 Jan 2022 18:30:49 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2815 This doesn't build successfully with Clang, so for now the build forces the use of GCC. Signed-off-by: Ross Burton --- 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 diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-juno.inc b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-juno.inc new file mode 100644 index 00000000..076c551a --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-juno.inc @@ -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" diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_%.bbappend b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_%.bbappend index bb3845d1..e5018bb0 100644 --- a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_%.bbappend +++ b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_%.bbappend @@ -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" From patchwork Tue Jan 11 18:30:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 2286 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0342C433FE for ; Tue, 11 Jan 2022 18:30:50 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web08.11741.1641925849508414552 for ; Tue, 11 Jan 2022 10:30:49 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 25C12113E for ; Tue, 11 Jan 2022 10:30:49 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C58B83F766 for ; Tue, 11 Jan 2022 10:30:48 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 3/3] arm-bsp/juno: also build EDK2 firmware Date: Tue, 11 Jan 2022 18:30:44 +0000 Message-Id: <20220111183044.3220036-3-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220111183044.3220036-1-ross.burton@arm.com> References: <20220111183044.3220036-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 11 Jan 2022 18:30:50 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2817 So that all possible combinations are built, add edk2-firmware to the default image dependencies too. Signed-off-by: Ross Burton --- meta-arm-bsp/conf/machine/juno.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-arm-bsp/conf/machine/juno.conf b/meta-arm-bsp/conf/machine/juno.conf index 86253adf..18d52b30 100644 --- a/meta-arm-bsp/conf/machine/juno.conf +++ b/meta-arm-bsp/conf/machine/juno.conf @@ -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"