From b6415e9fa9556705092dd5391ebed48f13741f6e Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Mon, 10 Feb 2025 02:28:54 +0000 Subject: [PATCH] arm-trusted-firmware-tools: update to version 2.12 Upstream changes: 3789c3c00 build: determine toolchain tools dynamically ccbfd01d9 fix(tools): update the fiptool and certtool to fix POSIX build 7c4e1eea6 build: unify verbosity handling 10327628c Merge "feat(stm32mp2): add ddr-fw parameter for fiptool" into integration a11230ad0 refactor(fiptool): change all occurrences of RSS to RSE e494afc05 feat(stm32mp2): add ddr-fw parameter for fiptool ffb774212 build: use new toolchain variables for tools cc277de81 build: refactor toolchain detection 503cf9927 refactor(juno): move plat_def_uuid_config to fiptool 4d4fec281 feat(fiptool): add ability to build statically 352366ede refactor(ethos-n): move build flags to ethosn_npu.mk aa57ce632 build(tools): avoid unnecessary link d4affdce8 Merge "fix(stm32mp1): add void entry in plat_def_toc_entries" into integration 570a23099 fix(fiptool): move juno plat_fiptool.mk 8214ecdab fix(stm32mp1): add void entry in plat_def_toc_entries Signed-off-by: Daniel Golle --- .../boot/arm-trusted-firmware-tools/Makefile | 7 ++++--- .../patches/001-respect-LDFLAGS.patch | 14 ++++++------- .../patches/002-darwin_compile.patch | 21 ++++++++++--------- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/package/boot/arm-trusted-firmware-tools/Makefile b/package/boot/arm-trusted-firmware-tools/Makefile index 209e945a0b..dd0ed66a21 100644 --- a/package/boot/arm-trusted-firmware-tools/Makefile +++ b/package/boot/arm-trusted-firmware-tools/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=arm-trusted-firmware-tools -PKG_VERSION:=2.9 +PKG_VERSION:=2.12 PKG_RELEASE:=1 -PKG_HASH:=76a66a1de0c01aeb83dfc7b72b51173fe62c6e51d6fca17cc562393117bed08b +PKG_HASH:=b4c047493cac1152203e1ba121ae57267e4899b7bf56eb365e22a933342d31c9 PKG_MAINTAINER:=Daniel Golle PKG_HOST_ONLY:=1 @@ -33,7 +33,8 @@ define Host/Compile $(MAKE) -C \ $(HOST_BUILD_DIR)/tools/fiptool \ CPPFLAGS="$(HOST_CFLAGS)" \ - LDFLAGS="$(HOST_LDFLAGS)" + LDFLAGS="$(HOST_LDFLAGS)" \ + OPENSSL_DIR="$(STAGING_DIR_HOST)" endef define Host/Install diff --git a/package/boot/arm-trusted-firmware-tools/patches/001-respect-LDFLAGS.patch b/package/boot/arm-trusted-firmware-tools/patches/001-respect-LDFLAGS.patch index 0b7989163e..8959befaeb 100644 --- a/package/boot/arm-trusted-firmware-tools/patches/001-respect-LDFLAGS.patch +++ b/package/boot/arm-trusted-firmware-tools/patches/001-respect-LDFLAGS.patch @@ -1,11 +1,11 @@ --- a/tools/fiptool/Makefile +++ b/tools/fiptool/Makefile -@@ -38,7 +38,7 @@ +@@ -74,7 +74,7 @@ all: --openssl ${PROJECT} ${PROJECT}: ${OBJECTS} Makefile - @echo " HOSTLD $@" -- ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS} -+ ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS} $(LDFLAGS) - @${ECHO_BLANK_LINE} - @echo "Built $@ successfully" - @${ECHO_BLANK_LINE} + $(s)echo " HOSTLD $@" +- $(q)$(host-cc) ${OBJECTS} -o $@ $(LDOPTS) ++ $(q)$(host-cc) ${OBJECTS} -o $@ $(LDOPTS) $(LDFLAGS) + $(s)echo + $(s)echo "Built $@ successfully" + $(s)echo diff --git a/package/boot/arm-trusted-firmware-tools/patches/002-darwin_compile.patch b/package/boot/arm-trusted-firmware-tools/patches/002-darwin_compile.patch index 6bc8192f44..621047a30e 100644 --- a/package/boot/arm-trusted-firmware-tools/patches/002-darwin_compile.patch +++ b/package/boot/arm-trusted-firmware-tools/patches/002-darwin_compile.patch @@ -1,15 +1,6 @@ --- a/tools/fiptool/fiptool.c +++ b/tools/fiptool/fiptool.c -@@ -3,7 +3,7 @@ - * - * SPDX-License-Identifier: BSD-3-Clause - */ -- -+#define _DARWIN_C_SOURCE - #ifndef _MSC_VER - #include - #endif -@@ -18,6 +18,9 @@ +@@ -19,6 +19,9 @@ #include #include #include @@ -19,3 +10,13 @@ #include "fiptool.h" #include "tbbr_config.h" +--- a/tools/fiptool/fiptool_platform.h ++++ b/tools/fiptool/fiptool_platform.h +@@ -12,6 +12,7 @@ + #ifndef FIPTOOL_PLATFORM_H + #define FIPTOOL_PLATFORM_H + ++#define _DARWIN_C_SOURCE + #ifndef _MSC_VER + + /* Not Visual Studio, so include Posix Headers. */ -- 2.30.2