Module Name: src
Committed By: thorpej
Date: Sun Mar 22 22:17:11 UTC 2020
Modified Files:
src/distrib/sets/lists/base: md.evbarm
src/external/broadcom/bwfm: Makefile
Log Message:
The raspberrypi,model-zero-w uses the same nvram config file as the
raspberrypi,3-model-b.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/lists/base/md.evbarm
cvs rdiff -u -r1.5 -r1.6 src/external/broadcom/bwfm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/md.evbarm
diff -u src/distrib/sets/lists/base/md.evbarm:1.15 src/distrib/sets/lists/base/md.evbarm:1.16
--- src/distrib/sets/lists/base/md.evbarm:1.15 Sun Mar 22 21:13:35 2020
+++ src/distrib/sets/lists/base/md.evbarm Sun Mar 22 22:17:11 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbarm,v 1.15 2020/03/22 21:13:35 thorpej Exp $
+# $NetBSD: md.evbarm,v 1.16 2020/03/22 22:17:11 thorpej Exp $
./libdata/firmware/if_bwfm/brcmfmac43143-sdio.bin base-firmware-root firmware
./libdata/firmware/if_bwfm/brcmfmac43241b0-sdio.bin base-firmware-root firmware
./libdata/firmware/if_bwfm/brcmfmac43241b4-sdio.bin base-firmware-root firmware
@@ -14,6 +14,7 @@
./libdata/firmware/if_bwfm/brcmfmac4339-sdio.bin base-firmware-root firmware
./libdata/firmware/if_bwfm/brcmfmac43430-sdio.bin base-firmware-root firmware
./libdata/firmware/if_bwfm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt base-firmware-root firmware
+./libdata/firmware/if_bwfm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt base-firmware-root firmware
./libdata/firmware/if_bwfm/brcmfmac43430a0-sdio.bin base-firmware-root firmware
./libdata/firmware/if_bwfm/brcmfmac43455-sdio.bin base-firmware-root firmware
./libdata/firmware/if_bwfm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt base-firmware-root firmware
Index: src/external/broadcom/bwfm/Makefile
diff -u src/external/broadcom/bwfm/Makefile:1.5 src/external/broadcom/bwfm/Makefile:1.6
--- src/external/broadcom/bwfm/Makefile:1.5 Sun Mar 22 21:13:35 2020
+++ src/external/broadcom/bwfm/Makefile Sun Mar 22 22:17:11 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/03/22 21:13:35 thorpej Exp $
+# $NetBSD: Makefile,v 1.6 2020/03/22 22:17:11 thorpej Exp $
NOMAN= # define
@@ -10,6 +10,8 @@ NOMAN= # define
BWFM_WANT_SDIO_FIRMWARE= yes
.endif
+FILESDIR= ${FIRMWAREDIR}/if_bwfm
+
FILES= dist/LICENCE.broadcom_bcm43xx
FILES+= dist/brcmfmac43143.bin
@@ -59,8 +61,12 @@ FILES+= dist/brcmfmac43430-sdio.raspberr
FILES+= dist/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
FILES+= dist/brcmfmac43455-sdio.raspberrypi,4-model-b.txt
FILES+= dist/brcmfmac43456-sdio.pine64,pinebook-pro.txt
-.endif
-FILESDIR= ${FIRMWAREDIR}/if_bwfm
+# The raspberrypi,model-zero-w uses the same nvram config as the
+# raspberrypi,3-model-b.
+LINKS+= ${FILESDIR}/brcmfmac43430-sdio.raspberrypi,3-model-b.txt \
+ ${FILESDIR}/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt
+.endif
+.include <bsd.links.mk>
.include <bsd.files.mk>
