projects / openwrt / openwrt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c773c3f)
tfa-layerscape: Bump to lf-6.12.20-2.0.0
authorPawel Dembicki <[email protected]>
Sat, 21 Jun 2025 05:41:46 +0000 (07:41 +0200)
committerHauke Mehrtens <[email protected]>
Sun, 17 Aug 2025 17:00:58 +0000 (19:00 +0200)
Bump tfa-layerscape to version lf-6.12.20-2.0.0

Signed-off-by: Pawel Dembicki <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/19152
Signed-off-by: Hauke Mehrtens <[email protected]>
package/boot/tfa-layerscape/Makefile patch | blob | history
package/boot/tfa-layerscape/patches/001-fiptool-hostbuild-fixes.patch patch | blob | history
package/boot/tfa-layerscape/patches/003-plat-nxp-tools-fix-create_pbl-and-byte_swap-host-bui.patch patch | blob | history

diff --git a/package/boot/tfa-layerscape/Makefile b/package/boot/tfa-layerscape/Makefile
index a6519ca02d2e72c0b6289a6050f423dc40becab8..ab885b4b855c8befff4cceba949404b1ad04debf 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.23.2.0.0
-PKG_RELEASE:=2
+PKG_VERSION:=6.12.20.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.23-2.0.0
-PKG_MIRROR_HASH:=628a95ba60a593ae0575ee9ede1154445ec3a86a07b18e4947e06e13c2b67859
+PKG_SOURCE_VERSION:=lf-6.12.20-2.0.0
+PKG_MIRROR_HASH:=1e1c74900113a8d4354c06fdcedfff2cd6b0899b4a063d393de98f8ca358dfd2
 PKG_BUILD_DEPENDS:=tfa-layerscape/host
 
 include $(INCLUDE_DIR)/host-build.mk
@@ -162,7 +162,7 @@ TFA_TARGETS := \
   lx2160a-rdb-sdboot
 
 TFA_MAKE_FLAGS += \
-       $(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments") \
+       $(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-Wl,--no-warn-rwx-segments") \
        fip pbl \
        BOOT_MODE=$(BOOT_MODE) \
        RCW=$(STAGING_DIR_IMAGE)/fsl_$(BUILD_VARIANT)-rcw.bin \
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 db91bd75dd1d8802b1b76a02666e8688b75a13a6..2a891277ab188470c824fbc87d3443699ba4c214 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
-@@ -128,10 +128,6 @@ CRTTOOL                   ?=      ${CRTTOOLPATH}/cert_create$
+@@ -105,10 +105,6 @@ CRTTOOL                   ?=      ${CRTTOOLPATH}/cert_create$
  ENCTOOLPATH           ?=      tools/encrypt_fw
  ENCTOOL                       ?=      ${ENCTOOLPATH}/encrypt_fw${BIN_EXT}
  
@@ -11,55 +11,55 @@
  # Variables for use with sptool
  SPTOOLPATH            ?=      tools/sptool
  SPTOOL                        ?=      ${SPTOOLPATH}/sptool.py
-@@ -1597,13 +1593,6 @@ endif #(CHECKPATCH)
+@@ -1622,13 +1618,6 @@ endif #(CHECKPATCH)
  clean:
-       @echo "  CLEAN"
+       $(s)echo "  CLEAN"
        $(call SHELL_REMOVE_DIR,${BUILD_PLAT})
 -ifdef UNIX_MK
