[6/7] arm/edk2-firmware: set a default invalid COMPATIBLE_MACHINE

Message ID 20211201145729.4138705-6-ross.burton@arm.com
State New
Headers show
Series [1/7] arm/edk2-firmware: set invalid platform names for better errors | expand

Commit Message

Ross Burton Dec. 1, 2021, 2:57 p.m. UTC
Building edk2-firmware needs explicit configuration for the target
machine, so set an invalid COMPATIBLE_MACHINE to stop edk2-firmware
building for, example, qemumips.

sbsa-acs is an application, so unset COMPATIBLE_MACHINE in that recipe
as it will work on all aarch64 targets.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm/recipes-bsp/uefi/edk2-firmware.inc | 5 +++--
 meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb   | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

Patch

diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc
index 264ffa94..dc4c6295 100644
--- a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc
+++ b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc
@@ -22,6 +22,9 @@  SRC_URI = "\
 SRCREV_FORMAT         = "edk2_edk2-platforms"
 UPSTREAM_CHECK_GITTAGREGEX = "^edk2-stable(?P<pver>\d+)$"
 
+COMPATIBLE_MACHINE ?= "invalid"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
 EDK2_BUILD_RELEASE = ""
 EDK2_PLATFORM      = "unset"
 # build --platform
@@ -50,8 +53,6 @@  inherit deploy
 S = "${WORKDIR}/edk2"
 B = "${WORKDIR}/build"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
 LDFLAGS[unexport] = "1"
 
 do_configure[cleandirs] += "${B}"
diff --git a/meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb b/meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb
index c4e07527..d049834c 100644
--- a/meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb
+++ b/meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb
@@ -13,7 +13,9 @@  SRC_URI += "git://github.com/ARM-software/sbsa-acs;destsuffix=edk2/ShellPkg/Appl
 SRCREV_acs = "1b3a37214fe6809e07e471f79d1ef856461bc803"
 SRCREV_libc = "61687168fe02ac4d933a36c9145fdd242ac424d1"
 
+COMPATIBLE_MACHINE = ""
 COMPATIBLE_HOST = "aarch64.*-linux"
+
 EDK2_PLATFORM = "Shell"
 EDK2_PLATFORM_DSC = "ShellPkg/ShellPkg.dsc"
 EDK2_EXTRA_BUILD = "--module ShellPkg/Application/sbsa-acs/uefi_app/SbsaAvs.inf"