From 73dd14226299d1e8048b422e819f231246869e39 Mon Sep 17 00:00:00 2001 From: Ryan Eatmon Date: Sat, 22 Jul 2023 19:16:39 -0500 Subject: trusted-firmware-a: Remove rwx patch Upstream meta-arm has picked up support for what this patch was doing, it can be removed. Signed-off-by: Ryan Eatmon --- .../trusted-firmware-a/files/rwx-segments-ti.patch | 45 ---------------------- .../trusted-firmware-a/trusted-firmware-a-ti.inc | 3 -- 2 files changed, 48 deletions(-) delete mode 100644 meta-ti-bsp/recipes-bsp/trusted-firmware-a/files/rwx-segments-ti.patch diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/files/rwx-segments-ti.patch b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/files/rwx-segments-ti.patch deleted file mode 100644 index 826a4b32..00000000 --- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/files/rwx-segments-ti.patch +++ /dev/null @@ -1,45 +0,0 @@ -Binutils 2.39 now warns when a segment has RXW permissions[1]: - -aarch64-none-elf-ld.bfd: warning: bl31.elf has a LOAD segment with RWX -permissions - -However, TF-A passes --fatal-warnings to LD, so this is a build failure. - -There is a ticket filed upstream[2], so until that is resolved just -remove --fatal-warnings. - -[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 -[2] https://developer.trustedfirmware.org/T996 - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton - - -Adapted from the above patch in meta-arm, but we cannot use that patch as -we are on an older SRCREV and the Makefile has changed. - -Signed-off-by: Ryan Eatmon - - -diff --git a/Makefile b/Makefile -index 3941f8698..13bbac348 100644 ---- a/Makefile -+++ b/Makefile -@@ -421,7 +421,7 @@ TF_LDFLAGS += $(TF_LDFLAGS_$(ARCH)) - # LD = gcc (used when GCC LTO is enabled) - else ifneq ($(findstring gcc,$(notdir $(LD))),) - # Pass ld options with Wl or Xlinker switches --TF_LDFLAGS += -Wl,--fatal-warnings -O1 -+TF_LDFLAGS += -O1 - TF_LDFLAGS += -Wl,--gc-sections - ifeq ($(ENABLE_LTO),1) - ifeq (${ARCH},aarch64) -@@ -439,7 +439,7 @@ TF_LDFLAGS += $(subst --,-Xlinker --,$(TF_LDFLAGS_$(ARCH))) - - # LD = gcc-ld (ld) or llvm-ld (ld.lld) or other - else --TF_LDFLAGS += --fatal-warnings -O1 -+TF_LDFLAGS += -O1 - TF_LDFLAGS += --gc-sections - # ld.lld doesn't recognize the errata flags, - # therefore don't add those in that case diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc index dc72fb1e..64bfec67 100644 --- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc +++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc @@ -6,8 +6,5 @@ TFA_BUILD_TARGET:k3 = "all" TFA_INSTALL_TARGET:k3 = "bl31" TFA_SPD:k3 = "opteed" -SRC_URI:append:k3 = " file://rwx-segments-ti.patch" -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" - EXTRA_OEMAKE:append:k3 = "${@ ' K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_USART') else ''}" EXTRA_OEMAKE:append:k3 = "${@ ' K3_PM_SYSTEM_SUSPEND=' + d.getVar('TFA_K3_SYSTEM_SUSPEND') if d.getVar('TFA_K3_SYSTEM_SUSPEND') else ''}" -- cgit v1.2.3-54-g00ecf