aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2009-05-11 20:51:38 +0000
committerHauke Mehrtens <hauke@openwrt.org>2009-05-11 20:51:38 +0000
commit1fc1bf88f2eaa61563dfc12f4572bf95da2d3e2c (patch)
tree19ff1c887ca56597de86e43afae53479ccf3cf09
parent04367e7a3248eed51f25a5e730910d86ab6018fe (diff)
downloadupstream-1fc1bf88f2eaa61563dfc12f4572bf95da2d3e2c.tar.gz
upstream-1fc1bf88f2eaa61563dfc12f4572bf95da2d3e2c.tar.bz2
upstream-1fc1bf88f2eaa61563dfc12f4572bf95da2d3e2c.zip
[ssb] Add support for pcmcia to ssb.
b43 will build now with pcmcia support. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15784 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/kernel/modules/other.mk8
-rw-r--r--package/mac80211/Makefile4
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/974-ssb_b43_default_on.patch9
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/974-ssb_b43_default_on.patch9
-rw-r--r--target/linux/generic-2.6/patches-2.6.29/974-ssb_b43_default_on.patch9
5 files changed, 34 insertions, 5 deletions
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 811836127d..50c8a6620e 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -121,6 +121,7 @@ endef
$(eval $(call KernelPackage,pcspkr))
+# This activates PCMCIA support in ssb. This will be included in kmod-ssb.
define KernelPackage/pcmcia-core
SUBMENU:=$(OTHER_MENU)
TITLE:=PCMCIA/CardBus support
@@ -131,6 +132,9 @@ define KernelPackage/pcmcia-core
CONFIG_PCCARD \
CONFIG_YENTA \
CONFIG_PCCARD_NONSTATIC \
+ CONFIG_SSB_PCMCIAHOST=y \
+ CONFIG_SSB_PCMCIAHOST_POSSIBLE=y \
+ CONFIG_SSB_BLOCKIO=y \
PCMCIA_DEBUG=n
endef
@@ -141,7 +145,7 @@ define KernelPackage/pcmcia-core/2.4
FILES:= \
$(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/pcmcia/ds.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,40,pcmcia_core ds)
+ AUTOLOAD:=$(call AutoLoad,25,pcmcia_core ds)
endef
define KernelPackage/pcmcia-core/2.6
@@ -155,7 +159,7 @@ define KernelPackage/pcmcia-core/2.6
$(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/pcmcia/pcmcia.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,40,pcmcia_core pcmcia rsrc_nonstatic)
+ AUTOLOAD:=$(call AutoLoad,25,pcmcia_core pcmcia rsrc_nonstatic)
endef
define KernelPackage/pcmcia-core/description
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index ad2ea2d7a9..a6af5646f2 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -400,7 +400,7 @@ BUILDFLAGS:= \
$(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_HW_RANDOM),-DCONFIG_B43_HWRNG -DCONFIG_B43LEGACY_HWRNG) \
- $(if $(CONFIG_PCMCIA),-DCONFIG_SSB_PCMCIAHOST_POSSIBLE -DCONFIG_SSB_PCMCIAHOST -DCONFIG_B43_PCMCIA -DCONFIG_B43_PIO) \
+ $(if $(CONFIG_PCMCIA),-DCONFIG_B43_PCMCIA -DCONFIG_B43_PIO) \
$(if $(CONFIG_DEBUG_FS), -DCONFIG_MAC80211_DEBUGFS) \
-D__CONFIG_MAC80211_RC_DEFAULT=minstrel \
@@ -420,8 +420,6 @@ MAKE_OPTS:= \
$(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_PIO=y,CONFIG_B43_PIO=n) \
$(if $(CONFIG_RFKILL),CONFIG_B43_RFKILL=y,CONFIG_B43_RFKILL=n) \
diff --git a/target/linux/generic-2.6/patches-2.6.27/974-ssb_b43_default_on.patch b/target/linux/generic-2.6/patches-2.6.27/974-ssb_b43_default_on.patch
index 943230f761..a5e84ba57e 100644
--- a/target/linux/generic-2.6/patches-2.6.27/974-ssb_b43_default_on.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/974-ssb_b43_default_on.patch
@@ -1,5 +1,14 @@
--- a/drivers/ssb/Kconfig
+++ b/drivers/ssb/Kconfig
+@@ -26,7 +26,7 @@ config SSB_SPROM
+
+ # Support for Block-I/O. SELECT this from the driver that needs it.
+ config SSB_BLOCKIO
+- bool
++ bool "add SSB_BLOCKIO support"
+ depends on SSB
+
+ config SSB_PCIHOST_POSSIBLE
@@ -48,7 +48,7 @@ config SSB_PCIHOST
config SSB_B43_PCI_BRIDGE
bool
diff --git a/target/linux/generic-2.6/patches-2.6.28/974-ssb_b43_default_on.patch b/target/linux/generic-2.6/patches-2.6.28/974-ssb_b43_default_on.patch
index 98dde2a3c8..8a00df581b 100644
--- a/target/linux/generic-2.6/patches-2.6.28/974-ssb_b43_default_on.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/974-ssb_b43_default_on.patch
@@ -1,5 +1,14 @@
--- a/drivers/ssb/Kconfig
+++ b/drivers/ssb/Kconfig
+@@ -27,7 +27,7 @@ config SSB_SPROM
+
+ # Support for Block-I/O. SELECT this from the driver that needs it.
+ config SSB_BLOCKIO
+- bool
++ bool "add SSB_BLOCKIO support"
+ depends on SSB
+
+ config SSB_PCIHOST_POSSIBLE
@@ -49,7 +49,7 @@ config SSB_PCIHOST
config SSB_B43_PCI_BRIDGE
bool
diff --git a/target/linux/generic-2.6/patches-2.6.29/974-ssb_b43_default_on.patch b/target/linux/generic-2.6/patches-2.6.29/974-ssb_b43_default_on.patch
index 98dde2a3c8..8a00df581b 100644
--- a/target/linux/generic-2.6/patches-2.6.29/974-ssb_b43_default_on.patch
+++ b/target/linux/generic-2.6/patches-2.6.29/974-ssb_b43_default_on.patch
@@ -1,5 +1,14 @@
--- a/drivers/ssb/Kconfig
+++ b/drivers/ssb/Kconfig
+@@ -27,7 +27,7 @@ config SSB_SPROM
+
+ # Support for Block-I/O. SELECT this from the driver that needs it.
+ config SSB_BLOCKIO
+- bool
++ bool "add SSB_BLOCKIO support"
+ depends on SSB
+
+ config SSB_PCIHOST_POSSIBLE
@@ -49,7 +49,7 @@ config SSB_PCIHOST
config SSB_B43_PCI_BRIDGE
bool