From owner-svn-src-head@FreeBSD.ORG Thu Nov 24 04:34:04 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 620A3106566B; Thu, 24 Nov 2011 04:34:04 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 525038FC12; Thu, 24 Nov 2011 04:34:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAO4Y4KE077659; Thu, 24 Nov 2011 04:34:04 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAO4Y4xX077657; Thu, 24 Nov 2011 04:34:04 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201111240434.pAO4Y4xX077657@svn.freebsd.org> From: Adrian Chadd Date: Thu, 24 Nov 2011 04:34:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227920 - head/sys/mips/conf X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 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: Thu, 24 Nov 2011 04:34:04 -0000 Author: adrian Date: Thu Nov 24 04:34:04 2011 New Revision: 227920 URL: http://svn.freebsd.org/changeset/base/227920 Log: Compile in the right bits so the AR9130 WMAC support functions correctly. A previous commit disabled compiling the AR9130 support in the default HAL build in the kernel. Since the AR9130 support won't actually function without AH_SUPPORT_AR9130 (and that abomination needs to be undone at some point, in order to allow USB 11n NICs to also work), we now have to explicitly compile it in. But since the 11n RF backends don't (currently) join the RF linker set, one has to compile in _an_ RF backend for the HAL to compile. Modified: head/sys/mips/conf/AR91XX_BASE Modified: head/sys/mips/conf/AR91XX_BASE ============================================================================== --- head/sys/mips/conf/AR91XX_BASE Thu Nov 24 04:23:42 2011 (r227919) +++ head/sys/mips/conf/AR91XX_BASE Thu Nov 24 04:34:04 2011 (r227920) @@ -63,7 +63,19 @@ options ATH_DEBUG options ATH_DIAGAPI option ATH_ENABLE_11N -device ath_hal +# Don't bother compiling the whole HAL - AH_SUPPORT_AR9130 breaks the +# rest of the 11n chipset support at the moment and the pre-AR5212 +# HALs aren't required. +# device ath_hal + +# The AR9130 code requires AR5416; and AR5416 requires the AR5212 code. +device ath_ar5212 +device ath_ar5416 +device ath_ar9130 +# This is needed so at least one RF backend is present, or the current +# HAL setup won't compile. Remove this once the 11n chip RF backends +# are converted over to be in the linker set. +device ath_rf5111 options AH_DEBUG option AH_SUPPORT_AR5416