Module Name: src
Committed By: martin
Date: Wed Oct 31 08:55:33 UTC 2018
Modified Files:
src/distrib/sets/lists/base [netbsd-8]: mi
src/etc/mtree [netbsd-8]: NetBSD.dist.base
src/external [netbsd-8]: Makefile
Added Files:
src/external/broadcom [netbsd-8]: Makefile Makefile.inc
src/external/broadcom/bwfm [netbsd-8]: Makefile
src/external/broadcom/bwfm/dist [netbsd-8]: LICENCE.broadcom_bcm43xx
brcmfmac43143.bin brcmfmac43236b.bin brcmfmac43242a.bin
brcmfmac4350-pcie.bin brcmfmac4350c2-pcie.bin brcmfmac43569.bin
brcmfmac43602-pcie.bin
Log Message:
Add bwfm firmware files, requested by maya in ticket #1072.
To generate a diff of this commit:
cvs rdiff -u -r1.1158.2.4 -r1.1158.2.5 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.160.2.2 -r1.160.2.3 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.18 -r1.18.26.1 src/external/Makefile
cvs rdiff -u -r0 -r1.3.4.2 src/external/broadcom/Makefile
cvs rdiff -u -r0 -r1.1.6.2 src/external/broadcom/Makefile.inc
cvs rdiff -u -r0 -r1.3.4.2 src/external/broadcom/bwfm/Makefile
cvs rdiff -u -r0 -r1.1.1.1.6.2 \
src/external/broadcom/bwfm/dist/LICENCE.broadcom_bcm43xx \
src/external/broadcom/bwfm/dist/brcmfmac43143.bin \
src/external/broadcom/bwfm/dist/brcmfmac43236b.bin \
src/external/broadcom/bwfm/dist/brcmfmac43242a.bin \
src/external/broadcom/bwfm/dist/brcmfmac43569.bin
cvs rdiff -u -r0 -r1.1.6.2 \
src/external/broadcom/bwfm/dist/brcmfmac4350-pcie.bin \
src/external/broadcom/bwfm/dist/brcmfmac4350c2-pcie.bin \
src/external/broadcom/bwfm/dist/brcmfmac43602-pcie.bin
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/mi
diff -u src/distrib/sets/lists/base/mi:1.1158.2.4 src/distrib/sets/lists/base/mi:1.1158.2.5
--- src/distrib/sets/lists/base/mi:1.1158.2.4 Wed Oct 17 13:50:25 2018
+++ src/distrib/sets/lists/base/mi Wed Oct 31 08:55:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1158.2.4 2018/10/17 13:50:25 martin Exp $
+# $NetBSD: mi,v 1.1158.2.5 2018/10/31 08:55:32 martin Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -138,6 +138,15 @@
./libdata/firmware/if_athn/athn-ar7010-11 base-firmware-root
./libdata/firmware/if_athn/athn-ar9271 base-firmware-root
./libdata/firmware/if_athn/athn-license base-firmware-root
+./libdata/firmware/if_bwfm base-firmware-root
+./libdata/firmware/if_bwfm/LICENCE.broadcom_bcm43xx base-firmware-root
+./libdata/firmware/if_bwfm/brcmfmac43143.bin base-firmware-root
+./libdata/firmware/if_bwfm/brcmfmac43236b.bin base-firmware-root
+./libdata/firmware/if_bwfm/brcmfmac43242a.bin base-firmware-root
+./libdata/firmware/if_bwfm/brcmfmac43569.bin base-firmware-root
+./libdata/firmware/if_bwfm/brcmfmac4350-pcie.bin base-firmware-root
+./libdata/firmware/if_bwfm/brcmfmac4350c2-pcie.bin base-firmware-root
+./libdata/firmware/if_bwfm/brcmfmac43602-pcie.bin base-firmware-root
./libdata/firmware/if_ipw base-firmware-root
./libdata/firmware/if_ipw/LICENSE base-firmware-root
./libdata/firmware/if_ipw/ipw2100-1.2-i.fw base-firmware-root
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.160.2.2 src/etc/mtree/NetBSD.dist.base:1.160.2.3
--- src/etc/mtree/NetBSD.dist.base:1.160.2.2 Wed Oct 17 13:50:25 2018
+++ src/etc/mtree/NetBSD.dist.base Wed Oct 31 08:55:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.160.2.2 2018/10/17 13:50:25 martin Exp $
+# $NetBSD: NetBSD.dist.base,v 1.160.2.3 2018/10/31 08:55:32 martin Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -69,6 +69,7 @@
./libdata
./libdata/firmware
./libdata/firmware/if_athn
+./libdata/firmware/if_bwfm
./libdata/firmware/if_ipw
./libdata/firmware/if_iwi
./libdata/firmware/if_iwm
Index: src/external/Makefile
diff -u src/external/Makefile:1.18 src/external/Makefile:1.18.26.1
--- src/external/Makefile:1.18 Thu Jun 14 04:14:36 2012
+++ src/external/Makefile Wed Oct 31 08:55:32 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2012/06/14 04:14:36 riz Exp $
+# $NetBSD: Makefile,v 1.18.26.1 2018/10/31 08:55:32 martin Exp $
-SUBDIR+= apache2 atheros bsd cddl gpl2 gpl3 historical intel-fw-eula
+SUBDIR+= apache2 atheros broadcom bsd cddl gpl2 gpl3 historical intel-fw-eula
SUBDIR+= intel-fw-public ibm-public mit public-domain realtek
.include <bsd.subdir.mk>
Added files:
Index: src/external/broadcom/Makefile
diff -u /dev/null src/external/broadcom/Makefile:1.3.4.2
--- /dev/null Wed Oct 31 08:55:33 2018
+++ src/external/broadcom/Makefile Wed Oct 31 08:55:32 2018
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.3.4.2 2018/10/31 08:55:32 martin Exp $
+
+SUBDIR+= bwfm
+
+.include <bsd.subdir.mk>
Index: src/external/broadcom/Makefile.inc
diff -u /dev/null src/external/broadcom/Makefile.inc:1.1.6.2
--- /dev/null Wed Oct 31 08:55:33 2018
+++ src/external/broadcom/Makefile.inc Wed Oct 31 08:55:32 2018
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile.inc,v 1.1.6.2 2018/10/31 08:55:32 martin Exp $
+
+FILESOWN= ${FIRMWAREOWN}
+FILESGRP= ${FIRMWAREGRP}
+FILESMODE= ${FIRMWAREMODE}
+
+includes:
+clean:
+cleandir:
Index: src/external/broadcom/bwfm/Makefile
diff -u /dev/null src/external/broadcom/bwfm/Makefile:1.3.4.2
--- /dev/null Wed Oct 31 08:55:33 2018
+++ src/external/broadcom/bwfm/Makefile Wed Oct 31 08:55:32 2018
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.3.4.2 2018/10/31 08:55:32 martin Exp $
+
+NOMAN= # define
+
+FILES= dist/LICENCE.broadcom_bcm43xx dist/brcmfmac43143.bin \
+ dist/brcmfmac43236b.bin dist/brcmfmac43242a.bin \
+ dist/brcmfmac43569.bin dist/brcmfmac4350-pcie.bin \
+ dist/brcmfmac4350c2-pcie.bin dist/brcmfmac43602-pcie.bin
+
+FILESDIR= /libdata/firmware/if_bwfm
+
+.include <bsd.files.mk>
Index: src/external/broadcom/bwfm/dist/LICENCE.broadcom_bcm43xx
diff -u /dev/null src/external/broadcom/bwfm/dist/LICENCE.broadcom_bcm43xx:1.1.1.1.6.2
--- /dev/null Wed Oct 31 08:55:33 2018
+++ src/external/broadcom/bwfm/dist/LICENCE.broadcom_bcm43xx Wed Oct 31 08:55:32 2018
@@ -0,0 +1,65 @@
+SOFTWARE LICENSE AGREEMENT
+
+The accompanying software in binary code form (“Software”), is licensed to you,
+or, if you are accepting on behalf of an entity, the entity and its affiliates
+exercising rights hereunder (“Licensee”) subject to the terms of this software
+license agreement (“Agreement”), unless Licensee and Broadcom Corporation
+(“Broadcom”) execute a separate written software license agreement governing
+use of the Software. ANY USE, REPRODUCTION, OR DISTRIBUTION OF THE SOFTWARE
+CONSTITUTES LICENSEE’S ACCEPTANCE OF THIS AGREEMENT.
+
+1. License. Subject to the terms and conditions of this Agreement,
+Broadcom hereby grants to Licensee a limited, non-exclusive, non-transferable,
+royalty-free license: (i) to use and integrate the Software with any other
+software; and (ii) to reproduce and distribute the Software complete,
+unmodified, and as provided by Broadcom, solely for use with Broadcom
+proprietary integrated circuit product(s) sold by Broadcom with which the
+Software was designed to be used, or their successors.
+
+2. Restrictions. Licensee shall distribute Software with a copy of this
+Agreement. Licensee shall not remove, efface or obscure any copyright or
+trademark notices from the Software. Reproductions of the Broadcom copyright
+notice shall be included with each copy of the Software, except where such
+Software is embedded in a manner not readily accessible to the end user.
+Licensee shall not: (i) use, license, sell or otherwise distribute the Software
+except as provided in this Agreement; (ii) attempt to modify in any way,
+reverse engineer, decompile or disassemble any portion of the Software; or
+(iii) use the Software or other material in violation of any applicable law or
+regulation, including but not limited to any regulatory agency. This Agreement
+shall automatically terminate upon Licensee’s failure to comply with any of the
+terms of this Agreement. In such event, Licensee will destroy all copies of the
+Software and its component parts.
+
+3. Ownership. The Software is licensed and not sold. Title to and
+ownership of the Software, including all intellectual property rights thereto,
+and any portion thereof remain with Broadcom or its licensors. Licensee hereby
+covenants that it will not assert any claim that the Software created by or for
+Broadcom infringe any intellectual property right owned or controlled by
+Licensee.
+
+4. Disclaimer. THE SOFTWARE IS OFFERED “AS IS,” AND BROADCOM PROVIDES AND
+GRANTS AND LICENSEE RECEIVES NO SUPPORT AND NO WARRANTIES OF ANY KIND, EXPRESS
+OR IMPLIED, BY STATUTE, COMMUNICATION OR CONDUCT WITH LICENSEE, OR OTHERWISE.
+BROADCOM SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A SPECIFIC PURPOSE, OR NONINFRINGEMENT CONCERNING THE SOFTWARE OR
+ANY UPGRADES TO OR DOCUMENTATION FOR THE SOFTWARE. WITHOUT LIMITATION OF THE
+ABOVE, BROADCOM GRANTS NO WARRANTY THAT THE SOFTWARE IS ERROR-FREE OR WILL
+OPERATE WITHOUT INTERRUPTION, AND GRANTS NO WARRANTY REGARDING ITS USE OR THE
+RESULTS THEREFROM INCLUDING, WITHOUT LIMITATION, ITS CORRECTNESS, ACCURACY, OR
+RELIABILITY. TO THE MAXIMUM EXTENT PERMITTED BY LAW, IN NO EVENT SHALL BROADCOM
+OR ANY OF ITS LICENSORS HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES, HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER FOR BREACH OF CONTRACT, TORT (INCLUDING NEGLIGENCE) OR
+OTHERWISE, ARISING OUT OF THIS AGREEMENT OR USE, REPRODUCTION, OR DISTRIBUTION
+OF THE SOFTWARE, INCLUDING BUT NOT LIMITED TO LOSS OF DATA AND LOSS OF PROFITS,
+EVEN IF SUCH PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. THESE
+LIMITATIONS SHALL APPLY NOTWITHSTANDING ANY FAILURE OF ESSENTIAL PURPOSE OF ANY
+LIMITED REMEDY.
+
+5. Export Laws. LICENSEE UNDERSTANDS AND AGREES THAT THE SOFTWARE IS
+SUBJECT TO UNITED STATES AND OTHER APPLICABLE EXPORT-RELATED LAWS AND
+REGULATIONS AND THAT LICENSEE MAY NOT EXPORT, RE-EXPORT OR TRANSFER THE
+SOFTWARE OR ANY DIRECT PRODUCT OF THE SOFTWARE EXCEPT AS PERMITTED UNDER THOSE
+LAWS. WITHOUT LIMITING THE FOREGOING, EXPORT, RE-EXPORT, OR TRANSFER OF THE
+SOFTWARE TO CUBA, IRAN, NORTH KOREA, SUDAN, AND SYRIA IS PROHIBITED.
+
Index: src/external/broadcom/bwfm/dist/brcmfmac43143.bin
Binary files are different
Index: src/external/broadcom/bwfm/dist/brcmfmac43236b.bin
Binary files are different
Index: src/external/broadcom/bwfm/dist/brcmfmac43242a.bin
Binary files are different
Index: src/external/broadcom/bwfm/dist/brcmfmac43569.bin
Binary files are different
Index: src/external/broadcom/bwfm/dist/brcmfmac4350-pcie.bin
Binary files are different
Index: src/external/broadcom/bwfm/dist/brcmfmac4350c2-pcie.bin
Binary files are different
Index: src/external/broadcom/bwfm/dist/brcmfmac43602-pcie.bin
Binary files are different
