package/boot/tfa-layerscape/patches/001-fiptool-hostbuild-fixes.patch

   1 --- a/Makefile
   2 +++ b/Makefile
   3 @@ -448,10 +448,6 @@ endif
   4  CRTTOOLPATH            ?=      tools/cert_create
   5  CRTTOOL                        ?=      ${CRTTOOLPATH}/cert_create${BIN_EXT}
   6
   7 -# Variables for use with Firmware Image Package
   8 -FIPTOOLPATH            ?=      tools/fiptool
   9 -FIPTOOL                        ?=      ${FIPTOOLPATH}/fiptool${BIN_EXT}
  10 -
  11  ################################################################################
  12  # Include BL specific makefiles
  13  ################################################################################
  14 @@ -661,14 +657,12 @@ endif
  15  clean:
  16         @echo "  CLEAN"
  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
  20
  21  realclean distclean:
  22         @echo "  REALCLEAN"
  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
  27
  28  checkcodebase:         locate-checkpatch
  29 @@ -717,7 +711,7 @@ certificates: ${CRT_DEPS} ${CRTTOOL}
  30         @${ECHO_BLANK_LINE}
  31  endif
  32
  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 $@
  37         @${ECHO_BLANK_LINE}
  38 @@ -733,21 +727,16 @@ fwu_certificates: ${FWU_CRT_DEPS} ${CRTT
  39         @${ECHO_BLANK_LINE}
  40  endif
  41
  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 $@
  46         @${ECHO_BLANK_LINE}
  47         @echo "Built $@ successfully"
  48         @${ECHO_BLANK_LINE}
  49
  50 -fiptool: ${FIPTOOL}
  51  fip: ${BUILD_PLAT}/${FIP_NAME}
  52  fwu_fip: ${BUILD_PLAT}/${FWU_FIP_NAME}
  53
  54 -.PHONY: ${FIPTOOL}
  55 -${FIPTOOL}:
  56 -       ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" --no-print-directory -C ${FIPTOOLPATH}
  57 -
  58  cscope:
  59         @echo "  CSCOPE"
  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
  64
  65  ${PROJECT}: ${OBJECTS} Makefile
  66         @echo "  LD      $@"
  67 -       ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS}
  68 +       ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS} $(LDFLAGS)
  69         @${ECHO_BLANK_LINE}
  70         @echo "Built $@ successfully"
  71         @${ECHO_BLANK_LINE}