66 lines
2.0 KiB
Diff
66 lines
2.0 KiB
Diff
From 1a9c13100d869ea94a7b987b4f502025c87b3b77 Mon Sep 17 00:00:00 2001
|
|
From: Ross Burton <ross.burton@arm.com>
|
|
Date: Mon, 25 Oct 2021 12:27:59 +0100
|
|
Subject: [PATCH 2/2] fix(fiptool): respect OPENSSL_DIR
|
|
|
|
fiptool links to libcrypto, so as with the other tools it should respect
|
|
OPENSSL_DIR for include/library paths.
|
|
|
|
Change-Id: Icd8c15fa5097db1da9a3a9222d9e267548c4c7e2
|
|
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
|
|
|
Upstream-Status: Backport [https://github.com/ARM-software/arm-trusted-firmware/commit/dd14d0f63f7d049cbcbfd3f8128f05e9a351bbe5]
|
|
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
|
|
---
|
|
Makefile | 2 +-
|
|
tools/fiptool/Makefile | 6 ++++--
|
|
2 files changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 73007b413..fd60b5fba 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1427,7 +1427,7 @@ fwu_fip: ${BUILD_PLAT}/${FWU_FIP_NAME}
|
|
|
|
${FIPTOOL}: FORCE
|
|
ifdef UNIX_MK
|
|
- ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" FIPTOOL=${FIPTOOL} --no-print-directory -C ${FIPTOOLPATH}
|
|
+ ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" FIPTOOL=${FIPTOOL} OPENSSL_DIR=${OPENSSL_DIR} --no-print-directory -C ${FIPTOOLPATH}
|
|
else
|
|
# Clear the MAKEFLAGS as we do not want
|
|
# to pass the gnumake flags to nmake.
|
|
diff --git a/tools/fiptool/Makefile b/tools/fiptool/Makefile
|
|
index 11d2e7b0b..7c2a08379 100644
|
|
--- a/tools/fiptool/Makefile
|
|
+++ b/tools/fiptool/Makefile
|
|
@@ -12,6 +12,8 @@ FIPTOOL ?= fiptool${BIN_EXT}
|
|
PROJECT := $(notdir ${FIPTOOL})
|
|
OBJECTS := fiptool.o tbbr_config.o
|
|
V ?= 0
|
|
+OPENSSL_DIR := /usr
|
|
+
|
|
|
|
override CPPFLAGS += -D_GNU_SOURCE -D_XOPEN_SOURCE=700
|
|
HOSTCCFLAGS := -Wall -Werror -pedantic -std=c99
|
|
@@ -20,7 +22,7 @@ ifeq (${DEBUG},1)
|
|
else
|
|
HOSTCCFLAGS += -O2
|
|
endif
|
|
-LDLIBS := -lcrypto
|
|
+LDLIBS := -L${OPENSSL_DIR}/lib -lcrypto
|
|
|
|
ifeq (${V},0)
|
|
Q := @
|
|
@@ -28,7 +30,7 @@ else
|
|
Q :=
|
|
endif
|
|
|
|
-INCLUDE_PATHS := -I../../include/tools_share
|
|
+INCLUDE_PATHS := -I../../include/tools_share -I${OPENSSL_DIR}/include
|
|
|
|
HOSTCC ?= gcc
|
|
|
|
--
|
|
2.34.1
|
|
|