[src/trunk]: src/external/broadcom/bwfm The raspberrypi,model-zero-w uses the...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/81a304367190
branches:  trunk
changeset: 1008443:81a304367190
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Mar 22 22:17:11 2020 +0000

description:
The raspberrypi,model-zero-w uses the same nvram config file as the
raspberrypi,3-model-b.

diffstat:

 distrib/sets/lists/base/md.evbarm |   3 ++-
 external/broadcom/bwfm/Makefile   |  12 +++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diffs (50 lines):

diff -r f8d79be1c508 -r 81a304367190 distrib/sets/lists/base/md.evbarm
--- a/distrib/sets/lists/base/md.evbarm Sun Mar 22 21:21:07 2020 +0000
+++ b/distrib/sets/lists/base/md.evbarm Sun Mar 22 22:17:11 2020 +0000
@@ -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
diff -r f8d79be1c508 -r 81a304367190 external/broadcom/bwfm/Makefile
--- a/external/broadcom/bwfm/Makefile   Sun Mar 22 21:21:07 2020 +0000
+++ b/external/broadcom/bwfm/Makefile   Sun Mar 22 22:17:11 2020 +0000
@@ -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 @@
 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/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
+
+# 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
 
-FILESDIR=      ${FIRMWAREDIR}/if_bwfm
-
+.include <bsd.links.mk>
 .include <bsd.files.mk>