Module Name: src
Committed By: yamt
Date: Thu May 22 14:08:30 UTC 2014
Modified Files:
src/external/intel-fw-public [yamt-pagecache]: Makefile Makefile.inc
Added Files:
src/external/intel-fw-public/iwl6030 [yamt-pagecache]: Makefile
src/external/intel-fw-public/iwl6030/dist [yamt-pagecache]:
LICENSE.iwlwifi-6000g2b-ucode README.iwlwifi-6000g2b-ucode
iwlwifi-6000g2b-6.ucode
Log Message:
sync with head.
for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.
this commit was splitted into small chunks to avoid
a limitation of cvs. ("Protocol error: too many arguments")
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.4.1 src/external/intel-fw-public/Makefile
cvs rdiff -u -r1.1 -r1.1.18.1 src/external/intel-fw-public/Makefile.inc
cvs rdiff -u -r0 -r1.1.4.2 src/external/intel-fw-public/iwl6030/Makefile
cvs rdiff -u -r0 -r1.1.4.2 \
src/external/intel-fw-public/iwl6030/dist/LICENSE.iwlwifi-6000g2b-ucode \
src/external/intel-fw-public/iwl6030/dist/README.iwlwifi-6000g2b-ucode \
src/external/intel-fw-public/iwl6030/dist/iwlwifi-6000g2b-6.ucode
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/intel-fw-public/Makefile
diff -u src/external/intel-fw-public/Makefile:1.6 src/external/intel-fw-public/Makefile:1.6.4.1
--- src/external/intel-fw-public/Makefile:1.6 Fri May 20 01:59:14 2011
+++ src/external/intel-fw-public/Makefile Thu May 22 14:08:29 2014
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2011/05/20 01:59:14 msaitoh Exp $
+# $NetBSD: Makefile,v 1.6.4.1 2014/05/22 14:08:29 yamt Exp $
SUBDIR+= ipw3945 iwl1000 iwl4965 iwl5000 iwl5150 iwl6000 iwl6005 \
- iwl6050
+ iwl6030 iwl6050
.include <bsd.subdir.mk>
Index: src/external/intel-fw-public/Makefile.inc
diff -u src/external/intel-fw-public/Makefile.inc:1.1 src/external/intel-fw-public/Makefile.inc:1.1.18.1
--- src/external/intel-fw-public/Makefile.inc:1.1 Thu Oct 30 00:27:32 2008
+++ src/external/intel-fw-public/Makefile.inc Thu May 22 14:08:29 2014
@@ -1,4 +1,4 @@
-# $NetBSD
+# $NetBSD: Makefile.inc,v 1.1.18.1 2014/05/22 14:08:29 yamt Exp $
FILESOWN= ${FIRMWAREOWN}
FILESGRP= ${FIRMWAREGRP}
Added files:
Index: src/external/intel-fw-public/iwl6030/Makefile
diff -u /dev/null src/external/intel-fw-public/iwl6030/Makefile:1.1.4.2
--- /dev/null Thu May 22 14:08:30 2014
+++ src/external/intel-fw-public/iwl6030/Makefile Thu May 22 14:08:29 2014
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1.4.2 2014/05/22 14:08:29 yamt Exp $
+
+NOMAN= # define
+
+FILES= dist/LICENSE.iwlwifi-6000g2b-ucode dist/README.iwlwifi-6000g2b-ucode \
+ dist/iwlwifi-6000g2b-6.ucode
+
+FILESDIR= /libdata/firmware/if_iwn
+
+.include <bsd.files.mk>
Index: src/external/intel-fw-public/iwl6030/dist/LICENSE.iwlwifi-6000g2b-ucode
diff -u /dev/null src/external/intel-fw-public/iwl6030/dist/LICENSE.iwlwifi-6000g2b-ucode:1.1.4.2
--- /dev/null Thu May 22 14:08:30 2014
+++ src/external/intel-fw-public/iwl6030/dist/LICENSE.iwlwifi-6000g2b-ucode Thu May 22 14:08:29 2014
@@ -0,0 +1,39 @@
+Copyright (c) 2006-2012, Intel Corporation.
+All rights reserved.
+
+Redistribution. Redistribution and use in binary form, without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions must reproduce the above copyright notice and the
+ following disclaimer in the documentation and/or other materials
+ provided with the distribution.
+* Neither the name of Intel Corporation nor the names of its suppliers
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+* No reverse engineering, decompilation, or disassembly of this software
+ is permitted.
+
+Limited patent license. Intel Corporation grants a world-wide,
+royalty-free, non-exclusive license under patents it now or hereafter
+owns or controls to make, have made, use, import, offer to sell and
+sell ("Utilize") this software, but solely to the extent that any
+such patent is necessary to Utilize the software alone, or in
+combination with an operating system licensed under an approved Open
+Source license as listed by the Open Source Initiative at
+http://opensource.org/licenses. The patent license shall not apply to
+any other combinations which include this software. No hardware per
+se is licensed hereunder.
+
+DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
Index: src/external/intel-fw-public/iwl6030/dist/README.iwlwifi-6000g2b-ucode
diff -u /dev/null src/external/intel-fw-public/iwl6030/dist/README.iwlwifi-6000g2b-ucode:1.1.4.2
--- /dev/null Thu May 22 14:08:30 2014
+++ src/external/intel-fw-public/iwl6030/dist/README.iwlwifi-6000g2b-ucode Thu May 22 14:08:29 2014
@@ -0,0 +1,113 @@
+Intel Wireless WiFi Link 6005 AGN Adapter
+Copyright (C) 2006-2012 Intel Corporation. All rights reserved.
+
+Microcode Package README.iwlwifi-6000g2b-ucode
+
+INDEX
+
+1. OVERVIEW
+2. INSTALLATION
+3. LICENSE
+
+
+1. OVERVIEW
+
+The file iwlwifi-6000g2b-6.ucode provided in this package must be
+present on your system in order for the Intel Wireless WiFi Link
+AGN driver for Linux (iwlagn) to operate on your system.
+
+The "-6" in the filename reflects an interface/architecture version number.
+It will change only when changes in new uCode releases make the new uCode
+incompatible with earlier drivers.
+
+On adapter initialization, and at varying times during the uptime of
+the adapter, the microcode is loaded into the memory on the network
+adapter. The microcode provides the low level MAC features including
+radio control and high precision timing events (backoff, transmit,
+etc.) while also providing varying levels of packet filtering which can
+be used to keep the host from having to handle packets that are not of
+interest given the current operating mode of the device.
+
+2. INSTALLATION
+
+The iwlagn driver will look for the file iwlwifi-6000g2b-6.ucode using the
+kernel's firmware_class infrastructure. More information can be found under
+Documentation/firmware_class in kernel source. In order to function
+correctly, you need to have this support enabled in your kernel. When
+you configure the kernel, you can find this option in the following
+location:
+
+ Device Drivers ->
+ Generic Driver Options ->
+ Userspace firmware loading support
+
+
+You can determine if your kernel currently has firmware loader support
+by looking for the CONFIG_FW_LOADER definition on your kernel's
+.config.
+
+In addition to having the firmware_class support in your kernel, you
+must also have a working udev and uevent infrastructure configured.
+The steps for installing and configuring udev are very
+distribution specific.
+
+Once you have the firmware loader in place (or if you aren't sure and
+you just want to try things to see if it works), you need to install
+the microcode file into the appropriate location.
+
+Where that appropriate location is depends (again) on your system
+distribution. You can typically find this location by looking in the
+udev scripts of your distro, the default is /lib/firmware.
+
+Installation of the firmware is simply:
+
+ % cp iwlwifi-6000g2b-6.ucode /lib/firmware
+
+You can now load the driver (see the INSTALL and README.iwlwifi provided with
+the iwlwifi package for information on building and using that driver.)
+
+3. LICENSE
+
+The microcode in this package (iwlwifi-6000g2b-6.ucode) is provided under the
+terms of the following license (available in the file
+LICENSE.iwlwifi-6000g2b-ucode):
+
+Copyright (c) 2006-2012, Intel Corporation.
+All rights reserved.
+
+Redistribution. Redistribution and use in binary form, without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions must reproduce the above copyright notice and the
+ following disclaimer in the documentation and/or other materials
+ provided with the distribution.
+* Neither the name of Intel Corporation nor the names of its suppliers
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+* No reverse engineering, decompilation, or disassembly of this software
+ is permitted.
+
+Limited patent license. Intel Corporation grants a world-wide,
+royalty-free, non-exclusive license under patents it now or hereafter
+owns or controls to make, have made, use, import, offer to sell and
+sell ("Utilize") this software, but solely to the extent that any
+such patent is necessary to Utilize the software alone, or in
+combination with an operating system licensed under an approved Open
+Source license as listed by the Open Source Initiative at
+http://opensource.org/licenses. The patent license shall not apply to
+any other combinations which include this software. No hardware per
+se is licensed hereunder.
+
+DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
Index: src/external/intel-fw-public/iwl6030/dist/iwlwifi-6000g2b-6.ucode
Binary files are different
