diff options
| author | dp-arm <dimitris.papastamos@arm.com> | 2016-05-25 16:20:20 +0100 |
|---|---|---|
| committer | dp-arm <dimitris.papastamos@arm.com> | 2016-07-29 10:38:46 +0100 |
| commit | 819281ee23e1fd048e8385ecc708f78dff5e51d9 (patch) | |
| tree | fd58a0e0b5fb745ada84284be438a62d4ec172d4 /Makefile | |
| parent | 6f511c4782f079c75928a4dae3a4e3e4f6754831 (diff) | |
Replace fip_create with fiptool
fiptool provides a more consistent and intuitive interface compared to
the fip_create program. It serves as a better base to build on more
features in the future.
fiptool supports various subcommands. Below are the currently
supported subcommands:
1) info - List the images contained in a FIP file.
2) create - Create a new FIP file with the given images.
3) update - Update an existing FIP with the given images.
4) unpack - Extract a selected set or all the images from a FIP file.
5) remove - Remove images from a FIP file. This is a new command that
was not present in fip_create.
To create a new FIP file, replace "fip_create" with "fiptool create".
To update a FIP file, replace "fip_create" with "fiptool update".
To dump the contents of a FIP file, replace "fip_create --dump" with
"fiptool info".
A compatibility script that emulates the basic functionality of
fip_create is provided. Existing scripts might or might not work with
the compatibility script. Users are strongly encouraged to migrate to
fiptool.
Fixes ARM-Software/tf-issues#87
Fixes ARM-Software/tf-issues#108
Fixes ARM-Software/tf-issues#361
Change-Id: I7ee4da7ac60179cc83cf46af890fd8bc61a53330
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -382,7 +382,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 @@ -390,8 +390,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} ################################################################################ @@ -603,7 +603,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} @@ -618,7 +619,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 @@ -629,7 +631,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" |