diff options
author | davidcunado-arm <david.cunado@arm.com> | 2018-02-06 05:12:28 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-06 05:12:28 +0000 |
commit | 9fd2f13bd608832260300640970f73c62357c684 (patch) | |
tree | 149d13158075ab08cccff2710ee8bedd0406d2c1 /Makefile | |
parent | 10787b0519afce1e887a935789b2d624849856a9 (diff) | |
parent | 8951b058fce077dab7afcd86c532ec0fc0200352 (diff) |
Merge pull request #1224 from masahir0y/gzip
Support GZIP-compressed images for faster loading and verification
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 24 |
1 files changed, 13 insertions, 11 deletions
@@ -193,6 +193,7 @@ BL_COMMON_SOURCES += common/bl_common.c \ lib/${ARCH}/cache_helpers.S \ lib/${ARCH}/misc_helpers.S \ plat/common/plat_log_common.c \ + plat/common/platform_helpers_default.c \ plat/common/${ARCH}/plat_common.c \ plat/common/${ARCH}/platform_helpers.S \ ${COMPILER_RT_SRCS} \ @@ -598,38 +599,39 @@ ifeq (${BL2_AT_EL3}, 0) FIP_BL2_ARGS := tb-fw endif -$(if ${BL2}, $(eval $(call MAKE_TOOL_ARGS,2,${BL2},${FIP_BL2_ARGS})),\ +$(if ${BL2}, $(eval $(call TOOL_ADD_IMG,bl2,--${FIP_BL2_ARGS})),\ $(eval $(call MAKE_BL,2,${FIP_BL2_ARGS}))) endif ifeq (${NEED_SCP_BL2},yes) -$(eval $(call FIP_ADD_IMG,SCP_BL2,--scp-fw)) +$(eval $(call TOOL_ADD_IMG,scp_bl2,--scp-fw)) endif ifeq (${NEED_BL31},yes) BL31_SOURCES += ${SPD_SOURCES} -$(if ${BL31}, $(eval $(call MAKE_TOOL_ARGS,31,${BL31},soc-fw)),\ +$(if ${BL31}, $(eval $(call TOOL_ADD_IMG,bl31,--soc-fw)),\ $(eval $(call MAKE_BL,31,soc-fw))) endif # If a BL32 image is needed but neither BL32 nor BL32_SOURCES is defined, the -# build system will call FIP_ADD_IMG to print a warning message and abort the +# build system will call TOOL_ADD_IMG to print a warning message and abort the # process. Note that the dependency on BL32 applies to the FIP only. ifeq (${NEED_BL32},yes) -$(if ${BL32}, $(eval $(call MAKE_TOOL_ARGS,32,${BL32},tos-fw)),\ - $(if ${BL32_SOURCES}, $(eval $(call MAKE_BL,32,tos-fw)),\ - $(eval $(call FIP_ADD_IMG,BL32,--tos-fw)))) + +BUILD_BL32 := $(if $(BL32),,$(if $(BL32_SOURCES),1)) + +$(if ${BUILD_BL32}, $(eval $(call MAKE_BL,32,tos-fw)),\ + $(eval $(call TOOL_ADD_IMG,bl32,--tos-fw))) endif # Add the BL33 image if required by the platform ifeq (${NEED_BL33},yes) -$(eval $(call FIP_ADD_IMG,BL33,--nt-fw)) +$(eval $(call TOOL_ADD_IMG,bl33,--nt-fw)) endif ifeq (${NEED_BL2U},yes) -BL2U_PATH := $(if ${BL2U},${BL2U},$(call IMG_BIN,2u)) -$(if ${BL2U}, ,$(eval $(call MAKE_BL,2u))) -$(eval $(call FWU_FIP_ADD_PAYLOAD,${BL2U_PATH},--ap-fwu-cfg)) +$(if ${BL2U}, $(eval $(call TOOL_ADD_IMG,bl2u,--ap-fwu-cfg,FWU_)),\ + $(eval $(call MAKE_BL,2u,ap-fwu-cfg,FWU_))) endif # Expand build macros for the different images |