On 2024/02/17 17:34, Mark Kettenis wrote:
> I tested rk3328, rk3399, sun50i_a64 and sun50i_h616.  Earlier releases
> don't work on the H618 board that I have.
> 
> Debug builds no longer fit the SRAM constraints on at least A64.  So
> this switches to release builds.
> 
> ok?

I don't have any hw to test, but the ports side of things is good. OK.

> Index: sysutils/arm-trusted-firmware/Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/arm-trusted-firmware/Makefile,v
> retrieving revision 1.20
> diff -u -p -r1.20 Makefile
> --- sysutils/arm-trusted-firmware/Makefile	22 Apr 2023 16:30:11 -0000	1.20
> +++ sysutils/arm-trusted-firmware/Makefile	17 Feb 2024 16:25:09 -0000
> @@ -2,12 +2,14 @@ PKG_ARCH=		*
>  
>  COMMENT=	ARM Trusted Firmware
>  
> +VERSION=	2.10.2
> +PKGNAME=	arm-trusted-firmware-${VERSION}
> +
>  GH_ACCOUNT=	ARM-software
>  GH_PROJECT=	arm-trusted-firmware
> -GH_TAGNAME=	v2.7.0
> +GH_TAGNAME=	lts-v${VERSION}
>  
>  EPOCH=		0
> -REVISION=	0
>  
>  CATEGORIES=	sysutils
>  
> @@ -32,24 +34,27 @@ PLATFORMS=\
>  	rk3328 \
>  	rk3399 \
>  	sun50i_a64 \
> -	sun50i_h6
> +	sun50i_h6 \
> +	sun50i_h616
>  
>  do-build:
>  .for P in ${PLATFORMS}
>  	cd ${WRKSRC} && \
>  	${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
> -	    V=1 PLAT=${P} DEBUG=1 bl31
> +	    V=1 PLAT=${P} DEBUG=0 bl31
>  .endfor
>  
>  do-install:
>  	${INSTALL_DATA_DIR} ${PREFIX}/share/arm-trusted-firmware/
> -	${INSTALL_DATA} ${WRKBUILD}/build/rk3328/debug/bl31/bl31.elf \
> +	${INSTALL_DATA} ${WRKBUILD}/build/rk3328/release/bl31/bl31.elf \
>  	    ${PREFIX}/share/arm-trusted-firmware/rk3328-bl31.elf
> -	${INSTALL_DATA} ${WRKBUILD}/build/rk3399/debug/bl31/bl31.elf \
> +	${INSTALL_DATA} ${WRKBUILD}/build/rk3399/release/bl31/bl31.elf \
>  	    ${PREFIX}/share/arm-trusted-firmware/rk3399-bl31.elf
> -	${INSTALL_DATA} ${WRKBUILD}/build/sun50i_a64/debug/bl31.bin \
> +	${INSTALL_DATA} ${WRKBUILD}/build/sun50i_a64/release/bl31.bin \
>  	    ${PREFIX}/share/arm-trusted-firmware/sun50i_a64-bl31.bin
> -	${INSTALL_DATA} ${WRKBUILD}/build/sun50i_h6/debug/bl31.bin \
> +	${INSTALL_DATA} ${WRKBUILD}/build/sun50i_h6/release/bl31.bin \
>  	    ${PREFIX}/share/arm-trusted-firmware/sun50i_h6-bl31.bin
> +	${INSTALL_DATA} ${WRKBUILD}/build/sun50i_h616/release/bl31.bin \
> +	    ${PREFIX}/share/arm-trusted-firmware/sun50i_h616-bl31.bin
>  
>  .include <bsd.port.mk>
> Index: sysutils/arm-trusted-firmware/distinfo
> ===================================================================
> RCS file: /cvs/ports/sysutils/arm-trusted-firmware/distinfo,v
> retrieving revision 1.11
> diff -u -p -r1.11 distinfo
> --- sysutils/arm-trusted-firmware/distinfo	8 Aug 2022 15:27:59 -0000	1.11
> +++ sysutils/arm-trusted-firmware/distinfo	17 Feb 2024 16:25:09 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (arm-trusted-firmware-2.7.0.tar.gz) = maN/WraCQVvoDyC7GKzcGkXtqfKn3mfrPceY+qcPZuY=
> -SIZE (arm-trusted-firmware-2.7.0.tar.gz) = 6511934
> +SHA256 (arm-trusted-firmware-lts-v2.10.2.tar.gz) = 6ey3QaaFyQtw6nIhpIEYg+lkSVumQs1F6Qjy94Q7Nio=
> +SIZE (arm-trusted-firmware-lts-v2.10.2.tar.gz) = 7820262
> Index: sysutils/arm-trusted-firmware/patches/patch-Makefile
> ===================================================================
> RCS file: sysutils/arm-trusted-firmware/patches/patch-Makefile
> diff -N sysutils/arm-trusted-firmware/patches/patch-Makefile
> --- sysutils/arm-trusted-firmware/patches/patch-Makefile	22 Apr 2023 16:30:11 -0000	1.1
> +++ /dev/null	1 Jan 1970 00:00:00 -0000
> @@ -1,35 +0,0 @@
> -Index: Makefile
> ---- Makefile.orig
> -+++ Makefile
> -@@ -409,6 +409,8 @@ endif
> - 
> - GCC_V_OUTPUT		:=	$(shell $(CC) -v 2>&1)
> - 
> -+TF_LDFLAGS		+=	-z noexecstack
> -+
> - # LD = armlink
> - ifneq ($(findstring armlink,$(notdir $(LD))),)
> - TF_LDFLAGS		+=	--diag_error=warning --lto_level=O1
> -@@ -435,6 +437,9 @@ TF_LDFLAGS		+=	$(subst --,-Xlinker --,$(TF_LDFLAGS_$(A
> - 
> - # LD = gcc-ld (ld) or llvm-ld (ld.lld) or other
> - else
> -+# With ld.bfd version 2.39 and newer new warnings are added. Skip those since we
> -+# are not loaded by a elf loader.
> -+TF_LDFLAGS		+=	$(call ld_option, --no-warn-rwx-segments)
> - TF_LDFLAGS		+=	--fatal-warnings -O1
> - TF_LDFLAGS		+=	--gc-sections
> - # ld.lld doesn't recognize the errata flags,
> -@@ -1086,6 +1091,12 @@ $(eval $(call assert_numerics,\
> -         TWED_DELAY \
> -         ENABLE_FEAT_TWED \
> - )))
> -+
> -+# Convenience function to check for a given linker option. An call to
> -+# $(call ld_option, --no-XYZ) will return --no-XYZ if supported by the linker
> -+define ld_option
> -+        $(shell if $(LD) $(1) -v >/dev/null 2>&1; then echo $(1); fi )
> -+endef
> - 
> - ifdef KEY_SIZE
> -         $(eval $(call assert_numeric,KEY_SIZE))
> Index: sysutils/arm-trusted-firmware/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/sysutils/arm-trusted-firmware/pkg/PLIST,v
> retrieving revision 1.6
> diff -u -p -r1.6 PLIST
> --- sysutils/arm-trusted-firmware/pkg/PLIST	11 Mar 2022 19:57:12 -0000	1.6
> +++ sysutils/arm-trusted-firmware/pkg/PLIST	17 Feb 2024 16:25:09 -0000
> @@ -4,3 +4,4 @@ share/arm-trusted-firmware/rk3328-bl31.e
>  share/arm-trusted-firmware/rk3399-bl31.elf
>  share/arm-trusted-firmware/sun50i_a64-bl31.bin
>  share/arm-trusted-firmware/sun50i_h6-bl31.bin
> +share/arm-trusted-firmware/sun50i_h616-bl31.bin