mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-14 02:44:45 +00:00
857345496b
A missing '\' caused the remaining parameters not to be passed to make.
This fixes the following error:
| gcc -c [...] fiptool.c -o fiptool.o
| In file included from fiptool.h:16,
| from fiptool.c:19:
|fiptool_platform.h:19:11: fatal error: openssl/sha.h: No such file or directory
| 19 | # include <openssl/sha.h>
| | ^~~~~~~~~~~~~~~
|compilation terminated.
|make[3]: *** [Makefile:58: fiptool.o] Error 1
as the HOST_CFLAGS are no longer passed.
then, HOST_CFLAGS is specified as a command argument, this
is a specific problem of our built since appending these
needs the override directive.
Fixes: df28bfe03247 ("tfa-layerscape: Change to github and use the latest tag")
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
107 lines
3.9 KiB
Diff
107 lines
3.9 KiB
Diff
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -914,10 +914,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${BIN_EXT}
|
|
@@ -1322,13 +1318,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
|
|
@@ -1337,13 +1326,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
|
|
${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${ENCTOOLPATH} realclean
|
|
@@ -1400,7 +1382,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 $@
|
|
@@ -1417,7 +1399,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 $@
|
|
@@ -1425,19 +1407,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} --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
|
|
-
|
|
sptool: ${SPTOOL}
|
|
${SPTOOL}: FORCE
|
|
${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" SPTOOL=${SPTOOL} --no-print-directory -C ${SPTOOLPATH}
|
|
--- a/tools/fiptool/Makefile
|
|
+++ b/tools/fiptool/Makefile
|
|
@@ -48,7 +48,7 @@ all: ${PROJECT}
|
|
|
|
${PROJECT}: ${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 2023-05-20 22:28:28.079945619 +0200
|
|
+++ b/tools/nxp/plat_fiptool/plat_fiptool.mk 2023-05-20 22:26:59.443307771 +0200
|
|
@@ -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
|
|
|