mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 07:46:48 +00:00
ssb: activate CONFIG_SSB_BLOCKIO in the kernel and not in compat-wireless.
Before this patch CONFIG_SSB_BLOCKIO was set to y in compat-wireless but the in kernel ssb system had it set to n, this causes an invalid pointer. b43 now needs CONFIG_SSB_BLOCKIO=y SVN-Revision: 21449
This commit is contained in:
parent
01d8285e47
commit
cfec944f42
@ -773,9 +773,7 @@ endef
|
||||
BUILDFLAGS:= \
|
||||
-I$(PKG_BUILD_DIR)/include \
|
||||
$(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_SSB_PCIHOST_POSSIBLE -DCONFIG_SSB_PCIHOST) \
|
||||
$(if $(CONFIG_PCI),-DCONFIG_SSB_SPROM) \
|
||||
$(if $(CONFIG_PCI),-DCONFIG_B43_PCI_AUTOSELECT -DCONFIG_B43_PCICORE_AUTOSELECT) \
|
||||
$(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS -DCONFIG_B43_LEDS -DCONFIG_B43LEGACY_LEDS -DCONFIG_AR9170_LEDS) \
|
||||
-DCONFIG_B43_HWRNG -DCONFIG_B43LEGACY_HWRNG \
|
||||
$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),-DCONFIG_MAC80211_DEBUGFS -DCONFIG_ATH9K_DEBUGFS) \
|
||||
@ -808,10 +806,6 @@ MAKE_OPTS:= \
|
||||
CONFIG_B43_PCMCIA=n CONFIG_B43_PIO=n \
|
||||
CONFIG_B43_PCI_AUTOSELECT=$(if $(CONFIG_PCI),y) \
|
||||
CONFIG_B43_PCICORE_AUTOSELECT=$(if $(CONFIG_PCI),y) \
|
||||
CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=$(if $(CONFIG_PCI),y) \
|
||||
CONFIG_SSB_DRIVER_PCICORE=$(if $(CONFIG_PCI),y) \
|
||||
CONFIG_SSB_PCIHOST_POSSIBLE=$(if $(CONFIG_PCI),y) \
|
||||
CONFIG_SSB_PCIHOST=$(if $(CONFIG_PCI),y) \
|
||||
CONFIG_B43LEGACY_LEDS=$(CONFIG_LEDS_TRIGGERS) \
|
||||
CONFIG_B43_LEDS=$(CONFIG_LEDS_TRIGGERS) \
|
||||
CONFIG_B43_HWRNG=$(if $(CONFIG_HW_RANDOM),y) \
|
||||
|
@ -9,3 +9,43 @@
|
||||
endif
|
||||
|
||||
obj-$(CONFIG_COMPAT_BLUETOOTH) += net/bluetooth/
|
||||
--- a/config.mk
|
||||
+++ b/config.mk
|
||||
@@ -9,7 +9,6 @@ ifeq ($(wildcard $(KLIB_BUILD)/.config),
|
||||
CONFIG_PCI=y
|
||||
CONFIG_USB=y
|
||||
CONFIG_PCMCIA=y
|
||||
- CONFIG_SSB=m
|
||||
else
|
||||
include $(KLIB_BUILD)/.config
|
||||
endif
|
||||
@@ -239,21 +238,6 @@ CONFIG_IPW2200_QOS=y
|
||||
#
|
||||
# % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface
|
||||
|
||||
-ifneq ($(CONFIG_SSB),)
|
||||
-# Sonics Silicon Backplane
|
||||
-CONFIG_SSB_SPROM=y
|
||||
-# CONFIG_SSB_DEBUG=y
|
||||
-
|
||||
-CONFIG_SSB_BLOCKIO=y
|
||||
-CONFIG_SSB_PCIHOST=y
|
||||
-CONFIG_SSB_B43_PCI_BRIDGE=y
|
||||
-ifneq ($(CONFIG_PCMCIA),)
|
||||
-CONFIG_SSB_PCMCIAHOST=y
|
||||
-endif
|
||||
-# CONFIG_SSB_DEBUG=y
|
||||
-CONFIG_SSB_DRIVER_PCICORE=y
|
||||
-endif
|
||||
-
|
||||
CONFIG_P54_PCI=m
|
||||
|
||||
# CONFIG_B44=m
|
||||
@@ -411,7 +395,6 @@ endif # end of SPI driver list
|
||||
|
||||
ifneq ($(CONFIG_MMC),)
|
||||
|
||||
-CONFIG_SSB_SDIOHOST=y
|
||||
CONFIG_B43_SDIO=y
|
||||
CONFIG_WL1251_SDIO=m
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/config.mk
|
||||
+++ b/config.mk
|
||||
@@ -286,10 +286,10 @@ endif
|
||||
@@ -270,10 +270,10 @@ endif
|
||||
CONFIG_MWL8K=m
|
||||
|
||||
# Ethernet drivers go here
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
CONFIG_HERMES=m
|
||||
CONFIG_HERMES_CACHE_FW_ON_INIT=y
|
||||
@@ -342,10 +342,10 @@ CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
|
||||
@@ -326,10 +326,10 @@ CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
|
||||
CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n
|
||||
CONFIG_USB_NET_COMPAT_CDCETHER=n
|
||||
else
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/config.mk
|
||||
+++ b/config.mk
|
||||
@@ -43,21 +43,6 @@ $(error "ERROR: Your 2.6.27 kernel has C
|
||||
@@ -42,21 +42,6 @@ $(error "ERROR: Your 2.6.27 kernel has C
|
||||
endif
|
||||
endif
|
||||
|
||||
|
@ -6,10 +6,10 @@
|
||||
CONFIG_USB=y
|
||||
- CONFIG_PCMCIA=y
|
||||
+# CONFIG_PCMCIA=y
|
||||
CONFIG_SSB=m
|
||||
else
|
||||
include $(KLIB_BUILD)/.config
|
||||
@@ -181,7 +181,7 @@ CONFIG_B43=m
|
||||
endif
|
||||
@@ -180,7 +180,7 @@ CONFIG_B43=m
|
||||
CONFIG_B43_HWRNG=y
|
||||
CONFIG_B43_PCI_AUTOSELECT=y
|
||||
ifneq ($(CONFIG_PCMCIA),)
|
||||
@ -18,12 +18,3 @@
|
||||
endif
|
||||
CONFIG_B43_LEDS=y
|
||||
CONFIG_B43_PHY_LP=y
|
||||
@@ -233,7 +233,7 @@ CONFIG_SSB_BLOCKIO=y
|
||||
CONFIG_SSB_PCIHOST=y
|
||||
CONFIG_SSB_B43_PCI_BRIDGE=y
|
||||
ifneq ($(CONFIG_PCMCIA),)
|
||||
-CONFIG_SSB_PCMCIAHOST=y
|
||||
+# CONFIG_SSB_PCMCIAHOST=y
|
||||
endif
|
||||
# CONFIG_SSB_DEBUG=y
|
||||
CONFIG_SSB_DRIVER_PCICORE=y
|
||||
|
@ -1,12 +1,10 @@
|
||||
--- a/config.mk
|
||||
+++ b/config.mk
|
||||
@@ -396,8 +396,8 @@ endif # end of SPI driver list
|
||||
@@ -380,7 +380,7 @@ endif # end of SPI driver list
|
||||
|
||||
ifneq ($(CONFIG_MMC),)
|
||||
|
||||
-CONFIG_SSB_SDIOHOST=y
|
||||
-CONFIG_B43_SDIO=y
|
||||
+# CONFIG_SSB_SDIOHOST=y
|
||||
+# CONFIG_B43_SDIO=y
|
||||
CONFIG_WL1251_SDIO=m
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/config.mk
|
||||
+++ b/config.mk
|
||||
@@ -185,7 +185,7 @@ ifneq ($(CONFIG_PCMCIA),)
|
||||
@@ -184,7 +184,7 @@ ifneq ($(CONFIG_PCMCIA),)
|
||||
endif
|
||||
CONFIG_B43_LEDS=y
|
||||
CONFIG_B43_PHY_LP=y
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/config.mk
|
||||
+++ b/config.mk
|
||||
@@ -248,12 +248,12 @@ CONFIG_RTL8180=m
|
||||
@@ -232,12 +232,12 @@ CONFIG_RTL8180=m
|
||||
|
||||
CONFIG_ADM8211=m
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
# CONFIG_RT2800PCI_RT30XX=y
|
||||
# CONFIG_RT2800PCI_RT35XX=y
|
||||
# CONFIG_RT2800PCI_SOC=y
|
||||
@@ -355,7 +355,7 @@ CONFIG_RT2800USB=m
|
||||
@@ -339,7 +339,7 @@ CONFIG_RT2800USB=m
|
||||
# CONFIG_RT2800USB_RT35XX=y
|
||||
# CONFIG_RT2800USB_UNKNOWN=y
|
||||
endif
|
||||
|
@ -2167,7 +2167,6 @@ CONFIG_SQUASHFS_LZMA=y
|
||||
CONFIG_SQUASHFS_SUPPORT_ZLIB=y
|
||||
# CONFIG_SQUASHFS_VMALLOC is not set
|
||||
CONFIG_SQUASHFS=y
|
||||
# CONFIG_SSB_BLOCKIO is not set
|
||||
# CONFIG_SSB_DEBUG is not set
|
||||
# CONFIG_SSB is not set
|
||||
# CONFIG_SSB_PCMCIAHOST is not set
|
||||
|
@ -2174,7 +2174,6 @@ CONFIG_SQUASHFS_LZMA=y
|
||||
CONFIG_SQUASHFS_SUPPORT_ZLIB=y
|
||||
# CONFIG_SQUASHFS_VMALLOC is not set
|
||||
CONFIG_SQUASHFS=y
|
||||
# CONFIG_SSB_BLOCKIO is not set
|
||||
# CONFIG_SSB_DEBUG is not set
|
||||
# CONFIG_SSB is not set
|
||||
# CONFIG_SSB_PCMCIAHOST is not set
|
||||
|
@ -2289,7 +2289,6 @@ CONFIG_SQUASHFS_LZMA=y
|
||||
CONFIG_SQUASHFS_SUPPORT_ZLIB=y
|
||||
# CONFIG_SQUASHFS_VMALLOC is not set
|
||||
CONFIG_SQUASHFS=y
|
||||
# CONFIG_SSB_BLOCKIO is not set
|
||||
# CONFIG_SSB_DEBUG is not set
|
||||
# CONFIG_SSB is not set
|
||||
# CONFIG_SSB_PCMCIAHOST is not set
|
||||
|
@ -2317,7 +2317,6 @@ CONFIG_SQUASHFS_LZMA=y
|
||||
CONFIG_SQUASHFS_SUPPORT_ZLIB=y
|
||||
# CONFIG_SQUASHFS_VMALLOC is not set
|
||||
CONFIG_SQUASHFS=y
|
||||
# CONFIG_SSB_BLOCKIO is not set
|
||||
# CONFIG_SSB_DEBUG is not set
|
||||
# CONFIG_SSB is not set
|
||||
# CONFIG_SSB_PCMCIAHOST is not set
|
||||
|
@ -2373,7 +2373,6 @@ CONFIG_SQUASHFS_LZMA=y
|
||||
CONFIG_SQUASHFS_SUPPORT_ZLIB=y
|
||||
# CONFIG_SQUASHFS_VMALLOC is not set
|
||||
CONFIG_SQUASHFS=y
|
||||
# CONFIG_SSB_BLOCKIO is not set
|
||||
# CONFIG_SSB_DEBUG is not set
|
||||
# CONFIG_SSB is not set
|
||||
# CONFIG_SSB_PCMCIAHOST is not set
|
||||
|
@ -1,6 +1,14 @@
|
||||
--- a/drivers/ssb/Kconfig
|
||||
+++ b/drivers/ssb/Kconfig
|
||||
@@ -49,7 +49,7 @@ config SSB_PCIHOST
|
||||
@@ -29,6 +29,7 @@ config SSB_SPROM
|
||||
config SSB_BLOCKIO
|
||||
bool
|
||||
depends on SSB
|
||||
+ default y
|
||||
|
||||
config SSB_PCIHOST_POSSIBLE
|
||||
bool
|
||||
@@ -49,7 +50,7 @@ config SSB_PCIHOST
|
||||
config SSB_B43_PCI_BRIDGE
|
||||
bool
|
||||
depends on SSB_PCIHOST
|
||||
|
@ -1,6 +1,14 @@
|
||||
--- a/drivers/ssb/Kconfig
|
||||
+++ b/drivers/ssb/Kconfig
|
||||
@@ -49,7 +49,7 @@ config SSB_PCIHOST
|
||||
@@ -29,6 +29,7 @@ config SSB_SPROM
|
||||
config SSB_BLOCKIO
|
||||
bool
|
||||
depends on SSB
|
||||
+ default y
|
||||
|
||||
config SSB_PCIHOST_POSSIBLE
|
||||
bool
|
||||
@@ -49,7 +50,7 @@ config SSB_PCIHOST
|
||||
config SSB_B43_PCI_BRIDGE
|
||||
bool
|
||||
depends on SSB_PCIHOST
|
||||
|
@ -1,6 +1,14 @@
|
||||
--- a/drivers/ssb/Kconfig
|
||||
+++ b/drivers/ssb/Kconfig
|
||||
@@ -49,7 +49,7 @@ config SSB_PCIHOST
|
||||
@@ -29,6 +29,7 @@ config SSB_SPROM
|
||||
config SSB_BLOCKIO
|
||||
bool
|
||||
depends on SSB
|
||||
+ default y
|
||||
|
||||
config SSB_PCIHOST_POSSIBLE
|
||||
bool
|
||||
@@ -49,7 +50,7 @@ config SSB_PCIHOST
|
||||
config SSB_B43_PCI_BRIDGE
|
||||
bool
|
||||
depends on SSB_PCIHOST
|
||||
|
@ -1,6 +1,14 @@
|
||||
--- a/drivers/ssb/Kconfig
|
||||
+++ b/drivers/ssb/Kconfig
|
||||
@@ -49,7 +49,7 @@ config SSB_PCIHOST
|
||||
@@ -29,6 +29,7 @@ config SSB_SPROM
|
||||
config SSB_BLOCKIO
|
||||
bool
|
||||
depends on SSB
|
||||
+ default y
|
||||
|
||||
config SSB_PCIHOST_POSSIBLE
|
||||
bool
|
||||
@@ -49,7 +50,7 @@ config SSB_PCIHOST
|
||||
config SSB_B43_PCI_BRIDGE
|
||||
bool
|
||||
depends on SSB_PCIHOST
|
||||
|
@ -1,6 +1,14 @@
|
||||
--- a/drivers/ssb/Kconfig
|
||||
+++ b/drivers/ssb/Kconfig
|
||||
@@ -49,7 +49,7 @@ config SSB_PCIHOST
|
||||
@@ -29,6 +29,7 @@ config SSB_SPROM
|
||||
config SSB_BLOCKIO
|
||||
bool
|
||||
depends on SSB
|
||||
+ default y
|
||||
|
||||
config SSB_PCIHOST_POSSIBLE
|
||||
bool
|
||||
@@ -49,7 +50,7 @@ config SSB_PCIHOST
|
||||
config SSB_B43_PCI_BRIDGE
|
||||
bool
|
||||
depends on SSB_PCIHOST
|
||||
|
Loading…
Reference in New Issue
Block a user