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 /make_helpers | |
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 'make_helpers')
-rw-r--r-- | make_helpers/build_macros.mk | 10 | ||||
-rw-r--r-- | make_helpers/tbbr/tbbr_tools.mk | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk index 165e3aad..16bdd788 100644 --- a/make_helpers/build_macros.mk +++ b/make_helpers/build_macros.mk @@ -112,7 +112,7 @@ define IMG_BIN ${BUILD_PLAT}/bl$(1).bin endef -# FIP_ADD_PAYLOAD appends the command line arguments required by the FIP tool +# FIP_ADD_PAYLOAD appends the command line arguments required by fiptool # to package a new payload. Optionally, it adds the dependency on this payload # $(1) = payload filename (i.e. bl31.bin) # $(2) = command line option for the specified payload (i.e. --bl31) @@ -135,7 +135,7 @@ endef # using a build option. It also adds a dependency on the image file, aborting # the build if the file does not exist. # $(1) = build option to specify the image filename (SCP_BL2, BL33, etc) -# $(2) = command line option for the fip_create tool (scp_bl2, bl33, etc) +# $(2) = command line option for fiptool (scp_bl2, bl33, etc) # Example: # $(eval $(call FIP_ADD_IMG,BL33,--bl33)) define FIP_ADD_IMG @@ -147,7 +147,7 @@ check_$(1): $$(if $(value $(1)),,$$(error "Platform '${PLAT}' requires $(1). Please set $(1) to point to the right file")) endef -# FWU_FIP_ADD_PAYLOAD appends the command line arguments required by the FIP tool +# FWU_FIP_ADD_PAYLOAD appends the command line arguments required by fiptool # to package a new FWU payload. Optionally, it adds the dependency on this payload # $(1) = payload filename (e.g. ns_bl2u.bin) # $(2) = command line option for the specified payload (e.g. --fwu) @@ -168,7 +168,7 @@ endef # FWU_FIP_ADD_IMG allows the platform to pack a binary image in the FWU FIP # $(1) build option to specify the image filename (BL2U, NS_BL2U, etc) -# $(2) command line option for the fip_create tool (bl2u, ns_bl2u, etc) +# $(2) command line option for fiptool (bl2u, ns_bl2u, etc) # Example: # $(eval $(call FWU_FIP_ADD_IMG,BL2U,--bl2u)) define FWU_FIP_ADD_IMG @@ -301,7 +301,7 @@ define SOURCES_TO_OBJS endef -# MAKE_TOOL_ARGS macro defines the command line arguments for the FIP tool for +# MAKE_TOOL_ARGS macro defines the command line arguments for fiptool for # each BL image. Arguments: # $(1) = BL stage (2, 30, 31, 32, 33) # $(2) = Binary file diff --git a/make_helpers/tbbr/tbbr_tools.mk b/make_helpers/tbbr/tbbr_tools.mk index 71d97473..8d3f14ff 100644 --- a/make_helpers/tbbr/tbbr_tools.mk +++ b/make_helpers/tbbr/tbbr_tools.mk @@ -30,7 +30,7 @@ # This file defines the keys and certificates that must be created to establish # a Chain of Trust following the TBBR document. These definitions include the -# command line options passed to the cert_create and fip_create tools. +# command line options passed to the cert_create and fiptool commands. # # Expected environment: # @@ -66,11 +66,11 @@ NTFW_NVCTR_VAL ?= 0 $(eval $(call CERT_ADD_CMD_OPT,${TFW_NVCTR_VAL},--tfw-nvctr)) $(eval $(call CERT_ADD_CMD_OPT,${NTFW_NVCTR_VAL},--ntfw-nvctr)) -# Add Trusted Key certificate to the fip_create and cert_create command line options +# Add Trusted Key certificate to the fiptool and cert_create command line options $(eval $(call FIP_ADD_PAYLOAD,${TRUSTED_KEY_CERT},--trusted-key-cert)) $(eval $(call CERT_ADD_CMD_OPT,${TRUSTED_KEY_CERT},--trusted-key-cert)) -# Add fwu certificate to the fip_create and cert_create command line options +# Add fwu certificate to the fiptool and cert_create command line options $(eval $(call FWU_FIP_ADD_PAYLOAD,${FWU_CERT},--fwu-cert)) $(eval $(call FWU_CERT_ADD_CMD_OPT,${FWU_CERT},--fwu-cert)) |