ath - Temporarily remove ath from kernel build
authorMatthew Dillon <dillon@apollo.backplane.com>
Thu, 2 Jan 2014 07:03:46 +0000 (23:03 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Thu, 2 Jan 2014 07:15:40 +0000 (23:15 -0800)
* ATH is currently a module only, until we can fix conf/files and such
  again.

* Remove unneeded -I PATH

sys/conf/files
sys/conf/kern.pre.mk
sys/config/GENERIC
sys/config/X86_64_GENERIC

index cf8c710..d9e0950 100644 (file)
@@ -183,96 +183,96 @@ dev/disk/aic7xxx/ahd_pci.c                optional ahd pci
 dev/disk/aic7xxx/aic79xx.c             optional ahd pci
 dev/disk/aic7xxx/aic79xx_osm.c         optional ahd pci
 dev/disk/aic7xxx/aic79xx_pci.c         optional ahd pci
-dev/netif/ath/hal/ah_osdep.c                           optional ath_hal
-dev/netif/ath/hal/ath_hal/ah.c                                 optional ath_hal
-dev/netif/ath/hal/ath_hal/ah_eeprom_v1.c               optional ath_hal
-dev/netif/ath/hal/ath_hal/ah_eeprom_v14.c              optional ath_hal
-dev/netif/ath/hal/ath_hal/ah_eeprom_v3.c               optional ath_hal
-dev/netif/ath/hal/ath_hal/ah_eeprom_v4k.c              optional ath_hal
-dev/netif/ath/hal/ath_hal/ah_regdomain.c               optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5210/ar5210_attach.c       optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5210/ar5210_beacon.c       optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5210/ar5210_interrupts.c   optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5210/ar5210_keycache.c     optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5210/ar5210_misc.c                 optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5210/ar5210_phy.c          optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5210/ar5210_power.c        optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5210/ar5210_recv.c                 optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5210/ar5210_reset.c        optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5210/ar5210_xmit.c                 optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5211/ar5211_attach.c       optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5211/ar5211_beacon.c       optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5211/ar5211_interrupts.c   optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5211/ar5211_keycache.c     optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5211/ar5211_misc.c                 optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5211/ar5211_phy.c          optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5211/ar5211_power.c        optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5211/ar5211_recv.c                 optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5211/ar5211_reset.c        optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5211/ar5211_xmit.c                 optional ath_hal
-#dev/netif/ath/hal/ath_hal/ar5212/ar2316.c             optional ath_hal
-#dev/netif/ath/hal/ath_hal/ar5212/ar2317.c             optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5212/ar2413.c              optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5212/ar2425.c              optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5212/ar5111.c              optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5212/ar5112.c              optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5212/ar5212_ani.c          optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5212/ar5212_attach.c       optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5212/ar5212_beacon.c       optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5212/ar5212_eeprom.c       optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5212/ar5212_gpio.c                 optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5212/ar5212_interrupts.c   optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5212/ar5212_keycache.c     optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5212/ar5212_misc.c                 optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5212/ar5212_phy.c          optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5212/ar5212_power.c        optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5212/ar5212_recv.c                 optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5212/ar5212_reset.c        optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5212/ar5212_rfgain.c       optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5212/ar5212_xmit.c                 optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5212/ar5413.c              optional ath_hal
-#dev/netif/ath/hal/ath_hal/ar5312/ar5312_attach.c      optional ath_hal
-#dev/netif/ath/hal/ath_hal/ar5312/ar5312_eeprom.c      optional ath_hal
-#dev/netif/ath/hal/ath_hal/ar5312/ar5312_gpio.c        optional ath_hal
-#dev/netif/ath/hal/ath_hal/ar5312/ar5312_interrupts.c  optional ath_hal
-#dev/netif/ath/hal/ath_hal/ar5312/ar5312_misc.c        optional ath_hal
-#dev/netif/ath/hal/ath_hal/ar5312/ar5312_power.c       optional ath_hal
-#dev/netif/ath/hal/ath_hal/ar5312/ar5312_reset.c       optional ath_hal
-#dev/netif/ath/hal/ath_hal/ar5312/ar5315_gpio.c        optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5416/ar2133.c              optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5416/ar5416_ani.c          optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5416/ar5416_attach.c       optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5416/ar5416_beacon.c       optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5416/ar5416_cal.c          optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5416/ar5416_cal_adcdc.c    optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5416/ar5416_cal_adcgain.c  optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5416/ar5416_cal_iq.c       optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5416/ar5416_eeprom.c       optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5416/ar5416_gpio.c                 optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5416/ar5416_interrupts.c   optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5416/ar5416_keycache.c     optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5416/ar5416_misc.c                 optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5416/ar5416_phy.c          optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5416/ar5416_power.c        optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5416/ar5416_recv.c                 optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5416/ar5416_reset.c        optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5416/ar5416_xmit.c                 optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5416/ar9160_attach.c       optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5416/ar9280.c              optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5416/ar9280_attach.c       optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5416/ar9285.c              optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5416/ar9285_attach.c       optional ath_hal
-dev/netif/ath/hal/ath_hal/ar5416/ar9285_reset.c        optional ath_hal
-dev/netif/ath/rate_amrr/amrr.c         optional ath_rate_amrr \
-       compile-with "${NORMAL_C} -I$S/dev/netif/ath/ath ${WERROR}"
-dev/netif/ath/rate_onoe/onoe.c         optional ath_rate_onoe \
-       compile-with "${NORMAL_C} -I$S/dev/netif/ath/ath ${WERROR}"
-dev/netif/ath/rate_sample/sample.c     optional ath_rate_sample \
-       compile-with "${NORMAL_C} -I$S/dev/netif/ath/ath ${WERROR}"
-dev/netif/ath/ath/if_ath.c             optional ath \
-       compile-with "${NORMAL_C} -I$S/dev/netif/ath/ath ${WERROR}"
-dev/netif/ath/ath/if_ath_pci.c         optional ath pci \
-       compile-with "${NORMAL_C} -I$S/dev/netif/ath/ath ${WERROR}"
+#dev/netif/ath/hal/ah_osdep.c                          optional ath_hal
+#dev/netif/ath/hal/ath_hal/ah.c                                optional ath_hal
+#dev/netif/ath/hal/ath_hal/ah_eeprom_v1.c              optional ath_hal
+#dev/netif/ath/hal/ath_hal/ah_eeprom_v14.c             optional ath_hal
+#dev/netif/ath/hal/ath_hal/ah_eeprom_v3.c              optional ath_hal
+#dev/netif/ath/hal/ath_hal/ah_eeprom_v4k.c             optional ath_hal
+#dev/netif/ath/hal/ath_hal/ah_regdomain.c              optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5210/ar5210_attach.c      optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5210/ar5210_beacon.c      optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5210/ar5210_interrupts.c  optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5210/ar5210_keycache.c    optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5210/ar5210_misc.c                optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5210/ar5210_phy.c                 optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5210/ar5210_power.c       optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5210/ar5210_recv.c                optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5210/ar5210_reset.c       optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5210/ar5210_xmit.c                optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5211/ar5211_attach.c      optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5211/ar5211_beacon.c      optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5211/ar5211_interrupts.c  optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5211/ar5211_keycache.c    optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5211/ar5211_misc.c                optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5211/ar5211_phy.c                 optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5211/ar5211_power.c       optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5211/ar5211_recv.c                optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5211/ar5211_reset.c       optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5211/ar5211_xmit.c                optional ath_hal
+##dev/netif/ath/hal/ath_hal/ar5212/ar2316.c            optional ath_hal
+##dev/netif/ath/hal/ath_hal/ar5212/ar2317.c            optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5212/ar2413.c             optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5212/ar2425.c             optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5212/ar5111.c             optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5212/ar5112.c             optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5212/ar5212_ani.c                 optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5212/ar5212_attach.c      optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5212/ar5212_beacon.c      optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5212/ar5212_eeprom.c      optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5212/ar5212_gpio.c                optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5212/ar5212_interrupts.c  optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5212/ar5212_keycache.c    optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5212/ar5212_misc.c                optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5212/ar5212_phy.c                 optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5212/ar5212_power.c       optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5212/ar5212_recv.c                optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5212/ar5212_reset.c       optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5212/ar5212_rfgain.c      optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5212/ar5212_xmit.c                optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5212/ar5413.c             optional ath_hal
+##dev/netif/ath/hal/ath_hal/ar5312/ar5312_attach.c     optional ath_hal
+##dev/netif/ath/hal/ath_hal/ar5312/ar5312_eeprom.c     optional ath_hal
+##dev/netif/ath/hal/ath_hal/ar5312/ar5312_gpio.c       optional ath_hal
+##dev/netif/ath/hal/ath_hal/ar5312/ar5312_interrupts.c         optional ath_hal
+##dev/netif/ath/hal/ath_hal/ar5312/ar5312_misc.c       optional ath_hal
+##dev/netif/ath/hal/ath_hal/ar5312/ar5312_power.c      optional ath_hal
+##dev/netif/ath/hal/ath_hal/ar5312/ar5312_reset.c      optional ath_hal
+##dev/netif/ath/hal/ath_hal/ar5312/ar5315_gpio.c       optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5416/ar2133.c             optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5416/ar5416_ani.c                 optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5416/ar5416_attach.c      optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5416/ar5416_beacon.c      optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5416/ar5416_cal.c                 optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5416/ar5416_cal_adcdc.c   optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5416/ar5416_cal_adcgain.c         optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5416/ar5416_cal_iq.c      optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5416/ar5416_eeprom.c      optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5416/ar5416_gpio.c                optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5416/ar5416_interrupts.c  optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5416/ar5416_keycache.c    optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5416/ar5416_misc.c                optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5416/ar5416_phy.c                 optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5416/ar5416_power.c       optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5416/ar5416_recv.c                optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5416/ar5416_reset.c       optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5416/ar5416_xmit.c                optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5416/ar9160_attach.c      optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5416/ar9280.c             optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5416/ar9280_attach.c      optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5416/ar9285.c             optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5416/ar9285_attach.c      optional ath_hal
+#dev/netif/ath/hal/ath_hal/ar5416/ar9285_reset.c       optional ath_hal
+#dev/netif/ath/rate_amrr/amrr.c                optional ath_rate_amrr \
+#      compile-with "${NORMAL_C} -I$S/dev/netif/ath/ath ${WERROR}"
+#dev/netif/ath/rate_onoe/onoe.c                optional ath_rate_onoe \
+#      compile-with "${NORMAL_C} -I$S/dev/netif/ath/ath ${WERROR}"
+#dev/netif/ath/rate_sample/sample.c    optional ath_rate_sample \
+#      compile-with "${NORMAL_C} -I$S/dev/netif/ath/ath ${WERROR}"
+#dev/netif/ath/ath/if_ath.c            optional ath \
+#      compile-with "${NORMAL_C} -I$S/dev/netif/ath/ath ${WERROR}"
+#dev/netif/ath/ath/if_ath_pci.c                optional ath pci \
+#      compile-with "${NORMAL_C} -I$S/dev/netif/ath/ath ${WERROR}"
 dev/netif/alc/if_alc.c                 optional alc
 dev/netif/ale/if_ale.c                 optional ale
 dev/netif/bce/if_bce.c                 optional bce
index 01010aa..a7d0f59 100644 (file)
@@ -49,8 +49,8 @@ INCLUDES+= -I/usr/include
 .include "$S/conf/acpi.mk"
 INCLUDES+= -I${.OBJDIR} -I"$S/${OSACPI_MI_DIR}" -I"$S/${ACPICA_DIR}/include"
 
-# ... and the same for Atheros HAL
-INCLUDES+= -I$S/dev/netif/ath/hal -I$S/dev/netif/ath/hal/ath_hal
+## ... and the same for Atheros HAL
+##INCLUDES+= -I$S/dev/netif/ath/ath_hal
 
 # Same thing for drm includes
 INCLUDES+= -I$S/dev/drm/include
index d7f17e0..097973d 100644 (file)
@@ -294,10 +294,10 @@ device            wlan_wep        # 802.11 WEP support
 # card for a manually chosen I/O address and IRQ, you must specify
 # those parameters here.
 device         an
-device         ath             # Atheros NICs
-device         ath_hal         # Atheros Hardware Access Layer
-options        AH_SUPPORT_AR5416       # enable AR5416 tx/rx descriptors
-device         ath_rate_sample # Atheros Sample TX rate control algorithm
+#device                ath             # Atheros NICs
+#device                ath_hal         # Atheros Hardware Access Layer
+#options       AH_SUPPORT_AR5416       # enable AR5416 tx/rx descriptors
+#device                ath_rate_sample # Atheros Sample TX rate control algorithm
 device         ral             # Ralink Technology 802.11 wireless NIC
 device         iwn             # Intel
 #device                rtw             # RealTek 802.11 wireless NIC
index c114293..3fc5b6c 100644 (file)
@@ -270,10 +270,10 @@ device            wlan_wep        # 802.11 WEP support
 # card for a manually chosen I/O address and IRQ, you must specify
 # those parameters here.
 device         an
-device         ath             # Atheros NICs
-device         ath_hal         # Atheros Hardware Access Layer
-options        AH_SUPPORT_AR5416       # enable AR5416 tx/rx descriptors
-device         ath_rate_sample # Atheros Sample TX rate control algorithm
+#device                ath             # Atheros NICs
+#device                ath_hal         # Atheros Hardware Access Layer
+#options       AH_SUPPORT_AR5416       # enable AR5416 tx/rx descriptors
+#device                ath_rate_sample # Atheros Sample TX rate control algorithm
 device         ral             # Ralink Technology 802.11 wireless NIC
 device         iwn             # Intel
 #device                rtw             # RealTek 802.11 wireless NIC