| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106 |
- --- a/Makefile
- +++ b/Makefile
- @@ -953,10 +953,6 @@ CRTTOOL ?= ${CRTTOOLPATH}/cert_create$
- ENCTOOLPATH ?= tools/encrypt_fw
- ENCTOOL ?= ${ENCTOOLPATH}/encrypt_fw${BIN_EXT}
-
- -# Variables for use with Firmware Image Package
- -FIPTOOLPATH ?= tools/fiptool
- -FIPTOOL ?= ${FIPTOOLPATH}/fiptool${BIN_EXT}
- -
- # Variables for use with sptool
- SPTOOLPATH ?= tools/sptool
- SPTOOL ?= ${SPTOOLPATH}/sptool.py
- @@ -1409,13 +1405,6 @@ endif
- clean:
- @echo " CLEAN"
- $(call SHELL_REMOVE_DIR,${BUILD_PLAT})
- -ifdef UNIX_MK
- - ${Q}${MAKE} --no-print-directory -C ${FIPTOOLPATH} clean
- -else
- -# Clear the MAKEFLAGS as we do not want
- -# to pass the gnumake flags to nmake.
- - ${Q}set MAKEFLAGS= && ${MSVC_NMAKE} /nologo /f ${FIPTOOLPATH}/Makefile.msvc FIPTOOLPATH=$(subst /,\,$(FIPTOOLPATH)) FIPTOOL=$(subst /,\,$(FIPTOOL)) clean
- -endif
- ${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${CRTTOOLPATH} clean
- ${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${ENCTOOLPATH} clean
- ${Q}${MAKE} --no-print-directory -C ${ROMLIBPATH} clean
- @@ -1424,13 +1413,6 @@ realclean distclean:
- @echo " REALCLEAN"
- $(call SHELL_REMOVE_DIR,${BUILD_BASE})
- $(call SHELL_DELETE_ALL, ${CURDIR}/cscope.*)
- -ifdef UNIX_MK
- - ${Q}${MAKE} --no-print-directory -C ${FIPTOOLPATH} clean
- -else
- -# Clear the MAKEFLAGS as we do not want
- -# to pass the gnumake flags to nmake.
- - ${Q}set MAKEFLAGS= && ${MSVC_NMAKE} /nologo /f ${FIPTOOLPATH}/Makefile.msvc FIPTOOLPATH=$(subst /,\,$(FIPTOOLPATH)) FIPTOOL=$(subst /,\,$(FIPTOOL)) realclean
- -endif
- ${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${CRTTOOLPATH} realclean
- ${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${ENCTOOLPATH} realclean
- ${Q}${MAKE} --no-print-directory -C ${ROMLIBPATH} clean
- @@ -1486,7 +1468,7 @@ certificates: ${CRT_DEPS} ${CRTTOOL}
- @${ECHO_BLANK_LINE}
- endif
-
- -${BUILD_PLAT}/${FIP_NAME}: ${FIP_DEPS} ${FIPTOOL}
- +${BUILD_PLAT}/${FIP_NAME}: ${FIP_DEPS}
- $(eval ${CHECK_FIP_CMD})
- ${Q}${FIPTOOL} create ${FIP_ARGS} $@
- ${Q}${FIPTOOL} info $@
- @@ -1503,7 +1485,7 @@ 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}
- $(eval ${CHECK_FWU_FIP_CMD})
- ${Q}${FIPTOOL} create ${FWU_FIP_ARGS} $@
- ${Q}${FIPTOOL} info $@
- @@ -1511,19 +1493,9 @@ ${BUILD_PLAT}/${FWU_FIP_NAME}: ${FWU_FIP
- @echo "Built $@ successfully"
- @${ECHO_BLANK_LINE}
-
- -fiptool: ${FIPTOOL}
- fip: ${BUILD_PLAT}/${FIP_NAME}
- fwu_fip: ${BUILD_PLAT}/${FWU_FIP_NAME}
-
- -${FIPTOOL}: FORCE
- -ifdef UNIX_MK
- - ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" FIPTOOL=${FIPTOOL} OPENSSL_DIR=${OPENSSL_DIR} DEBUG=${DEBUG} V=${V} --no-print-directory -C ${FIPTOOLPATH} all
- -else
- -# Clear the MAKEFLAGS as we do not want
- -# to pass the gnumake flags to nmake.
- - ${Q}set MAKEFLAGS= && ${MSVC_NMAKE} /nologo /f ${FIPTOOLPATH}/Makefile.msvc FIPTOOLPATH=$(subst /,\,$(FIPTOOLPATH)) FIPTOOL=$(subst /,\,$(FIPTOOL))
- -endif
- -
- romlib.bin: libraries FORCE
- ${Q}${MAKE} PLAT_DIR=${PLAT_DIR} BUILD_PLAT=${BUILD_PLAT} ENABLE_BTI=${ENABLE_BTI} ARM_ARCH_MINOR=${ARM_ARCH_MINOR} INCLUDES='${INCLUDES}' DEFINES='${DEFINES}' --no-print-directory -C ${ROMLIBPATH} all
-
- --- a/tools/fiptool/Makefile
- +++ b/tools/fiptool/Makefile
- @@ -67,7 +67,7 @@ all: ${PROJECT}
-
- ${PROJECT}: --openssl ${OBJECTS} Makefile
- @echo " HOSTLD $@"
- - ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS}
- + ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS} $(LDFLAGS)
- @${ECHO_BLANK_LINE}
- @echo "Built $@ successfully"
- @${ECHO_BLANK_LINE}
- --- a/tools/nxp/plat_fiptool/plat_fiptool.mk
- +++ b/tools/nxp/plat_fiptool/plat_fiptool.mk
- @@ -22,11 +22,11 @@ INCLUDE_PATHS += -I${PLAT_DEF_UUID_OID_C
- $(shell rm ${PLAT_DEF_UUID_CONFIG_FILE_PATH}/${PLAT_DEF_UUID_CONFIG_FILE_NAME}.o)
-
- ifeq (${PLAT_DEF_OID},yes)
- -HOSTCCFLAGS += -DPLAT_DEF_OID
- +override HOSTCCFLAGS += -DPLAT_DEF_OID
- endif
-
- ifeq (${PLAT_DEF_UUID},yes)
- -HOSTCCFLAGS += -DPLAT_DEF_FIP_UUID
- +override HOSTCCFLAGS += -DPLAT_DEF_FIP_UUID
- PLAT_OBJECTS += ${PLAT_DEF_UUID_CONFIG_FILE_PATH}/${PLAT_DEF_UUID_CONFIG_FILE_NAME}.o
- endif
-
|
