On Tue, Nov 02, 2021 at 02:29:30PM -0400, kurt@intricatesoftware.com wrote:
> Add support for Raspberry Pi Zero 2 W via brcm-supplemental and
> use Raspberry Pi 400 from brcm-supplemental as well.
>
> okay?
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/firmware/bwfm/Makefile,v
> retrieving revision 1.11
> diff -u -p -u -r1.11 Makefile
> --- Makefile 27 Apr 2021 20:14:32 -0000 1.11
> +++ Makefile 2 Nov 2021 18:20:50 -0000
> @@ -2,14 +2,13 @@
>
> FW_DRIVER= bwfm
> LINUX_VER= 20200316
> -SUP_VER= 1.2
> -REVISION= 2
> +SUP_VER= 1.3
> +REVISION= 3
> FW_VER= ${LINUX_VER}.${SUP_VER}
> DISTNAME= linux-firmware-${LINUX_VER}
> EXTRACT_SUFX= .tar.xz
> DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
> {bsdkurt/brcm-supplemental/archive/}brcm-supplemental-${SUP_VER}.tar.gz:0 \
> - rpi-firmware-nonfree-{RPi-Distro/firmware-nonfree/archive/}83938f78ca2d5a0ffe0c223bb96d72ccc7b71ca5.tar.gz:0
That backslash should go as well.
> # broad enough to reduce WRKSRC size but specific enough to match all DISTFILES
> EXTRACT_FILES= \*/{brcm\*,LICEN\*}
>
> @@ -21,7 +20,6 @@ MASTER_SITES0= https://github.com/
> HOMEPAGE= https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/tree/brcm
>
> SUP_DIR= ${WRKDIR}/brcm-supplemental-brcm-supplemental-${SUP_VER}
> -RPI_DIR= ${WRKDIR}/firmware-nonfree-*/brcm
>
> do-install:
> ${INSTALL_DATA} ${WRKSRC}/brcm/*bin ${PREFIX}/firmware/
> @@ -29,17 +27,13 @@ do-install:
>
> ${INSTALL_DATA} ${SUP_DIR}/*bin ${PREFIX}/firmware/
> ${INSTALL_DATA} ${SUP_DIR}/*txt ${PREFIX}/firmware/
> + ${INSTALL_DATA} ${SUP_DIR}/*clm_blob ${PREFIX}/firmware/
> cd ${PREFIX}/firmware && ln brcmfmac4356-sdio.vamrs,rock960.txt \
> brcmfmac4356-sdio.friendlyarm,nanopc-t4.txt && \
> ln brcmfmac43456-sdio.pine64,pinebook-pro.bin \
> brcmfmac43456-sdio.pine64,rockpro64-v2.1.bin && \
> ln brcmfmac43456-sdio.pine64,pinebook-pro.txt \
> brcmfmac43456-sdio.pine64,rockpro64-v2.1.txt
> -
> -.for i in bin txt clm_blob
> - ${INSTALL_DATA} ${RPI_DIR}/brcmfmac43456-sdio.$i \
> - ${PREFIX}/firmware/brcmfmac43456-sdio.raspberrypi,400.$i
> -.endfor
>
> ${INSTALL_DATA} ${WRKSRC}/LICENCE.broadcom_bcm43xx \
> ${PREFIX}/firmware/bwfm-license
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/sysutils/firmware/bwfm/distinfo,v
> retrieving revision 1.5
> diff -u -p -u -r1.5 distinfo
> --- distinfo 23 Apr 2021 21:15:00 -0000 1.5
> +++ distinfo 2 Nov 2021 18:20:50 -0000
> @@ -1,6 +1,4 @@
> -SHA256 (firmware/brcm-supplemental-1.2.tar.gz) = F3Vt53XaEJA5qdmq+TR54wK37kraOMqZTv8UtKsOhM8=
> +SHA256 (firmware/brcm-supplemental-1.3.tar.gz) = u5CoUavo68R8lV/DNVb81IUe9+UUmAGEJ/bl3SCRqF4=
> SHA256 (firmware/linux-firmware-20200316.tar.xz) = euyzFxpV9d8+HwLEDd/Mh0zyMdIN6uHurhyoZASYLoI=
> -SHA256 (firmware/rpi-firmware-nonfree-83938f78ca2d5a0ffe0c223bb96d72ccc7b71ca5.tar.gz) = +LOvHzlNeoIIcdA6wOfFjrwb1VaBL0onzUju8zDFewA=
> -SIZE (firmware/brcm-supplemental-1.2.tar.gz) = 669495
> +SIZE (firmware/brcm-supplemental-1.3.tar.gz) = 1256133
> SIZE (firmware/linux-firmware-20200316.tar.xz) = 97897640
> -SIZE (firmware/rpi-firmware-nonfree-83938f78ca2d5a0ffe0c223bb96d72ccc7b71ca5.tar.gz) = 110774028
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/sysutils/firmware/bwfm/pkg/PLIST,v
> retrieving revision 1.7
> diff -u -p -u -r1.7 PLIST
> --- pkg/PLIST 27 Apr 2021 20:14:33 -0000 1.7
> +++ pkg/PLIST 2 Nov 2021 18:20:50 -0000
> @@ -28,6 +28,9 @@ firmware/brcmfmac43430-sdio.raspberrypi,
> firmware/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt
> firmware/brcmfmac43430a0-sdio.bin
> firmware/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
> +firmware/brcmfmac43436-sdio.raspberrypi,model-zero-2-w.bin
> +firmware/brcmfmac43436-sdio.raspberrypi,model-zero-2-w.clm_blob
> +firmware/brcmfmac43436-sdio.raspberrypi,model-zero-2-w.txt
> firmware/brcmfmac43455-sdio.MINIX-NEO Z83-4.txt
> firmware/brcmfmac43455-sdio.bin
> firmware/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
>
No comments:
Post a Comment