[src/trunk]: src/external/broadcom/bwfm Add new bwfm firmware binaries and co...

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

details:   https://anonhg.NetBSD.org/src/rev/cab1d86abbf9
branches:  trunk
changeset: 970401:cab1d86abbf9
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Mar 22 20:21:53 2020 +0000

description:
Add new bwfm firmware binaries and config files.  Only install the
SDIO firmware binaries and platform-specific config files on platforms
where they're relevant.

diffstat:

 distrib/sets/lists/base/md.evbarm |  23 ++++++++++++++++++
 distrib/sets/lists/base/mi        |  10 +++++++-
 external/broadcom/bwfm/Makefile   |  49 ++++++++++++++++++++++++++++++++++++++-
 3 files changed, 80 insertions(+), 2 deletions(-)

diffs (121 lines):

diff -r 853969e88da7 -r cab1d86abbf9 distrib/sets/lists/base/md.evbarm
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/sets/lists/base/md.evbarm Sun Mar 22 20:21:53 2020 +0000
@@ -0,0 +1,23 @@
+# $NetBSD: md.evbarm,v 1.14 2020/03/22 20:21:53 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
+./libdata/firmware/if_bwfm/brcmfmac43241b5-sdio.bin    base-firmware-root      firmware
+./libdata/firmware/if_bwfm/brcmfmac4329-sdio.bin       base-firmware-root      firmware
+./libdata/firmware/if_bwfm/brcmfmac4330-sdio.bin       base-firmware-root      firmware
+./libdata/firmware/if_bwfm/brcmfmac4334-sdio.bin       base-firmware-root      firmware
+./libdata/firmware/if_bwfm/brcmfmac43340-sdio.bin      base-firmware-root      firmware
+./libdata/firmware/if_bwfm/brcmfmac4335-sdio.bin       base-firmware-root      firmware
+./libdata/firmware/if_bwfm/brcmfmac43362-sdio.bin      base-firmware-root      firmware
+./libdata/firmware/if_bwfm/brcmfmac43362-sdio.cubietech,cubietruck.txt base-firmware-root      firmware
+./libdata/firmware/if_bwfm/brcmfmac43362-sdio.lemaker,bananapro.txt    base-firmware-root      firmware
+./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/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
+./libdata/firmware/if_bwfm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt        base-firmware-root      firmware
+./libdata/firmware/if_bwfm/brcmfmac4354-sdio.bin       base-firmware-root      firmware
+./libdata/firmware/if_bwfm/brcmfmac4356-sdio.bin       base-firmware-root      firmware
+./libdata/firmware/if_bwfm/brcmfmac4373-sdio.bin       base-firmware-root      firmware
diff -r 853969e88da7 -r cab1d86abbf9 distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi        Sun Mar 22 20:13:15 2020 +0000
+++ b/distrib/sets/lists/base/mi        Sun Mar 22 20:21:53 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1232 2020/03/13 15:19:25 roy Exp $
+# $NetBSD: mi,v 1.1233 2020/03/22 20:21:53 thorpej Exp $
 #
 # Note:        Don't delete entries from here - mark them as "obsolete" instead,
 #      unless otherwise stated below.
@@ -148,9 +148,17 @@
 ./libdata/firmware/if_bwfm/brcmfmac43236b.bin  base-firmware-root      firmware
 ./libdata/firmware/if_bwfm/brcmfmac43242a.bin  base-firmware-root      firmware
 ./libdata/firmware/if_bwfm/brcmfmac4350-pcie.bin       base-firmware-root      firmware
+./libdata/firmware/if_bwfm/brcmfmac4356-pcie.bin       base-firmware-root      firmware
 ./libdata/firmware/if_bwfm/brcmfmac4350c2-pcie.bin     base-firmware-root      firmware
 ./libdata/firmware/if_bwfm/brcmfmac43569.bin   base-firmware-root      firmware
 ./libdata/firmware/if_bwfm/brcmfmac43602-pcie.bin      base-firmware-root      firmware
