> Date: Thu, 22 Feb 2024 05:32:57 +0900
> From: SASANO Takayoshi <[email protected]>
>
> Hi, here is the fixed version:
I'm not sure about the "move away with date" approach. That is
probably something a ports hacker should judge.
But otherwise this is ok kettenis@
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/arm-trusted-firmware/Makefile,v
> diff -u -p -r1.21 Makefile
> --- Makefile 19 Feb 2024 18:38:12 -0000 1.21
> +++ Makefile 21 Feb 2024 20:27:57 -0000
> @@ -9,6 +9,7 @@ GH_ACCOUNT= ARM-software
> GH_PROJECT= arm-trusted-firmware
> GH_TAGNAME= lts-v${VERSION}
>
> +REVISION= 0
> EPOCH= 0
>
> CATEGORIES= sysutils
> @@ -39,6 +40,22 @@ PLATFORMS=\
>
> do-build:
> .for P in ${PLATFORMS}
> +. if "$P" == "sun50i_h6"
> + # ATF's Makefile looks not easy to tweak, rename directory name that
> + # stores compiled objects. First, make with SUNXI_SETUP_REGULATORS=0.
> + # rename (not remove for safety) existing build directory
> + if [[ -e ${WRKBUILD}/build/sun50i_h6.noreg ]]; then \
> + mv -f ${WRKBUILD}/build/sun50i_h6.noreg \
> + ${WRKBUILD}/build/sun50i_h6.noreg-`date +%Y%m%d%H%M%S`; \
> + fi
> + cd ${WRKSRC} && \
> + ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
> + V=1 PLAT=${P} DEBUG=0 SUNXI_SETUP_REGULATORS=0 bl31
> + mv ${WRKBUILD}/build/sun50i_h6 ${WRKBUILD}/build/sun50i_h6.noreg
> +
> + # Second, make default (SUNXI_SETUP_REGULATORS=1).
> + # (FALLTHROUGH)
> +. endif
> cd ${WRKSRC} && \
> ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
> V=1 PLAT=${P} DEBUG=0 bl31
> @@ -54,6 +71,8 @@ do-install:
> ${PREFIX}/share/arm-trusted-firmware/sun50i_a64-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_h6.noreg/release/bl31.bin \
> + ${PREFIX}/share/arm-trusted-firmware/sun50i_h6-bl31-noreg.bin
> ${INSTALL_DATA} ${WRKBUILD}/build/sun50i_h616/release/bl31.bin \
> ${PREFIX}/share/arm-trusted-firmware/sun50i_h616-bl31.bin
>
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/sysutils/arm-trusted-firmware/pkg/PLIST,v
> diff -u -p -r1.7 PLIST
> --- pkg/PLIST 19 Feb 2024 18:38:12 -0000 1.7
> +++ pkg/PLIST 21 Feb 2024 20:27:57 -0000
> @@ -3,5 +3,6 @@ share/arm-trusted-firmware/
> share/arm-trusted-firmware/rk3328-bl31.elf
> share/arm-trusted-firmware/rk3399-bl31.elf
> share/arm-trusted-firmware/sun50i_a64-bl31.bin
> +share/arm-trusted-firmware/sun50i_h6-bl31-noreg.bin
> share/arm-trusted-firmware/sun50i_h6-bl31.bin
> share/arm-trusted-firmware/sun50i_h616-bl31.bin
>
>
> regards,
> --
> SASANO Takayoshi (JG1UAA) <[email protected]>
>
