andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "fix(fiptool): respect OPENSSL_DIR" into integration

This commit is contained in:
Madhukar Pappireddy 2021-12-22 22:24:44 +01:00 committed by TrustedFirmware Code Review
parent 9697e4596c 0a956f8180
commit dd14d0f63f
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

@ -1443,7 +1443,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