From fee9ff323f1aa604f2ed197fb160de9ad0aabb31 Mon Sep 17 00:00:00 2001 From: Adrian Chadd Date: Thu, 24 Nov 2011 06:27:47 +0000 Subject: [PATCH] Don't compile in the AR9130 embedded WMAC code into the HAL by default. This won't work unless AH_SUPPORT_AR9130 which can't be enabled - it breaks the other 11n chipsets for now. Sponsored by: Hobnob, Inc. --- sys/conf/files | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 3fec1c80421..bd48447cacd 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -778,13 +778,15 @@ dev/ath/ath_hal/ar5416/ar5416_xmit.c \ ath_ar9287 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" # ar9130 (depends upon ar5416) - also requires AH_SUPPORT_AR9130 -dev/ath/ath_hal/ar9001/ar9130_attach.c optional ath_hal | ath_ar9130 \ +# +# Since this is an embedded MAC SoC, there's no need to compile it into the +# default HAL. +dev/ath/ath_hal/ar9001/ar9130_attach.c optional ath_ar9130 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" -dev/ath/ath_hal/ar9001/ar9130_phy.c optional ath_hal | ath_ar9130 \ +dev/ath/ath_hal/ar9001/ar9130_phy.c optional ath_ar9130 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" -dev/ath/ath_hal/ar9001/ar9130_eeprom.c optional ath_hal | ath_ar9130 \ +dev/ath/ath_hal/ar9001/ar9130_eeprom.c optional ath_ar9130 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" - # ar9160 (depends on ar5416) dev/ath/ath_hal/ar9001/ar9160_attach.c optional ath_hal | ath_ar9160 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" @@ -831,7 +833,8 @@ dev/ath/ath_hal/ar5212/ar5112.c optional ath_hal | ath_rf5112 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" dev/ath/ath_hal/ar5212/ar5413.c optional ath_hal | ath_rf5413 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" -dev/ath/ath_hal/ar5416/ar2133.c optional ath_hal | ath_ar5416 | ath_ar9160 \ +dev/ath/ath_hal/ar5416/ar2133.c optional ath_hal | ath_ar5416 | \ + ath_ar9130 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" dev/ath/ath_hal/ar9002/ar9280.c optional ath_hal | ath_ar9280 | ath_ar9285 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"