1
0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-05-08 05:09:56 +00:00

arm/edk2-firmware: set EDK2_ARCH centrally

There is only a limited number of EDK2 architectures, so we can set
the architecture using overrides in the base recipe instead of every
machine customisation needing to set it explicitly.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Ross Burton
2021-12-01 14:57:26 +00:00
committed by Jon Mason
parent 5a8fafb796
commit bb2bda7186
6 changed files with 7 additions and 6 deletions
@@ -2,6 +2,5 @@ EDK2_BUILD_RELEASE = "0"
EDK2_PLATFORM = "ArmVExpress-FVP-AArch64"
EDK2_PLATFORM_DSC = "Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc"
EDK2_BIN_NAME = "FVP_AARCH64_EFI.fd"
EDK2_ARCH = "AARCH64"
COMPATIBLE_MACHINE = "fvp-base"
@@ -3,7 +3,6 @@ EDK2_BUILD_RELEASE = "0"
EDK2_PLATFORM = "n1sdp"
EDK2_PLATFORM_DSC = "Platform/ARM/N1Sdp/N1SdpPlatform.dsc"
EDK2_BIN_NAME = "BL33_AP_UEFI.fd"
EDK2_ARCH = "AARCH64"
COMPATIBLE_MACHINE = "n1sdp"
@@ -3,6 +3,5 @@ EDK2_BUILD_RELEASE = "0"
EDK2_PLATFORM = "Sgi575"
EDK2_PLATFORM_DSC = "Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc"
EDK2_BIN_NAME = "BL33_AP_UEFI.fd"
EDK2_ARCH = "AARCH64"
COMPATIBLE_MACHINE = "sgi575"
+7 -1
View File
@@ -28,7 +28,13 @@ EDK2_PLATFORM = "unset"
EDK2_PLATFORM_DSC = "unset"
EDK2_BIN_NAME = ""
# build --arch
EDK2_ARCH = ""
EDK2_ARCH ?= "unset"
EDK2_ARCH:arm = "ARM"
EDK2_ARCH:aarch64 = "AARCH64"
EDK2_ARCH:x86 = "IA32"
EDK2_ARCH:x86-64 = "X64"
EDK2_ARCH:riscv64 = "RISCV64"
# Extra arguments passed to build
EDK2_EXTRA_BUILD = ""
@@ -4,7 +4,6 @@ COMPATIBLE_MACHINE:qemu-generic-arm64 = "qemu-generic-arm64"
DEPENDS:append:qemu-generic-arm64 = " virtual/trusted-firmware-a coreutils-native"
EDK2_BUILD_RELEASE:aarch64:qemuall = "1"
EDK2_ARCH:aarch64:qemuall = "AARCH64"
EDK2_PLATFORM:qemu-generic-arm64 = "SbsaQemu"
EDK2_PLATFORM_DSC:qemu-generic-arm64 = "Platform/Qemu/SbsaQemu/SbsaQemu.dsc"
@@ -14,7 +14,6 @@ SRCREV_acs = "1b3a37214fe6809e07e471f79d1ef856461bc803"
SRCREV_libc = "61687168fe02ac4d933a36c9145fdd242ac424d1"
COMPATIBLE_HOST = "aarch64.*-linux"
EDK2_ARCH = "AARCH64"
EDK2_PLATFORM = "Shell"
EDK2_PLATFORM_DSC = "ShellPkg/ShellPkg.dsc"
EDK2_EXTRA_BUILD = "--module ShellPkg/Application/sbsa-acs/uefi_app/SbsaAvs.inf"