diff options
| author | danh-arm <dan.handley@arm.com> | 2016-08-09 10:16:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-09 10:16:36 +0100 |
| commit | 41b568f5b3b4c57f920af2fd9e71d3b6168d5d10 (patch) | |
| tree | b853892f2cfb44f8bfdc6c5d6c409c93b22ad5af /Makefile | |
| parent | 3d99b17f60142ef96d39759132d4448e138b6c4e (diff) | |
| parent | 819281ee23e1fd048e8385ecc708f78dff5e51d9 (diff) | |
Merge pull request #661 from dp-arm/master
Replace fip_create with fiptool
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -390,7 +390,7 @@ ENABLE_PMF := 1 endif ################################################################################ -# Auxiliary tools (fip_create, cert_create, etc) +# Auxiliary tools (fiptool, cert_create, etc) ################################################################################ # Variables for use with Certificate Generation Tool @@ -398,8 +398,8 @@ CRTTOOLPATH ?= tools/cert_create CRTTOOL ?= ${CRTTOOLPATH}/cert_create${BIN_EXT} # Variables for use with Firmware Image Package -FIPTOOLPATH ?= tools/fip_create -FIPTOOL ?= ${FIPTOOLPATH}/fip_create${BIN_EXT} +FIPTOOLPATH ?= tools/fiptool +FIPTOOL ?= ${FIPTOOLPATH}/fiptool${BIN_EXT} ################################################################################ @@ -613,7 +613,8 @@ certificates: ${CRT_DEPS} ${CRTTOOL} endif ${BUILD_PLAT}/${FIP_NAME}: ${FIP_DEPS} ${FIPTOOL} - ${Q}${FIPTOOL} --dump ${FIP_ARGS} $@ + ${Q}${FIPTOOL} create ${FIP_ARGS} $@ + ${Q}${FIPTOOL} info $@ @${ECHO_BLANK_LINE} @echo "Built $@ successfully" @${ECHO_BLANK_LINE} @@ -628,7 +629,8 @@ fwu_certificates: ${FWU_CRT_DEPS} ${CRTTOOL} endif ${BUILD_PLAT}/${FWU_FIP_NAME}: ${FWU_FIP_DEPS} ${FIPTOOL} - ${Q}${FIPTOOL} --dump ${FWU_FIP_ARGS} $@ + ${Q}${FIPTOOL} create ${FWU_FIP_ARGS} $@ + ${Q}${FIPTOOL} info $@ @echo @echo "Built $@ successfully" @echo @@ -639,7 +641,7 @@ fwu_fip: ${BUILD_PLAT}/${FWU_FIP_NAME} .PHONY: ${FIPTOOL} ${FIPTOOL}: - ${Q}${MAKE} --no-print-directory -C ${FIPTOOLPATH} + ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" --no-print-directory -C ${FIPTOOLPATH} cscope: @echo " CSCOPE" |