mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-08-25 05:12:27 +03:00
b43: More non-PCI fixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14933 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
2799a143ab
commit
1046d2dc19
@ -379,10 +379,12 @@ endef
|
|||||||
BUILDFLAGS:= \
|
BUILDFLAGS:= \
|
||||||
-I$(PKG_BUILD_DIR)/include \
|
-I$(PKG_BUILD_DIR)/include \
|
||||||
$(foreach opt,$(CONFOPTS),-DCONFIG_$(opt)) \
|
$(foreach opt,$(CONFOPTS),-DCONFIG_$(opt)) \
|
||||||
$(if $(CONFIG_PCI), -DCONFIG_B43_PCI_AUTOSELECT -DCONFIG_B43_PCICORE_AUTOSELECT -DCONFIG_SSB_DRIVER_PCICORE_POSSIBLE -DCONFIG_SSB_DRIVER_PCICORE) \
|
$(if $(CONFIG_PCI),-DCONFIG_B43_PCI_AUTOSELECT -DCONFIG_B43_PCICORE_AUTOSELECT -DCONFIG_SSB_DRIVER_PCICORE_POSSIBLE -DCONFIG_SSB_DRIVER_PCICORE) \
|
||||||
|
$(if $(CONFIG_PCI),-DCONFIG_SSB_PCIHOST_POSSIBLE -DCONFIG_SSB_PCIHOST) \
|
||||||
|
$(if $(CONFIG_PCI),-DCONFIG_SSB_SPROM) \
|
||||||
$(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS -DCONFIG_B43_LEDS -DCONFIG_B43LEGACY_LEDS) \
|
$(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS -DCONFIG_B43_LEDS -DCONFIG_B43LEGACY_LEDS) \
|
||||||
$(if $(CONFIG_RFKILL),-DCONFIG_B43_RFKILL -DCONFIG_B43LEGACY_RFKILL) \
|
$(if $(CONFIG_RFKILL),-DCONFIG_B43_RFKILL -DCONFIG_B43LEGACY_RFKILL) \
|
||||||
$(if $(CONFIG_PCMCIA),-DCONFIG_B43_PCMCIA -DCONFIG_B43_PIO) \
|
$(if $(CONFIG_PCMCIA),-DCONFIG_SSB_PCMCIAHOST_POSSIBLE -DCONFIG_SSB_PCMCIAHOST -DCONFIG_B43_PCMCIA -DCONFIG_B43_PIO) \
|
||||||
$(if $(CONFIG_DEBUG_FS), -DCONFIG_MAC80211_DEBUGFS) \
|
$(if $(CONFIG_DEBUG_FS), -DCONFIG_MAC80211_DEBUGFS) \
|
||||||
-D__CONFIG_MAC80211_RC_DEFAULT=minstrel \
|
-D__CONFIG_MAC80211_RC_DEFAULT=minstrel \
|
||||||
|
|
||||||
@ -400,6 +402,10 @@ MAKE_OPTS:= \
|
|||||||
$(if $(CONFIG_PCI),CONFIG_B43_PCICORE_AUTOSELECT=y,CONFIG_B43_PCICORE_AUTOSELECT=n) \
|
$(if $(CONFIG_PCI),CONFIG_B43_PCICORE_AUTOSELECT=y,CONFIG_B43_PCICORE_AUTOSELECT=n) \
|
||||||
$(if $(CONFIG_PCI),CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y,CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=n) \
|
$(if $(CONFIG_PCI),CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y,CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=n) \
|
||||||
$(if $(CONFIG_PCI),CONFIG_SSB_DRIVER_PCICORE=y,CONFIG_SSB_DRIVER_PCICORE=n) \
|
$(if $(CONFIG_PCI),CONFIG_SSB_DRIVER_PCICORE=y,CONFIG_SSB_DRIVER_PCICORE=n) \
|
||||||
|
$(if $(CONFIG_PCI),CONFIG_SSB_PCIHOST_POSSIBLE=y,CONFIG_SSB_PCIHOST_POSSIBLE=n) \
|
||||||
|
$(if $(CONFIG_PCI),CONFIG_SSB_PCIHOST=y,CONFIG_SSB_PCIHOST=n) \
|
||||||
|
$(if $(CONFIG_PCMCIA),CONFIG_SSB_PCMCIAHOST_POSSIBLE=y,CONFIG_SSB_PCMCIAHOST_POSSIBLE=n) \
|
||||||
|
$(if $(CONFIG_PCMCIA),CONFIG_SSB_PCMCIAHOST=y,CONFIG_SSB_PCMCIAHOST=n) \
|
||||||
$(if $(CONFIG_PCMCIA),CONFIG_B43_PCMCIA=y,CONFIG_B43_PCMCIA=n) \
|
$(if $(CONFIG_PCMCIA),CONFIG_B43_PCMCIA=y,CONFIG_B43_PCMCIA=n) \
|
||||||
$(if $(CONFIG_PCMCIA),CONFIG_B43_PIO=y,CONFIG_B43_PIO=n) \
|
$(if $(CONFIG_PCMCIA),CONFIG_B43_PIO=y,CONFIG_B43_PIO=n) \
|
||||||
$(if $(CONFIG_RFKILL),CONFIG_B43_RFKILL=y,CONFIG_B43_RFKILL=n) \
|
$(if $(CONFIG_RFKILL),CONFIG_B43_RFKILL=y,CONFIG_B43_RFKILL=n) \
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
Index: compat-wireless-2009-03-13/config.mk
|
Index: compat-wireless-2009-03-13/config.mk
|
||||||
===================================================================
|
===================================================================
|
||||||
--- compat-wireless-2009-03-13.orig/config.mk 2009-03-17 21:15:23.000000000 +0100
|
--- compat-wireless-2009-03-13.orig/config.mk 2009-03-17 23:34:31.000000000 +0100
|
||||||
+++ compat-wireless-2009-03-13/config.mk 2009-03-17 21:18:05.000000000 +0100
|
+++ compat-wireless-2009-03-13/config.mk 2009-03-17 23:40:08.000000000 +0100
|
||||||
@@ -91,10 +91,10 @@ CONFIG_MAC80211_MESH=y
|
@@ -91,10 +91,10 @@ CONFIG_MAC80211_MESH=y
|
||||||
CONFIG_CFG80211=m
|
CONFIG_CFG80211=m
|
||||||
# CONFIG_CFG80211_REG_DEBUG is not set
|
# CONFIG_CFG80211_REG_DEBUG is not set
|
||||||
@ -68,7 +68,34 @@ Index: compat-wireless-2009-03-13/config.mk
|
|||||||
# CONFIG_IPW2200_DEBUG is not set
|
# CONFIG_IPW2200_DEBUG is not set
|
||||||
# The above enables use a second interface prefixed 'rtap'.
|
# The above enables use a second interface prefixed 'rtap'.
|
||||||
# Example usage:
|
# Example usage:
|
||||||
@@ -283,15 +283,15 @@ CONFIG_SSB_SPROM=y
|
@@ -176,13 +176,13 @@ CONFIG_IPW2200_QOS=y
|
||||||
|
# % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface
|
||||||
|
|
||||||
|
CONFIG_SSB_BLOCKIO=y
|
||||||
|
-CONFIG_SSB_PCIHOST_POSSIBLE=y
|
||||||
|
-CONFIG_SSB_PCIHOST=y
|
||||||
|
+# CONFIG_SSB_PCIHOST_POSSIBLE=y
|
||||||
|
+# CONFIG_SSB_PCIHOST=y
|
||||||
|
CONFIG_SSB_B43_PCI_BRIDGE=y
|
||||||
|
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
|
||||||
|
-CONFIG_SSB_PCMCIAHOST=y
|
||||||
|
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
|
||||||
|
-CONFIG_SSB_DRIVER_PCICORE=y
|
||||||
|
+# CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
|
||||||
|
+# CONFIG_SSB_PCMCIAHOST=y
|
||||||
|
+# CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
|
||||||
|
+# CONFIG_SSB_DRIVER_PCICORE=y
|
||||||
|
|
||||||
|
CONFIG_P54_PCI=m
|
||||||
|
|
||||||
|
@@ -277,21 +277,21 @@ CONFIG_P54_COMMON=m
|
||||||
|
# Sonics Silicon Backplane
|
||||||
|
CONFIG_SSB_POSSIBLE=y
|
||||||
|
CONFIG_SSB=m
|
||||||
|
-CONFIG_SSB_SPROM=y
|
||||||
|
+# CONFIG_SSB_SPROM=y
|
||||||
|
# CONFIG_SSB_DEBUG is not set
|
||||||
|
|
||||||
ifneq ($(CONFIG_USB),)
|
ifneq ($(CONFIG_USB),)
|
||||||
ifneq ($(CONFIG_LIBERTAS_THINFIRM_USB),m)
|
ifneq ($(CONFIG_LIBERTAS_THINFIRM_USB),m)
|
||||||
CONFIG_LIBERTAS_USB=m
|
CONFIG_LIBERTAS_USB=m
|
||||||
|
Loading…
Reference in New Issue
Block a user