[7/7] arm/edk2-firmware: default to release builds

Message ID 20211201145729.4138705-7-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
Default to release builds and let machines enable debug builds if they
want that.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm/recipes-bsp/uefi/edk2-firmware.inc        | 2 +-
 meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

Patch

diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc
index dc4c6295..7072d1b4 100644
--- a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc
+++ b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc
@@ -25,7 +25,7 @@  UPSTREAM_CHECK_GITTAGREGEX = "^edk2-stable(?P<pver>\d+)$"
 COMPATIBLE_MACHINE ?= "invalid"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-EDK2_BUILD_RELEASE = ""
+EDK2_BUILD_RELEASE = "1"
 EDK2_PLATFORM      = "unset"
 # build --platform
 EDK2_PLATFORM_DSC  = "unset"
diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend b/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend
index 17f3662b..50777dcd 100644
--- a/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend
+++ b/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend
@@ -1,5 +1,4 @@ 
 COMPATIBLE_MACHINE:qemuarm64-secureboot = "qemuarm64-secureboot"
-EDK2_BUILD_RELEASE:qemuarm64-secureboot = "1"
 EDK2_PLATFORM:qemuarm64-secureboot      = "ArmVirtQemu-AARCH64"
 EDK2_PLATFORM_DSC:qemuarm64-secureboot  = "ArmVirtPkg/ArmVirtQemu.dsc"
 EDK2_BIN_NAME:qemuarm64-secureboot      = "QEMU_EFI.fd"
@@ -7,7 +6,6 @@  EDK2_BIN_NAME:qemuarm64-secureboot      = "QEMU_EFI.fd"
 
 COMPATIBLE_MACHINE:qemu-generic-arm64   = "qemu-generic-arm64"
 DEPENDS:append:qemu-generic-arm64       = " virtual/trusted-firmware-a coreutils-native"
-EDK2_BUILD_RELEASE:qemu-generic-arm64 = "1"
 EDK2_PLATFORM:qemu-generic-arm64        = "SbsaQemu"
 EDK2_PLATFORM_DSC:qemu-generic-arm64    = "Platform/Qemu/SbsaQemu/SbsaQemu.dsc"
 EDK2_BIN_NAME:qemu-generic-arm64        = "SBSA_FLASH0.fd"