diff options
Diffstat (limited to 'package/boot/tfa-layerscape/patches/001-fiptool-hostbuild-fixes.patch')
| -rw-r--r-- | package/boot/tfa-layerscape/patches/001-fiptool-hostbuild-fixes.patch | 62 |
1 files changed, 43 insertions, 19 deletions
diff --git a/package/boot/tfa-layerscape/patches/001-fiptool-hostbuild-fixes.patch b/package/boot/tfa-layerscape/patches/001-fiptool-hostbuild-fixes.patch index 0567e5869b..4b74048754 100644 --- a/package/boot/tfa-layerscape/patches/001-fiptool-hostbuild-fixes.patch +++ b/package/boot/tfa-layerscape/patches/001-fiptool-hostbuild-fixes.patch @@ -1,32 +1,45 @@ --- a/Makefile +++ b/Makefile -@@ -448,10 +448,6 @@ endif - CRTTOOLPATH ?= tools/cert_create - CRTTOOL ?= ${CRTTOOLPATH}/cert_create${BIN_EXT} +@@ -801,10 +801,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} - - ################################################################################ - # Include BL specific makefiles - ################################################################################ -@@ -661,14 +657,12 @@ endif + # Variables for use with sptool + SPTOOLPATH ?= tools/sptool + SPTOOL ?= ${SPTOOLPATH}/sptool${BIN_EXT} +@@ -1160,13 +1156,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 - - realclean distclean: + ${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${ENCTOOLPATH} clean + ${Q}${MAKE} --no-print-directory -C ${ROMLIBPATH} clean +@@ -1175,13 +1164,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} --no-print-directory -C ${SPTOOLPATH} clean ${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${CRTTOOLPATH} clean - - checkcodebase: locate-checkpatch -@@ -717,7 +711,7 @@ certificates: ${CRT_DEPS} ${CRTTOOL} + ${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${ENCTOOLPATH} realclean +@@ -1238,7 +1220,7 @@ certificates: ${CRT_DEPS} ${CRTTOOL} @${ECHO_BLANK_LINE} endif @@ -35,7 +48,7 @@ ${Q}${FIPTOOL} create ${FIP_ARGS} $@ ${Q}${FIPTOOL} info $@ @${ECHO_BLANK_LINE} -@@ -733,21 +727,16 @@ fwu_certificates: ${FWU_CRT_DEPS} ${CRTT +@@ -1254,7 +1236,7 @@ fwu_certificates: ${FWU_CRT_DEPS} ${CRTT @${ECHO_BLANK_LINE} endif @@ -44,26 +57,37 @@ ${Q}${FIPTOOL} create ${FWU_FIP_ARGS} $@ ${Q}${FIPTOOL} info $@ @${ECHO_BLANK_LINE} +@@ -1279,24 +1261,10 @@ ${BUILD_PLAT}/${DDR_FIP_NAME}: ${DDR_FIP @echo "Built $@ successfully" @${ECHO_BLANK_LINE} -fiptool: ${FIPTOOL} fip: ${BUILD_PLAT}/${FIP_NAME} fwu_fip: ${BUILD_PLAT}/${FWU_FIP_NAME} + fip_ddr: ${BUILD_PLAT}/${DDR_FIP_NAME} -.PHONY: ${FIPTOOL} -${FIPTOOL}: -- ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" --no-print-directory -C ${FIPTOOLPATH} +- @${ECHO_BLANK_LINE} +- @echo "Building $@" +-ifdef UNIX_MK +- ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" FIPTOOL=${FIPTOOL} --no-print-directory -C ${FIPTOOLPATH} +-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 +- @${ECHO_BLANK_LINE} - - cscope: - @echo " CSCOPE" - ${Q}find ${CURDIR} -name "*.[chsS]" > cscope.files + sptool: ${SPTOOL} + .PHONY: ${SPTOOL} + ${SPTOOL}: --- a/tools/fiptool/Makefile +++ b/tools/fiptool/Makefile -@@ -37,7 +37,7 @@ all: ${PROJECT} fip_create +@@ -38,7 +38,7 @@ all: ${PROJECT} ${PROJECT}: ${OBJECTS} Makefile - @echo " LD $@" + @echo " HOSTLD $@" - ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS} + ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS} $(LDFLAGS) @${ECHO_BLANK_LINE} |