aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadhukar Pappireddy <madhukar.pappireddy@arm.com>2020-07-31 14:07:17 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2020-07-31 14:07:17 +0000
commit15320adb831dc1cbae931dc93b2491120ad09780 (patch)
tree4e312f184323c70479fd59c2e92de18166accaa8
parent499f192c1d31189d13fbd69fd71067555b621c53 (diff)
parent582e4e7b2852ae31f1a7f55bd45c412508b952a6 (diff)
downloadtrusted-firmware-a-15320adb831dc1cbae931dc93b2491120ad09780.tar.gz
Merge "Makefile, doc: Make OPENSSL_DIR variable as build option for tools" into integration
-rw-r--r--Makefile4
-rw-r--r--docs/getting_started/build-options.rst4
-rw-r--r--make_helpers/defaults.mk3
3 files changed, 9 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 65ebb9372..fa711e26a 100644
--- a/Makefile
+++ b/Makefile
@@ -1201,7 +1201,7 @@ certtool: ${CRTTOOL}
.PHONY: ${CRTTOOL}
${CRTTOOL}:
- ${Q}${MAKE} PLAT=${PLAT} USE_TBBR_DEFS=${USE_TBBR_DEFS} COT=${COT} --no-print-directory -C ${CRTTOOLPATH}
+ ${Q}${MAKE} PLAT=${PLAT} USE_TBBR_DEFS=${USE_TBBR_DEFS} COT=${COT} OPENSSL_DIR=${OPENSSL_DIR} --no-print-directory -C ${CRTTOOLPATH}
@${ECHO_BLANK_LINE}
@echo "Built $@ successfully"
@${ECHO_BLANK_LINE}
@@ -1267,7 +1267,7 @@ enctool: ${ENCTOOL}
.PHONY: ${ENCTOOL}
${ENCTOOL}:
- ${Q}${MAKE} PLAT=${PLAT} BUILD_INFO=0 --no-print-directory -C ${ENCTOOLPATH}
+ ${Q}${MAKE} PLAT=${PLAT} BUILD_INFO=0 OPENSSL_DIR=${OPENSSL_DIR} --no-print-directory -C ${ENCTOOLPATH}
@${ECHO_BLANK_LINE}
@echo "Built $@ successfully"
@${ECHO_BLANK_LINE}
diff --git a/docs/getting_started/build-options.rst b/docs/getting_started/build-options.rst
index bfc50dfe7..630d86119 100644
--- a/docs/getting_started/build-options.rst
+++ b/docs/getting_started/build-options.rst
@@ -721,6 +721,10 @@ Common build options
bit, to trap access to the RAS ERR and RAS ERX registers from lower ELs.
This flag is disabled by default.
+- ``OPENSSL_DIR``: This flag is used to provide the installed openssl directory
+ path on the host machine which is used to build certificate generation and
+ firmware encryption tool.
+
GICv3 driver options
--------------------
diff --git a/make_helpers/defaults.mk b/make_helpers/defaults.mk
index 9a6fd58fb..caf5990f2 100644
--- a/make_helpers/defaults.mk
+++ b/make_helpers/defaults.mk
@@ -308,3 +308,6 @@ RAS_TRAP_LOWER_EL_ERR_ACCESS := 0
# Build option to create cot descriptors using fconf
COT_DESC_IN_DTB := 0
+
+# Build option to provide openssl directory path
+OPENSSL_DIR := /usr