[1/2] arm-bsp/trusted-firmware-a: remove SGI-575 workaround

Message ID 20220616135034.3787137-1-ross.burton@arm.com
State New
Headers show
Series [1/2] arm-bsp/trusted-firmware-a: remove SGI-575 workaround | expand

Commit Message

Ross Burton June 16, 2022, 1:50 p.m. UTC
The SGI-575 build is successful with branch protection enabled, so remove
this workaround.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../recipes-bsp/trusted-firmware-a/trusted-firmware-a-sgi575.inc | 1 -
 1 file changed, 1 deletion(-)

Comments

Jon Mason June 17, 2022, 1:49 p.m. UTC | #1
On Thu, 16 Jun 2022 14:50:33 +0100, Ross Burton wrote:
> The SGI-575 build is successful with branch protection enabled, so remove
> this workaround.

Applied, thanks!

[1/2] arm-bsp/trusted-firmware-a: remove SGI-575 workaround
      commit: 60d9cb303d4f08ff5b985a744e9977ac6a03568e
[2/2] arm/trusted-firmware-a: rename to 2.7.0 to match upstream
      commit: 391ba0be671ed16e9c7dbb51e7720bec4ad4cdfb

Best regards,

Patch

diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-sgi575.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-sgi575.inc
index c0f5889a..20904b34 100644
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-sgi575.inc
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-sgi575.inc
@@ -11,4 +11,3 @@  TFA_UEFI           = "1"
 
 EXTRA_OEMAKE += "TRUSTED_BOARD_BOOT=1 GENERATE_COT=1 ARM_ROTPK_LOCATION=devel_rsa \
                      ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem"
-EXTRA_OEMAKE += "CFLAGS=-mbranch-protection=none"