From owner-svn-src-head@FreeBSD.ORG Sat Aug 30 13:47:06 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2031CFF8; Sat, 30 Aug 2014 13:47:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0B7571CA9; Sat, 30 Aug 2014 13:47:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7UDl5hC042828; Sat, 30 Aug 2014 13:47:05 GMT (envelope-from brueffer@FreeBSD.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7UDl5Cw042825; Sat, 30 Aug 2014 13:47:05 GMT (envelope-from brueffer@FreeBSD.org) Message-Id: <201408301347.s7UDl5Cw042825@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: brueffer set sender to brueffer@FreeBSD.org using -f From: Christian Brueffer Date: Sat, 30 Aug 2014 13:47:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270842 - in head: share/man/man4 sys/conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Aug 2014 13:47:06 -0000 Author: brueffer Date: Sat Aug 30 13:47:05 2014 New Revision: 270842 URL: http://svnweb.freebsd.org/changeset/base/270842 Log: Allow the iwn(4) fw 100 to be compiled into the kernel and update the relevant manpages. Modified: head/share/man/man4/iwn.4 head/share/man/man4/iwnfw.4 head/sys/conf/files Modified: head/share/man/man4/iwn.4 ============================================================================== --- head/share/man/man4/iwn.4 Sat Aug 30 13:28:10 2014 (r270841) +++ head/share/man/man4/iwn.4 Sat Aug 30 13:47:05 2014 (r270842) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 14, 2014 +.Dd August 30, 2014 .Dt IWN 4 .Os .Sh NAME @@ -46,6 +46,7 @@ You also need to select a firmware for y Choose one from: .Bd -ragged -offset indent .Cd "device iwn1000fw" +.Cd "device iwn100fw" .Cd "device iwn105fw" .Cd "device iwn135fw" .Cd "device iwn2000fw" @@ -72,6 +73,7 @@ module at boot time, place the following .Bd -literal -offset indent if_iwn_load="YES" iwn1000fw_load="YES" +iwn100fw_load="YES" iwn105fw_load="YES" iwn135fw_load="YES" iwn2000fw_load="YES" Modified: head/share/man/man4/iwnfw.4 ============================================================================== --- head/share/man/man4/iwnfw.4 Sat Aug 30 13:28:10 2014 (r270841) +++ head/share/man/man4/iwnfw.4 Sat Aug 30 13:47:05 2014 (r270842) @@ -22,7 +22,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 14, 2014 +.Dd August 30, 2014 .Dt IWNFW 4 .Os .Sh NAME @@ -43,6 +43,7 @@ If you want to pick only the firmware im of the following: .Bd -ragged -offset indent .Cd "device iwn1000fw" +.Cd "device iwn100fw" .Cd "device iwn105fw" .Cd "device iwn135fw" .Cd "device iwn2000fw" @@ -61,6 +62,7 @@ module at boot time, place the following .Xr loader.conf 5 : .Bd -literal -offset indent iwn1000fw_load="YES" +iwn100fw_load="YES" iwn105fw_load="YES" iwn135fw_load="YES" iwn2000fw_load="YES" @@ -75,7 +77,7 @@ iwn6050fw_load="YES" .Ed .Sh DESCRIPTION This module provides access to firmware sets for the -Intel Wireless WiFi Link 105, 135, 1000, 2000, 2030, 4965, 5000 and 6000 series of +Intel Wireless WiFi Link 100, 105, 135, 1000, 2000, 2030, 4965, 5000 and 6000 series of IEEE 802.11n adapters. It may be statically linked into the kernel, or loaded as a module. Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Sat Aug 30 13:28:10 2014 (r270841) +++ head/sys/conf/files Sat Aug 30 13:47:05 2014 (r270842) @@ -1602,6 +1602,20 @@ iwn1000.fw optional iwn1000fw | iwnfw compile-with "${NORMAL_FW}" \ no-obj no-implicit-rule \ clean "iwn1000.fw" +iwn100fw.c optional iwn100fw | iwnfw \ + compile-with "${AWK} -f $S/tools/fw_stub.awk iwn100.fw:iwn100fw -miwn100fw -c${.TARGET}" \ + no-implicit-rule before-depend local \ + clean "iwn100fw.c" +iwn100fw.fwo optional iwn100fw | iwnfw \ + dependency "iwn100.fw" \ + compile-with "${NORMAL_FWO}" \ + no-implicit-rule \ + clean "iwn100fw.fwo" +iwn100.fw optional iwn100fw | iwnfw \ + dependency "$S/contrib/dev/iwn/iwlwifi-100-39.31.5.1.fw.uu" \ + compile-with "${NORMAL_FW}" \ + no-obj no-implicit-rule \ + clean "iwn100.fw" iwn105fw.c optional iwn105fw | iwnfw \ compile-with "${AWK} -f $S/tools/fw_stub.awk iwn105.fw:iwn105fw -miwn105fw -c${.TARGET}" \ no-implicit-rule before-depend local \