3 @@ -448,10 +448,6 @@ endif
4 CRTTOOLPATH ?= tools/cert_create
5 CRTTOOL ?= ${CRTTOOLPATH}/cert_create${BIN_EXT}
7 -# Variables for use with Firmware Image Package
8 -FIPTOOLPATH ?= tools/fiptool
9 -FIPTOOL ?= ${FIPTOOLPATH}/fiptool${BIN_EXT}
11 ################################################################################
12 # Include BL specific makefiles
13 ################################################################################
14 @@ -661,14 +657,12 @@ endif
17 $(call SHELL_REMOVE_DIR,${BUILD_PLAT})
18 - ${Q}${MAKE} --no-print-directory -C ${FIPTOOLPATH} clean
19 ${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${CRTTOOLPATH} clean
23 $(call SHELL_REMOVE_DIR,${BUILD_BASE})
24 $(call SHELL_DELETE_ALL, ${CURDIR}/cscope.*)
25 - ${Q}${MAKE} --no-print-directory -C ${FIPTOOLPATH} clean
26 ${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${CRTTOOLPATH} clean
28 checkcodebase: locate-checkpatch
29 @@ -717,7 +711,7 @@ certificates: ${CRT_DEPS} ${CRTTOOL}
33 -${BUILD_PLAT}/${FIP_NAME}: ${FIP_DEPS} ${FIPTOOL}
34 +${BUILD_PLAT}/${FIP_NAME}: ${FIP_DEPS}
35 ${Q}${FIPTOOL} create ${FIP_ARGS} $@
36 ${Q}${FIPTOOL} info $@
38 @@ -733,21 +727,16 @@ fwu_certificates: ${FWU_CRT_DEPS} ${CRTT
42 -${BUILD_PLAT}/${FWU_FIP_NAME}: ${FWU_FIP_DEPS} ${FIPTOOL}
43 +${BUILD_PLAT}/${FWU_FIP_NAME}: ${FWU_FIP_DEPS}
44 ${Q}${FIPTOOL} create ${FWU_FIP_ARGS} $@
45 ${Q}${FIPTOOL} info $@
47 @echo "Built $@ successfully"
51 fip: ${BUILD_PLAT}/${FIP_NAME}
52 fwu_fip: ${BUILD_PLAT}/${FWU_FIP_NAME}
56 - ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" --no-print-directory -C ${FIPTOOLPATH}
60 ${Q}find ${CURDIR} -name "*.[chsS]" > cscope.files
61 --- a/tools/fiptool/Makefile
62 +++ b/tools/fiptool/Makefile
63 @@ -37,7 +37,7 @@ all: ${PROJECT} fip_create
65 ${PROJECT}: ${OBJECTS} Makefile
67 - ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS}
68 + ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS} $(LDFLAGS)
70 @echo "Built $@ successfully"