--      ${Q}${MAKE} --no-print-directory -C ${FIPTOOLPATH} clean
+-      $(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
+-      $(q)set MAKEFLAGS= && ${MSVC_NMAKE} /nologo /f ${FIPTOOLPATH}/Makefile.msvc FIPTOOLPATH=$(subst /,\,$(FIPTOOLPATH)) FIPTOOL=$(subst /,\,$(FIPTOOL)) clean
 -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
-@@ -1612,13 +1601,6 @@ realclean distclean:
-       @echo "  REALCLEAN"
+       $(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
+@@ -1637,13 +1626,6 @@ realclean distclean:
+       $(s)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
+-      $(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
+-      $(q)set MAKEFLAGS= && ${MSVC_NMAKE} /nologo /f ${FIPTOOLPATH}/Makefile.msvc FIPTOOLPATH=$(subst /,\,$(FIPTOOLPATH)) FIPTOOL=$(subst /,\,$(FIPTOOL)) realclean
 -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
-@@ -1674,7 +1656,7 @@ certificates: ${CRT_DEPS} ${CRTTOOL}
-       @${ECHO_BLANK_LINE}
+       $(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
+@@ -1698,7 +1680,7 @@ certificates: ${CRT_DEPS} ${CRTTOOL}
+       $(s)echo
  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 $@
-@@ -1691,7 +1673,7 @@ fwu_certificates: ${FWU_CRT_DEPS} ${CRTT
-       @${ECHO_BLANK_LINE}
+       $(q)${FIPTOOL} create ${FIP_ARGS} $@
+       $(q)${FIPTOOL} info $@
+@@ -1715,7 +1697,7 @@ fwu_certificates: ${FWU_CRT_DEPS} ${CRTT
+       $(s)echo
  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 $@
-@@ -1699,19 +1681,9 @@ ${BUILD_PLAT}/${FWU_FIP_NAME}: ${FWU_FIP
-       @echo "Built $@ successfully"
-       @${ECHO_BLANK_LINE}
+       $(q)${FIPTOOL} create ${FWU_FIP_ARGS} $@
+       $(q)${FIPTOOL} info $@
+@@ -1723,19 +1705,9 @@ ${BUILD_PLAT}/${FWU_FIP_NAME}: ${FWU_FIP
+       $(s)echo "Built $@ successfully"
+       $(s)echo
  
 -fiptool: ${FIPTOOL}
  fip: ${BUILD_PLAT}/${FIP_NAME}
@@ -67,27 +67,27 @@
  
 -${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
+-      $(q)${MAKE} PLAT=${PLAT} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" FIPTOOL=${FIPTOOL} OPENSSL_DIR=${OPENSSL_DIR} DEBUG=${DEBUG} --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))
+-      $(q)set MAKEFLAGS= && ${MSVC_NMAKE} /nologo /f ${FIPTOOLPATH}/Makefile.msvc FIPTOOLPATH=$(subst /,\,$(FIPTOOLPATH)) FIPTOOL=$(subst /,\,$(FIPTOOL))
 -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
+       $(q)${MAKE} PLAT_DIR=${PLAT_DIR} BUILD_PLAT=${BUILD_PLAT} ENABLE_BTI=${ENABLE_BTI} ARM_ARCH_MINOR=${ARM_ARCH_MINOR} INCLUDES=$(call escape-shell,$(INCLUDES)) DEFINES=$(call escape-shell,$(DEFINES)) --no-print-directory -C ${ROMLIBPATH} all
  
 --- a/tools/fiptool/Makefile
 +++ b/tools/fiptool/Makefile
-@@ -81,7 +81,7 @@ all: --openssl ${PROJECT}
+@@ -74,7 +74,7 @@ all: --openssl ${PROJECT}
  
  ${PROJECT}: ${OBJECTS} Makefile
-       @echo "  HOSTLD  $@"
--      ${Q}${HOSTCC} ${OBJECTS} -o $@ $(LDOPTS)
-+      ${Q}${HOSTCC} ${OBJECTS} -o $@ $(LDOPTS) $(LDFLAGS)
-       @${ECHO_BLANK_LINE}
-       @echo "Built $@ successfully"
-       @${ECHO_BLANK_LINE}
+       $(s)echo "  HOSTLD  $@"
+-      $(q)$(host-cc) ${OBJECTS} -o $@ $(LDOPTS)
++      $(q)$(host-cc) ${OBJECTS} -o $@ $(LDOPTS) $(LDFLAGS)
+       $(s)echo
+       $(s)echo "Built $@ successfully"
+       $(s)echo
 --- 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
diff --git a/package/boot/tfa-layerscape/patches/003-plat-nxp-tools-fix-create_pbl-and-byte_swap-host-bui.patch b/package/boot/tfa-layerscape/patches/003-plat-nxp-tools-fix-create_pbl-and-byte_swap-host-bui.patch
index 73c5c66cae17230b64aa743ca41e98605e0026bc..9fd55bd69b110faa40b3830835fb46922e37f511 100644 (file)
--- a/package/boot/tfa-layerscape/patches/003-plat-nxp-tools-fix-create_pbl-and-byte_swap-host-bui.patch
+++ b/package/boot/tfa-layerscape/patches/003-plat-nxp-tools-fix-create_pbl-and-byte_swap-host-bui.patch
@@ -16,17 +16,17 @@ Signed-off-by: Biwen Li <[email protected]>
 @@ -19,8 +19,6 @@ ifeq ($(RCW),"")
  else
        # Generate header for bl2.bin
-       $(Q)$(CST_DIR)/create_hdr_isbc --in ${BUILD_PLAT}/bl2.bin --out ${BUILD_PLAT}/hdr_bl2 ${BL2_INPUT_FILE}
+       $(q)$(CST_DIR)/create_hdr_isbc --in ${BUILD_PLAT}/bl2.bin --out ${BUILD_PLAT}/hdr_bl2 ${BL2_INPUT_FILE}
 -      # Compile create_pbl tool
--      ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" --no-print-directory -C ${CREATE_PBL_TOOL_PATH};\
+-      $(q)${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" --no-print-directory -C ${CREATE_PBL_TOOL_PATH};\
        # Add bl2.bin to RCW
        ${CREATE_PBL} -r ${RCW} -i ${BUILD_PLAT}/bl2.bin -b ${BOOT_MODE} -c ${SOC_NUM} -d ${BL2_BASE} -e ${BL2_BASE}\
                        -o ${BUILD_PLAT}/bl2_${BOOT_MODE}.pbl ;\
 @@ -42,7 +40,6 @@ ifeq ($(RCW),"")
-       ${Q}echo "Platform ${PLAT} requires rcw file. Please set RCW to point to the right RCW file for boot mode ${BOOT_MODE}"
+       $(s)echo "Platform ${PLAT} requires rcw file. Please set RCW to point to the right RCW file for boot mode ${BOOT_MODE}"
  else
        # -a option appends the image for Chassis 3 devices in case of non secure boot
--      ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" --no-print-directory -C ${CREATE_PBL_TOOL_PATH};
+-      $(q)${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" --no-print-directory -C ${CREATE_PBL_TOOL_PATH};
        ${CREATE_PBL} -r ${RCW} -i ${BUILD_PLAT}/bl2.bin -b ${BOOT_MODE} -c ${SOC_NUM} -d ${BL2_BASE} -e ${BL2_BASE} \
        -o ${BUILD_PLAT}/bl2_${BOOT_MODE}.pbl ;
  # Swapping of RCW is required for QSPi Chassis 2 devices
@@ -34,19 +34,19 @@ Signed-off-by: Biwen Li <[email protected]>
 +++ b/tools/nxp/create_pbl/pbl_ch3.mk
 @@ -26,9 +26,6 @@ else
        # Generate header for bl2.bin
-       $(Q)$(CST_DIR)/create_hdr_isbc --in ${BUILD_PLAT}/bl2.bin --out ${BUILD_PLAT}/hdr_bl2 ${BL2_INPUT_FILE}
+       $(q)$(CST_DIR)/create_hdr_isbc --in ${BUILD_PLAT}/bl2.bin --out ${BUILD_PLAT}/hdr_bl2 ${BL2_INPUT_FILE}
  
 -      # Compile create_pbl tool
--      ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" --no-print-directory -C ${CREATE_PBL_TOOL_PATH};\
+-      $(q)${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" --no-print-directory -C ${CREATE_PBL_TOOL_PATH};\
 -
        # Add Block Copy command for bl2.bin to RCW
        ${CREATE_PBL} -r ${RCW} -i ${BUILD_PLAT}/bl2.bin -b ${BOOT_MODE} -c ${SOC_NUM} -d ${BL2_BASE} -e ${BL2_BASE}\
                        -o ${BUILD_PLAT}/bl2_${BOOT_MODE}.pbl -f ${BL2_SRC_OFFSET};\
 @@ -56,8 +53,6 @@ else  #SECURE_BOOT
  ifeq ($(RCW),"")
-       ${Q}echo "Platform ${PLAT} requires rcw file. Please set RCW to point to the right RCW file for boot mode ${BOOT_MODE}"
+       $(s)echo "Platform ${PLAT} requires rcw file. Please set RCW to point to the right RCW file for boot mode ${BOOT_MODE}"
  else
--      ${Q}${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" --no-print-directory -C ${CREATE_PBL_TOOL_PATH};
+-      $(q)${MAKE} CPPFLAGS="-DVERSION='\"${VERSION_STRING}\"'" --no-print-directory -C ${CREATE_PBL_TOOL_PATH};
 -
        # Add Block Copy command and populate boot loc ptrfor bl2.bin to RCW
        ${CREATE_PBL} -r ${RCW} -i ${BUILD_PLAT}/bl2.bin -b ${BOOT_MODE} -c ${SOC_NUM} -d ${BL2_BASE} -e ${BL2_BASE} \
OpenWrt Source Repository