ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-22 10:01:03 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

b43: Fix for non-PCI builds

Browse Source 
SVN-Revision: 14932
This commit is contained in:
Michael Büsch 2009-03-17 21:00:44 +00:00
parent d17716e16f
commit 06c36d9c5b
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package/mac80211/Makefile
View File

@ -379,9 +379,10 @@ 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_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) \ $(if $(CONFIG_PCMCIA),-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 \
@ -395,9 +396,14 @@ MAKE_OPTS:= \
CONFIG_MAC80211_RC_MINSTREL=y \ CONFIG_MAC80211_RC_MINSTREL=y \
CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \ CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \
CONFIG_MAC80211_DEBUGFS=$(CONFIG_DEBUG_FS) \ CONFIG_MAC80211_DEBUGFS=$(CONFIG_DEBUG_FS) \
CONFIG_B43_PCMCIA=$(CONFIG_PCMCIA) \ $(if $(CONFIG_PCI),CONFIG_B43_PCI_AUTOSELECT=y,CONFIG_B43_PCI_AUTOSELECT=n) \
$(if $(CONFIG_RFKILL),CONFIG_B43_RFKILL=y) \ $(if $(CONFIG_PCI),CONFIG_B43_PCICORE_AUTOSELECT=y,CONFIG_B43_PCICORE_AUTOSELECT=n) \
$(if $(CONFIG_RFKILL),CONFIG_B43LEGACY_RFKILL=y) \ $(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_PCMCIA),CONFIG_B43_PCMCIA=y,CONFIG_B43_PCMCIA=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_B43LEGACY_RFKILL=y,CONFIG_B43LEGACY_RFKILL=n) \
CONFIG_B43LEGACY_LEDS=$(CONFIG_LEDS_TRIGGERS) \ CONFIG_B43LEGACY_LEDS=$(CONFIG_LEDS_TRIGGERS) \
CONFIG_B43_LEDS=$(CONFIG_LEDS_TRIGGERS) \ CONFIG_B43_LEDS=$(CONFIG_LEDS_TRIGGERS) \
$(if $(CONFIG_PACKAGE_kmod-b43),CONFIG_B43=m) \ $(if $(CONFIG_PACKAGE_kmod-b43),CONFIG_B43=m) \

21
package/mac80211/patches/007-remove_unused_stuff.patch
View File

@ -1,5 +1,7 @@
--- a/config.mk Index: compat-wireless-2009-03-13/config.mk
+++ b/config.mk ===================================================================
--- compat-wireless-2009-03-13.orig/config.mk 2009-03-17 21:15:23.000000000 +0100
+++ compat-wireless-2009-03-13/config.mk 2009-03-17 21:18:05.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
@ -15,14 +17,19 @@
CONFIG_NL80211=y CONFIG_NL80211=y
@@ -131,16 +131,16 @@ CONFIG_IWL3945_LEDS=y @@ -129,18 +129,18 @@ CONFIG_IWL3945_LEDS=y
CONFIG_B43=m CONFIG_B43=m
CONFIG_B43_PCI_AUTOSELECT=y -CONFIG_B43_PCI_AUTOSELECT=y
CONFIG_B43_PCICORE_AUTOSELECT=y -CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y -CONFIG_B43_PCMCIA=y
+# CONFIG_B43_PCMCIA=y -CONFIG_B43_PIO=y
CONFIG_B43_PIO=y
-CONFIG_B43_LEDS=y -CONFIG_B43_LEDS=y
+# CONFIG_B43_PCI_AUTOSELECT=y
+# CONFIG_B43_PCICORE_AUTOSELECT=y
+# CONFIG_B43_PCMCIA=y
+# CONFIG_B43_PIO=y
+# CONFIG_B43_LEDS=y +# CONFIG_B43_LEDS=y
# CONFIG_B43_RFKILL=y # CONFIG_B43_RFKILL=y
# CONFIG_B43_DEBUG is not set # CONFIG_B43_DEBUG is not set