diff options
author | Ryan Eatmon <reatmon@ti.com> | 2023-07-22 19:16:39 -0500 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2023-07-22 19:40:02 -0500 |
commit | 73dd14226299d1e8048b422e819f231246869e39 (patch) | |
tree | 24d046aad1da46536b87459dc82e4e60bb2d6f02 | |
parent | b8fb4a6ab57c6cac81d5f74974770b6981ae575f (diff) | |
download | meta-ti-73dd14226299d1e8048b422e819f231246869e39.tar.gz |
trusted-firmware-a: Remove rwx patchcicd.master.202307240100cicd.master.202307221943
Upstream meta-arm has picked up support for what this patch was doing,
it can be removed.
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r-- | meta-ti-bsp/recipes-bsp/trusted-firmware-a/files/rwx-segments-ti.patch | 45 | ||||
-rw-r--r-- | meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc | 3 |
2 files changed, 0 insertions, 48 deletions
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 @@ | |||
1 | Binutils 2.39 now warns when a segment has RXW permissions[1]: | ||
2 | |||
3 | aarch64-none-elf-ld.bfd: warning: bl31.elf has a LOAD segment with RWX | ||
4 | permissions | ||
5 | |||
6 | However, TF-A passes --fatal-warnings to LD, so this is a build failure. | ||
7 | |||
8 | There is a ticket filed upstream[2], so until that is resolved just | ||
9 | remove --fatal-warnings. | ||
10 | |||
11 | [1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 | ||
12 | [2] https://developer.trustedfirmware.org/T996 | ||
13 | |||
14 | Upstream-Status: Inappropriate | ||
15 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
16 | |||
17 | |||
18 | Adapted from the above patch in meta-arm, but we cannot use that patch as | ||
19 | we are on an older SRCREV and the Makefile has changed. | ||
20 | |||
21 | Signed-off-by: Ryan Eatmon <reatmon@ti.com> | ||
22 | |||
23 | |||
24 | diff --git a/Makefile b/Makefile | ||
25 | index 3941f8698..13bbac348 100644 | ||
26 | --- a/Makefile | ||
27 | +++ b/Makefile | ||
28 | @@ -421,7 +421,7 @@ TF_LDFLAGS += $(TF_LDFLAGS_$(ARCH)) | ||
29 | # LD = gcc (used when GCC LTO is enabled) | ||
30 | else ifneq ($(findstring gcc,$(notdir $(LD))),) | ||
31 | # Pass ld options with Wl or Xlinker switches | ||
32 | -TF_LDFLAGS += -Wl,--fatal-warnings -O1 | ||
33 | +TF_LDFLAGS += -O1 | ||
34 | TF_LDFLAGS += -Wl,--gc-sections | ||
35 | ifeq ($(ENABLE_LTO),1) | ||
36 | ifeq (${ARCH},aarch64) | ||
37 | @@ -439,7 +439,7 @@ TF_LDFLAGS += $(subst --,-Xlinker --,$(TF_LDFLAGS_$(ARCH))) | ||
38 | |||
39 | # LD = gcc-ld (ld) or llvm-ld (ld.lld) or other | ||
40 | else | ||
41 | -TF_LDFLAGS += --fatal-warnings -O1 | ||
42 | +TF_LDFLAGS += -O1 | ||
43 | TF_LDFLAGS += --gc-sections | ||
44 | # ld.lld doesn't recognize the errata flags, | ||
45 | # 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" | |||
6 | TFA_INSTALL_TARGET:k3 = "bl31" | 6 | TFA_INSTALL_TARGET:k3 = "bl31" |
7 | TFA_SPD:k3 = "opteed" | 7 | TFA_SPD:k3 = "opteed" |
8 | 8 | ||
9 | SRC_URI:append:k3 = " file://rwx-segments-ti.patch" | ||
10 | FILESEXTRAPATHS:prepend := "${THISDIR}/files:" | ||
11 | |||
12 | EXTRA_OEMAKE:append:k3 = "${@ ' K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_USART') else ''}" | 9 | EXTRA_OEMAKE:append:k3 = "${@ ' K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_USART') else ''}" |
13 | EXTRA_OEMAKE:append:k3 = "${@ ' K3_PM_SYSTEM_SUSPEND=' + d.getVar('TFA_K3_SYSTEM_SUSPEND') if d.getVar('TFA_K3_SYSTEM_SUSPEND') else ''}" | 10 | EXTRA_OEMAKE:append:k3 = "${@ ' K3_PM_SYSTEM_SUSPEND=' + d.getVar('TFA_K3_SYSTEM_SUSPEND') if d.getVar('TFA_K3_SYSTEM_SUSPEND') else ''}" |