3 @@ -914,10 +914,6 @@ CRTTOOL ?= ${CRTTOOLPATH}/cert_create$
4 ENCTOOLPATH ?= tools/encrypt_fw
5 ENCTOOL ?= ${ENCTOOLPATH}/encrypt_fw${BIN_EXT}
7 -# Variables for use with Firmware Image Package
8 -FIPTOOLPATH ?= tools/fiptool
9 -FIPTOOL ?= ${FIPTOOLPATH}/fiptool${BIN_EXT}
11 # Variables for use with sptool
12 SPTOOLPATH ?= tools/sptool
13 SPTOOL ?= ${SPTOOLPATH}/sptool${BIN_EXT}
14 @@ -1322,13 +1318,6 @@ endif
17 $(call SHELL_REMOVE_DIR,${BUILD_PLAT})
19 - ${Q}${MAKE} --no-print-directory -C ${FIPTOOLPATH} clean
21 -# Clear the MAKEFLAGS as we do not want
22 -# to pass the gnumake flags to nmake.
23 - ${Q}set MAKEFLAGS= && ${MSVC_NMAKE} /nologo /f ${FIPTOOLPATH}/Makefile.msvc FIPTOOLPATH=$(subst /,\,$(FIPTOOLPATH)) FIPTOOL=$(subst /,\,$(FIPTOOL)) clean
25 ${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${CRTTOOLPATH} clean
26 ${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${ENCTOOLPATH} clean
27 ${Q}${MAKE} --no-print-directory -C ${ROMLIBPATH} clean
28 @@ -1337,13 +1326,6 @@ realclean distclean:
30 $(call SHELL_REMOVE_DIR,${BUILD_BASE})
31 $(call SHELL_DELETE_ALL, ${CURDIR}/cscope.*)
33 - ${Q}${MAKE} --no-print-directory -C ${FIPTOOLPATH} clean
35 -# Clear the MAKEFLAGS as we do not want
36 -# to pass the gnumake flags to nmake.
37 - ${Q}set MAKEFLAGS= && ${MSVC_NMAKE} /nologo /f ${FIPTOOLPATH}/Makefile.msvc FIPTOOLPATH=$(subst /,\,$(FIPTOOLPATH)) FIPTOOL=$(subst /,\,$(FIPTOOL)) realclean
39 ${Q}${MAKE} --no-print-directory -C ${SPTOOLPATH} clean
40 ${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${CRTTOOLPATH} clean
41 ${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${ENCTOOLPATH} realclean
42 @@ -1400,7 +1382,7 @@ certificates: ${CRT_DEPS} ${CRTTOOL}
46 -${BUILD_PLAT}/${FIP_NAME}: ${FIP_DEPS} ${FIPTOOL}
47 +${BUILD_PLAT}/${FIP_NAME}: ${FIP_DEPS}
48 $(eval ${CHECK_FIP_CMD})
49 ${Q}${FIPTOOL} create ${FIP_ARGS} $@
50 ${Q}${FIPTOOL} info $@
51 @@ -1417,7 +1399,7 @@ fwu_certificates: ${FWU_CRT_DEPS} ${CRTT
55 -${BUILD_PLAT}/${FWU_FIP_NAME}: ${FWU_FIP_DEPS} ${FIPTOOL}
56 +${BUILD_PLAT}/${FWU_FIP_NAME}: ${FWU_FIP_DEPS}
57 $(eval ${CHECK_FWU_FIP_CMD})
58 ${Q}${FIPTOOL} create ${FWU_FIP_ARGS} $@
59 ${Q}${FIPTOOL} info $@
60 @@ -1425,19 +1407,9 @@ ${BUILD_PLAT}/${FWU_FIP_NAME}: ${FWU_FIP
61 @echo "Built $@ successfully"
65 fip: ${BUILD_PLAT}/${FIP_NAME}
66 fwu_fip: ${BUILD_PLAT}/${FWU_FIP_NAME}
70 - ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" FIPTOOL=${FIPTOOL} --no-print-directory -C ${FIPTOOLPATH}
72 -# Clear the MAKEFLAGS as we do not want
73 -# to pass the gnumake flags to nmake.
74 - ${Q}set MAKEFLAGS= && ${MSVC_NMAKE} /nologo /f ${FIPTOOLPATH}/Makefile.msvc FIPTOOLPATH=$(subst /,\,$(FIPTOOLPATH)) FIPTOOL=$(subst /,\,$(FIPTOOL))
79 ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" SPTOOL=${SPTOOL} --no-print-directory -C ${SPTOOLPATH}
80 --- a/tools/fiptool/Makefile
81 +++ b/tools/fiptool/Makefile
82 @@ -48,7 +48,7 @@ all: ${PROJECT}
84 ${PROJECT}: ${OBJECTS} Makefile
86 - ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS}
87 + ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS} $(LDFLAGS)
89 @echo "Built $@ successfully"