tfa-layerscape: Bump to lf-6.6.23-2.0.0

This commit bumps tfa-layerscape package to version lf-6.6.23-2.0.0

Manually rebased:
001-fiptool-hostbuild-fixes.patch

Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/16360
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/package/boot/tfa-layerscape/Makefile b/package/boot/tfa-layerscape/Makefile
index bf155b926a0153dc1622f48b58656d335835aa61..c97dd997ffa6633f6d5d803d672a2111bef0146a 100644 (file)
--- a/package/boot/tfa-layerscape/Makefile
+++ b/package/boot/tfa-layerscape/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tfa-layerscape
-PKG_VERSION:=6.6.3.1.0.0
+PKG_VERSION:=6.6.23.2.0.0
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/nxp-qoriq/atf
-PKG_SOURCE_VERSION:=lf-6.6.3-1.0.0
-PKG_MIRROR_HASH:=28b731c1c4cc3226ccaef2142c61127f213c03cbd219df556c1d191e95f8470c
+PKG_SOURCE_VERSION:=lf-6.6.23-2.0.0
+PKG_MIRROR_HASH:=628a95ba60a593ae0575ee9ede1154445ec3a86a07b18e4947e06e13c2b67859
 PKG_BUILD_DEPENDS:=tfa-layerscape/host
 
 include $(INCLUDE_DIR)/host-build.mk

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 050b4356efb2cc3aa68fbc09495d7bedeb60aab4..db91bd75dd1d8802b1b76a02666e8688b75a13a6 100644 (file)
--- a/package/boot/tfa-layerscape/patches/001-fiptool-hostbuild-fixes.patch
+++ b/package/boot/tfa-layerscape/patches/001-fiptool-hostbuild-fixes.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -953,10 +953,6 @@ CRTTOOL                   ?=      ${CRTTOOLPATH}/cert_create$
+@@ -128,10 +128,6 @@ CRTTOOL                   ?=      ${CRTTOOLPATH}/cert_create$
  ENCTOOLPATH           ?=      tools/encrypt_fw
  ENCTOOL                       ?=      ${ENCTOOLPATH}/encrypt_fw${BIN_EXT}
  
@@ -11,7 +11,7 @@
  # Variables for use with sptool
  SPTOOLPATH            ?=      tools/sptool
  SPTOOL                        ?=      ${SPTOOLPATH}/sptool.py
-@@ -1409,13 +1405,6 @@ endif
+@@ -1597,13 +1593,6 @@ endif #(CHECKPATCH)
  clean:
        @echo "  CLEAN"
        $(call SHELL_REMOVE_DIR,${BUILD_PLAT})
@@ -21,11 +21,11 @@
 -# 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
+-endif #(UNIX_MK)
        ${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:
+@@ -1612,13 +1601,6 @@ realclean distclean:
        @echo "  REALCLEAN"
        $(call SHELL_REMOVE_DIR,${BUILD_BASE})
        $(call SHELL_DELETE_ALL, ${CURDIR}/cscope.*)
@@ -35,29 +35,29 @@
 -# 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
+-endif #(UNIX_MK)
        ${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}
+@@ -1674,7 +1656,7 @@ certificates: ${CRT_DEPS} ${CRTTOOL}
        @${ECHO_BLANK_LINE}
- endif
+ endif #(GENERATE_COT)
  
 -${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
+@@ -1691,7 +1673,7 @@ fwu_certificates: ${FWU_CRT_DEPS} ${CRTT
        @${ECHO_BLANK_LINE}
- endif
+ endif #(GENERATE_COT)
  
 -${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
+@@ -1699,19 +1681,9 @@ ${BUILD_PLAT}/${FWU_FIP_NAME}: ${FWU_FIP
        @echo "Built $@ successfully"
        @${ECHO_BLANK_LINE}
  
@@ -72,26 +72,26 @@
 -# 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
+-endif #(UNIX_MK)
 -
  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}
+@@ -81,7 +81,7 @@ all: --openssl ${PROJECT}
  
- ${PROJECT}: --openssl ${OBJECTS} Makefile
+ ${PROJECT}: ${OBJECTS} Makefile
        @echo "  HOSTLD  $@"
--      ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS}
-+      ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS} $(LDFLAGS)
+-      ${Q}${HOSTCC} ${OBJECTS} -o $@ $(LDOPTS)
++      ${Q}${HOSTCC} ${OBJECTS} -o $@ $(LDOPTS) $(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)
+--- a/tools/fiptool/plat_fiptool/nxp/plat_fiptool.mk
++++ b/tools/fiptool/plat_fiptool/nxp/plat_fiptool.mk
+@@ -21,11 +21,11 @@ INCLUDE_PATHS += -I${PLAT_DEF_UUID_OID_C
+                -I./
  
  ifeq (${PLAT_DEF_OID},yes)
 -HOSTCCFLAGS += -DPLAT_DEF_OID