diff mbox series

[1/4] arm/trusted-firmware-m: remove stale patch

Message ID 20211215111311.3066077-1-ross.burton@arm.com
State New
Headers show
Series [1/4] arm/trusted-firmware-m: remove stale patch | expand

Commit Message

Ross Burton Dec. 15, 2021, 11:13 a.m. UTC 
This patch should have been removed as part of the 1.2.0 upgrade.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../trusted-firmware-m/files/objcopy.patch    | 20 -------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-m/files/objcopy.patch

Comments

Jon Mason Dec. 15, 2021, 2:09 p.m. UTC | #1 
On Wed, 15 Dec 2021 11:13:08 +0000, Ross Burton wrote:
> This patch should have been removed as part of the 1.2.0 upgrade.
> 
> 

Applied, thanks!

[1/4] arm/trusted-firmware-m: remove stale patch
      commit: 3d3d04ce09476c4ee0ef953b63d816552a0722e2
[2/4] arm/trusted-firmware-m: upgrade to 1.5.0
      commit: 7519014213977163d50aa135bc85ed3e42c1f13f
[3/4] arm/trusted-firmware-m: use Ninja to build
      commit: 018fd6aecf82409f5f652a24810cf68092ace406
[4/4] arm-bsp/trusted-firmware-m: update CS1K bbappend for TF-M 1.5
      commit: 9cc42e5256f19e08fb5a386ce9e43d351a569533

Best regards,
diff mbox series

Patch

diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/files/objcopy.patch b/meta-arm/recipes-bsp/trusted-firmware-m/files/objcopy.patch
deleted file mode 100644
index 5734c13a..00000000
--- a/meta-arm/recipes-bsp/trusted-firmware-m/files/objcopy.patch
+++ /dev/null
@@ -1,20 +0,0 @@ 
-The BFD target elf32-little has no specified machine, which trips the
-architecture sanity test.  Use elf32-littlearm to set the machine
-correctly.
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@arm.com>
-
-diff --git a/cmake/Common/CompilerGNUARMCommon.cmake b/cmake/Common/CompilerGNUARMCommon.cmake
-index 32e805bb..2d3ea8e4 100644
---- a/cmake/Common/CompilerGNUARMCommon.cmake
-+++ b/cmake/Common/CompilerGNUARMCommon.cmake
-@@ -196,7 +196,7 @@ function(compiler_generate_hex_output TARGET)
- endfunction()
- 
- function(compiler_generate_elf_output TARGET)
--	add_custom_command(TARGET ${TARGET} POST_BUILD COMMAND ${CMAKE_GNUARM_OBJCOPY} ARGS -O elf32-little $<TARGET_FILE:${TARGET}> $<TARGET_FILE_DIR:${TARGET}>/${TARGET}.elf)
-+	add_custom_command(TARGET ${TARGET} POST_BUILD COMMAND ${CMAKE_GNUARM_OBJCOPY} ARGS -O elf32-littlearm $<TARGET_FILE:${TARGET}> $<TARGET_FILE_DIR:${TARGET}>/${TARGET}.elf)
- endfunction()
- 
- # Function for creating a new target that preprocesses a .c file