svn commit: r227920 - head/sys/mips/conf

Adrian Chadd adrian at FreeBSD.org
Thu Nov 24 04:34:04 UTC 2011


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


More information about the svn-src-head mailing list