mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-08-22 06:32:26 +03:00
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14591 3c298f89-4303-0410-b956-a3cf2f4a3e73
160 lines
4.0 KiB
Diff
160 lines
4.0 KiB
Diff
--- a/config.mk
|
|
+++ b/config.mk
|
|
@@ -72,70 +72,34 @@ ifneq ($(CONFIG_PCI),)
|
|
CONFIG_ATH5K=m
|
|
CONFIG_ATH5K_DEBUG=n
|
|
|
|
-# Required for older kernels which still use this flag.
|
|
-CONFIG_IWLWIFI=m
|
|
-
|
|
-CONFIG_IWLCORE=m
|
|
-CONFIG_IWL3945=m
|
|
-CONFIG_IWL4965=m
|
|
-CONFIG_IWL4965_HT=y
|
|
-CONFIG_B43=m
|
|
+# CONFIG_B43=m
|
|
+CONFIG_B43_NPHY=y
|
|
# B43 uses PCMCIA only for Compact Flash. The Cardbus cards uses PCI
|
|
# Example, bcm4318:
|
|
# http://www.multicap.biz/wireless-lan/indoor-wlan-hardware/sdc-cf10g-80211g-compact-flash-module
|
|
-CONFIG_B43_PCMCIA=y
|
|
+# CONFIG_B43_PCMCIA=y
|
|
CONFIG_B43_DMA=y
|
|
-CONFIG_B43_PIO=y
|
|
+# CONFIG_B43_PIO=y
|
|
# B43_PIO selects SSB_BLOCKIO
|
|
-CONFIG_SSB_BLOCKIO=y
|
|
-CONFIG_B43_DMA_AND_PIO_MODE=y
|
|
-CONFIG_B43_PCI_AUTOSELECT=y
|
|
-CONFIG_B43_PCICORE_AUTOSELECT=y
|
|
-#CONFIG_B43_RFKILL=n
|
|
-CONFIG_B43_LEDS=y
|
|
+# CONFIG_SSB_BLOCKIO=y
|
|
+# CONFIG_B43_DMA_AND_PIO_MODE=y
|
|
+# CONFIG_B43_PCI_AUTOSELECT=y
|
|
+# CONFIG_B43_PCICORE_AUTOSELECT=y
|
|
+# CONFIG_B43_RFKILL=y
|
|
+# CONFIG_B43_LEDS=y
|
|
# CONFIG_B43_DEBUG is not set
|
|
|
|
-CONFIG_B43LEGACY=m
|
|
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
|
|
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
|
|
+# CONFIG_B43LEGACY=m
|
|
+# CONFIG_B43LEGACY_RFKILL=y
|
|
+# CONFIG_B43LEGACY_LEDS=y
|
|
+# CONFIG_B43LEGACY_PCI_AUTOSELECT=y
|
|
+# CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
|
|
CONFIG_B43LEGACY_DMA=y
|
|
-CONFIG_B43LEGACY_PIO=y
|
|
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
|
|
-
|
|
-# The Intel ipws
|
|
-CONFIG_IPW2100=m
|
|
-CONFIG_IPW2100_MONITOR=y
|
|
-CONFIG_IPW2200=m
|
|
-CONFIG_IPW2200_MONITOR=y
|
|
-CONFIG_IPW2200_RADIOTAP=y
|
|
-CONFIG_IPW2200_PROMISCUOUS=y
|
|
-# The above enables use a second interface prefixed 'rtap'.
|
|
-# Example usage:
|
|
-#
|
|
-# % modprobe ipw2200 rtap_iface=1
|
|
-# % ifconfig rtap0 up
|
|
-# % tethereal -i rtap0
|
|
-#
|
|
-# If you do not specify 'rtap_iface=1' as a module parameter then
|
|
-# the rtap interface will not be created and you will need to turn
|
|
-# it on via sysfs:
|
|
-#
|
|
-# % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface
|
|
-CONFIG_IPW2200_QOS=y
|
|
-
|
|
-NEED_IEEE80211=y
|
|
+# CONFIG_B43LEGACY_PIO=y
|
|
+# CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
|
|
|
|
CONFIG_P54_PCI=m
|
|
|
|
-CONFIG_SSB_PCIHOST_POSSIBLE=y
|
|
-CONFIG_SSB_PCIHOST=y
|
|
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
|
|
-CONFIG_SSB_DRIVER_PCICORE=y
|
|
-CONFIG_SSB_B43_PCI_BRIDGE=y
|
|
-
|
|
-CONFIG_RTL8180=m
|
|
-CONFIG_ADM8211=m
|
|
-
|
|
CONFIG_RT2X00_LIB_PCI=m
|
|
CONFIG_RT2400PCI=m
|
|
CONFIG_RT2500PCI=m
|
|
@@ -159,31 +123,7 @@ CONFIG_EEPROM_93CX6=m
|
|
ifneq ($(CONFIG_USB),)
|
|
CONFIG_ZD1211RW=m
|
|
|
|
-# support for USB Wireless devices using Atmel at76c503,
|
|
-# at76c505 or at76c505a chips.
|
|
-CONFIG_USB_ATMEL=m
|
|
-
|
|
-# Stuff here things which depend on kernel versions for USB
|
|
-ifeq ($(shell test -e $(KLIB_BUILD)/Makefile && echo yes),yes)
|
|
-KERNEL_SUBLEVEL = $(shell $(MAKE) -C $(KLIB_BUILD) kernelversion | sed -n 's/^2\.6\.\([0-9]\+\).*/\1/p')
|
|
-ifeq ($(shell test $(KERNEL_SUBLEVEL) -gt 21 && echo yes),yes)
|
|
-
|
|
-# Sorry, rndis_wlan uses cancel_work_sync which is new and can't be done in compat...
|
|
-
|
|
-# Wireless RNDIS USB support (RTL8185 802.11g) A-Link WL54PC
|
|
-# All of these devices are based on Broadcom 4320 chip which
|
|
-# is only wireless RNDIS chip known to date.
|
|
-# Note: this depends on CONFIG_USB_NET_RNDIS_HOST and CONFIG_USB_NET_CDCETHER
|
|
-# it also requires new RNDIS_HOST and CDC_ETHER modules which we add
|
|
-CONFIG_USB_NET_RNDIS_HOST=m
|
|
-CONFIG_USB_NET_RNDIS_WLAN=m
|
|
-CONFIG_USB_NET_CDCETHER=m
|
|
-
|
|
-endif
|
|
-endif
|
|
-
|
|
CONFIG_P54_USB=m
|
|
-CONFIG_RTL8187=m
|
|
|
|
# RT2500USB does not require firmware
|
|
CONFIG_RT2500USB=m
|
|
@@ -212,36 +152,6 @@ endif
|
|
# p54
|
|
CONFIG_P54_COMMON=m
|
|
|
|
-# Sonics Silicon Backplane
|
|
-CONFIG_SSB_POSSIBLE=y
|
|
-CONFIG_SSB=m
|
|
-CONFIG_SSB_SPROM=y
|
|
-
|
|
-ifneq ($(CONFIG_PCMCIA),)
|
|
-CONFIG_SSB_PCMCIAHOST=y
|
|
-endif
|
|
-
|
|
-# These two are for mips
|
|
-CONFIG_SSB_DRIVER_MIPS=n
|
|
-CONFIG_SSB_PCICORE_HOSTMODE=n
|
|
-# CONFIG_SSB_DEBUG is not set
|
|
-# CONFIG_SSB_DRIVER_EXTIF=y
|
|
-
|
|
-ifneq ($(CONFIG_USB),)
|
|
-CONFIG_LIBERTAS_USB=m
|
|
-NEED_LIBERTAS=y
|
|
-endif
|
|
-ifneq ($(CONFIG_PCMCIA),)
|
|
-CONFIG_LIBERTAS_CS=m
|
|
-NEED_LIBERTAS=y
|
|
-endif
|
|
-ifeq ($(NEED_LIBERTAS),y)
|
|
-CONFIG_LIBERTAS=m
|
|
-# Libertas uses the old stack but not fully, it will soon
|
|
-# be cleaned.
|
|
-NEED_IEEE80211=y
|
|
-endif
|
|
-
|
|
ifeq ($(NEED_IEEE80211),y)
|
|
# Old ieee80211 "stack"
|
|
# Note: old softmac is scheduled for removal so we
|