+./libdata/firmware/if_bwfm/brcmfmac43570-pcie.bin      base-firmware-root      firmware
+./libdata/firmware/if_bwfm/brcmfmac4358-pcie.bin       base-firmware-root      firmware
+./libdata/firmware/if_bwfm/brcmfmac43602-pcie.ap.bin   base-firmware-root      firmware
+./libdata/firmware/if_bwfm/brcmfmac4366b-pcie.bin      base-firmware-root      firmware
+./libdata/firmware/if_bwfm/brcmfmac4366c-pcie.bin      base-firmware-root      firmware
+./libdata/firmware/if_bwfm/brcmfmac4371-pcie.bin       base-firmware-root      firmware
+./libdata/firmware/if_bwfm/brcmfmac4373.bin    base-firmware-root      firmware
 ./libdata/firmware/if_ipw                      base-firmware-root
 ./libdata/firmware/if_ipw/LICENSE              base-firmware-root      firmware
 ./libdata/firmware/if_ipw/ipw2100-1.2-i.fw     base-firmware-root      firmware
diff -r 853969e88da7 -r cab1d86abbf9 external/broadcom/bwfm/Makefile
--- a/external/broadcom/bwfm/Makefile   Sun Mar 22 20:13:15 2020 +0000
+++ b/external/broadcom/bwfm/Makefile   Sun Mar 22 20:21:53 2020 +0000
@@ -1,15 +1,62 @@
-# $NetBSD: Makefile,v 1.3 2018/05/30 20:54:08 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2020/03/22 20:21:53 thorpej Exp $
 
 NOMAN= # define
 
+.include <bsd.own.mk>
+
+# Only install the SDIO firmware binaries on platforms where it will
+# be useful.
+.if ${MACHINE} == "evbarm"
+BWFM_WANT_SDIO_FIRMWARE=       yes
+.endif
+
 FILES= dist/LICENCE.broadcom_bcm43xx
+
 FILES+=        dist/brcmfmac43143.bin
 FILES+=        dist/brcmfmac43236b.bin
 FILES+=        dist/brcmfmac43242a.bin
 FILES+=        dist/brcmfmac43569.bin
+FILES+=        dist/brcmfmac4373.bin
+
 FILES+=        dist/brcmfmac4350-pcie.bin
 FILES+=        dist/brcmfmac4350c2-pcie.bin
+FILES+=        dist/brcmfmac4356-pcie.bin
+FILES+=        dist/brcmfmac43570-pcie.bin
+FILES+=        dist/brcmfmac4358-pcie.bin
+FILES+=        dist/brcmfmac43602-pcie.ap.bin
 FILES+=        dist/brcmfmac43602-pcie.bin
+FILES+=        dist/brcmfmac4366b-pcie.bin
+FILES+=        dist/brcmfmac4366c-pcie.bin
+FILES+=        dist/brcmfmac4371-pcie.bin
+
+.if defined(BWFM_WANT_SDIO_FIRMWARE)
+FILES+=        dist/brcmfmac43143-sdio.bin
+FILES+=        dist/brcmfmac43241b0-sdio.bin
+FILES+=        dist/brcmfmac43241b4-sdio.bin
+FILES+=        dist/brcmfmac43241b5-sdio.bin
+FILES+=        dist/brcmfmac4329-sdio.bin
+FILES+=        dist/brcmfmac4330-sdio.bin
+FILES+=        dist/brcmfmac4334-sdio.bin
+FILES+=        dist/brcmfmac43340-sdio.bin
+FILES+=        dist/brcmfmac4335-sdio.bin
+FILES+=        dist/brcmfmac43362-sdio.bin
+FILES+=        dist/brcmfmac4339-sdio.bin
+FILES+=        dist/brcmfmac43430-sdio.bin
+FILES+=        dist/brcmfmac43430a0-sdio.bin
+FILES+=        dist/brcmfmac43455-sdio.bin
+FILES+=        dist/brcmfmac4354-sdio.bin
+FILES+=        dist/brcmfmac4356-sdio.bin
+FILES+=        dist/brcmfmac4373-sdio.bin
+.endif # BWFM_WANT_SDIO_FIRMWARE
+
+# Platform-specific configuration files
+.if ${MACHINE} == "evbarm"
+FILES+=        dist/brcmfmac43362-sdio.cubietech,cubietruck.txt
+FILES+=        dist/brcmfmac43362-sdio.lemaker,bananapro.txt
+FILES+=        dist/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
+FILES+=        dist/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
+FILES+=        dist/brcmfmac43455-sdio.raspberrypi,4-model-b.txt
+.endif
 
 FILESDIR=      ${FIRMWAREDIR}/if_bwfm