| --- a/Makefile |
| +++ b/Makefile |
| @@ -448,10 +448,6 @@ endif |
| CRTTOOLPATH ?= tools/cert_create |
| CRTTOOL ?= ${CRTTOOLPATH}/cert_create${BIN_EXT} |
| |
| -# Variables for use with Firmware Image Package |
| -FIPTOOLPATH ?= tools/fiptool |
| -FIPTOOL ?= ${FIPTOOLPATH}/fiptool${BIN_EXT} |
| - |
| ################################################################################ |
| # Include BL specific makefiles |
| ################################################################################ |
| @@ -661,14 +657,12 @@ endif |
| clean: |
| @echo " CLEAN" |
| $(call SHELL_REMOVE_DIR,${BUILD_PLAT}) |
| - ${Q}${MAKE} --no-print-directory -C ${FIPTOOLPATH} clean |
| ${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${CRTTOOLPATH} clean |
| |
| realclean distclean: |
| @echo " REALCLEAN" |
| $(call SHELL_REMOVE_DIR,${BUILD_BASE}) |
| $(call SHELL_DELETE_ALL, ${CURDIR}/cscope.*) |
| - ${Q}${MAKE} --no-print-directory -C ${FIPTOOLPATH} clean |
| ${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${CRTTOOLPATH} clean |
| |
| checkcodebase: locate-checkpatch |
| @@ -717,7 +711,7 @@ certificates: ${CRT_DEPS} ${CRTTOOL} |
| @${ECHO_BLANK_LINE} |
| endif |
| |
| -${BUILD_PLAT}/${FIP_NAME}: ${FIP_DEPS} ${FIPTOOL} |
| +${BUILD_PLAT}/${FIP_NAME}: ${FIP_DEPS} |
| ${Q}${FIPTOOL} create ${FIP_ARGS} $@ |
| ${Q}${FIPTOOL} info $@ |
| @${ECHO_BLANK_LINE} |
| @@ -733,21 +727,16 @@ fwu_certificates: ${FWU_CRT_DEPS} ${CRTT |
| @${ECHO_BLANK_LINE} |
| endif |
| |
| -${BUILD_PLAT}/${FWU_FIP_NAME}: ${FWU_FIP_DEPS} ${FIPTOOL} |
| +${BUILD_PLAT}/${FWU_FIP_NAME}: ${FWU_FIP_DEPS} |
| ${Q}${FIPTOOL} create ${FWU_FIP_ARGS} $@ |
| ${Q}${FIPTOOL} info $@ |
| @${ECHO_BLANK_LINE} |
| @echo "Built $@ successfully" |
| @${ECHO_BLANK_LINE} |
| |
| -fiptool: ${FIPTOOL} |
| fip: ${BUILD_PLAT}/${FIP_NAME} |
| fwu_fip: ${BUILD_PLAT}/${FWU_FIP_NAME} |
| |
| -.PHONY: ${FIPTOOL} |
| -${FIPTOOL}: |
| - ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" --no-print-directory -C ${FIPTOOLPATH} |
| - |
| cscope: |
| @echo " CSCOPE" |
| ${Q}find ${CURDIR} -name "*.[chsS]" > cscope.files |
| --- a/tools/fiptool/Makefile |
| +++ b/tools/fiptool/Makefile |
| @@ -37,7 +37,7 @@ all: ${PROJECT} fip_create |
| |
| ${PROJECT}: ${OBJECTS} Makefile |
| @echo " LD $@" |
| - ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS} |
| + ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS} $(LDFLAGS) |
| @${ECHO_BLANK_LINE} |
| @echo "Built $@ successfully" |
| @${ECHO_BLANK_LINE} |