summaryrefslogtreecommitdiffstats
path: root/sys/mips
diff options
context:
space:
mode:
authoradrian <adrian@FreeBSD.org>2011-11-24 04:34:04 +0000
committeradrian <adrian@FreeBSD.org>2011-11-24 04:34:04 +0000
commit8cc7538694f9479b7c39d545e7654d4441e95842 (patch)
tree1fd88417910efb64823cb43e11c3662c8c214827 /sys/mips
parentb73ed44f786e5f0ce80e7b4966ea6792fe91581e (diff)
downloadFreeBSD-src-8cc7538694f9479b7c39d545e7654d4441e95842.zip
FreeBSD-src-8cc7538694f9479b7c39d545e7654d4441e95842.tar.gz
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.
Diffstat (limited to 'sys/mips')
-rw-r--r--sys/mips/conf/AR91XX_BASE14
1 files changed, 13 insertions, 1 deletions
diff --git a/sys/mips/conf/AR91XX_BASE b/sys/mips/conf/AR91XX_BASE
index 35819e6..71aaab0 100644
--- a/sys/mips/conf/AR91XX_BASE
+++ b/sys/mips/conf/AR91XX_BASE
@@ -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
OpenPOWER on IntegriCloud