Index | Thread | Search

From:
SASANO Takayoshi <uaa@mx5.nisiq.net>
Subject:
Re: Update arm-trusted-firmware 2.10.2
To:
Mark Kettenis <mark.kettenis@xs4all.nl>
Cc:
ports@openbsd.org, sthen@openbsd.org, patrick@openbsd.org, kevlo@openbsd.org, jsg@openbsd.org
Date:
Wed, 21 Feb 2024 22:59:53 +0900

Download raw body.

Thread
Hi,

how about to add SUNXI_SETUP_REGULATORS=0'ed binary for Allwinner H6?

Regards,

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 13:55:26 -0000
@@ -39,6 +39,18 @@ 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.
+	rm -rf ${WRKBUILD}/build/sun50i_h6.noreg
+	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 +66,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 13:55:26 -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

-- 
SASANO Takayoshi (JG1UAA) <uaa@mx5.nisiq.net>