Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-05-01 08:05:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(fiptool): respect OPENSSL_DIR

Browse source 
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>
This commit is contained in:
Ross Burton 2021-10-25 12:27:59 +01:00
parent 73193689c0
commit 0a956f8180
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1427,7 +1427,7 @@ fwu_fip: ${BUILD_PLAT}/${FWU_FIP_NAME}
${FIPTOOL}: FORCE ${FIPTOOL}: FORCE
ifdef UNIX_MK 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 else
# Clear the MAKEFLAGS as we do not want # Clear the MAKEFLAGS as we do not want
# to pass the gnumake flags to nmake. # to pass the gnumake flags to nmake.

6
tools/fiptool/Makefile
View file

@ -12,6 +12,8 @@ FIPTOOL ?= fiptool${BIN_EXT}
PROJECT := $(notdir ${FIPTOOL}) PROJECT := $(notdir ${FIPTOOL})
OBJECTS := fiptool.o tbbr_config.o OBJECTS := fiptool.o tbbr_config.o
V ?= 0 V ?= 0
OPENSSL_DIR := /usr
override CPPFLAGS += -D_GNU_SOURCE -D_XOPEN_SOURCE=700 override CPPFLAGS += -D_GNU_SOURCE -D_XOPEN_SOURCE=700
HOSTCCFLAGS := -Wall -Werror -pedantic -std=c99 HOSTCCFLAGS := -Wall -Werror -pedantic -std=c99
@ -20,7 +22,7 @@ ifeq (${DEBUG},1)
else else
HOSTCCFLAGS += -O2 HOSTCCFLAGS += -O2
endif endif
LDLIBS := -lcrypto LDLIBS := -L${OPENSSL_DIR}/lib -lcrypto
ifeq (${V},0) ifeq (${V},0)
Q := @ Q := @
@ -28,7 +30,7 @@ else
Q := Q :=
endif endif
INCLUDE_PATHS := -I../../include/tools_share INCLUDE_PATHS := -I../../include/tools_share -I${OPENSSL_DIR}/include
HOSTCC ?= gcc HOSTCC ?= gcc