Changeset 21558


Ignore:
Timestamp:
2010-05-24T00:57:36+02:00 (7 years ago)
Author:
hauke
Message:

[backfire] backport r21449

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

Location:
branches/backfire
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • branches/backfire/package/mac80211/Makefile

    r21354 r21558  
    1212 
    1313PKG_VERSION:=2010-04-28 
    14 PKG_RELEASE:=1 
     14PKG_RELEASE:=2 
    1515PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources 
    1616#       http://www.orbit-lab.org/kernel/compat-wireless-2.6/2010/11 \ 
     
    774774        -I$(PKG_BUILD_DIR)/include \ 
    775775        $(foreach opt,$(CONFOPTS),-DCONFIG_$(opt)) \ 
    776         $(if $(CONFIG_PCI),-DCONFIG_B43_PCI_AUTOSELECT -DCONFIG_B43_PCICORE_AUTOSELECT -DCONFIG_SSB_DRIVER_PCICORE_POSSIBLE -DCONFIG_SSB_DRIVER_PCICORE) \ 
    777         $(if $(CONFIG_PCI),-DCONFIG_SSB_PCIHOST_POSSIBLE -DCONFIG_SSB_PCIHOST) \ 
    778         $(if $(CONFIG_PCI),-DCONFIG_SSB_SPROM) \ 
     776        $(if $(CONFIG_PCI),-DCONFIG_B43_PCI_AUTOSELECT -DCONFIG_B43_PCICORE_AUTOSELECT) \ 
    779777        $(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS -DCONFIG_B43_LEDS -DCONFIG_B43LEGACY_LEDS -DCONFIG_AR9170_LEDS) \ 
    780778        -DCONFIG_B43_HWRNG -DCONFIG_B43LEGACY_HWRNG \ 
     
    809807        CONFIG_B43_PCI_AUTOSELECT=$(if $(CONFIG_PCI),y) \ 
    810808        CONFIG_B43_PCICORE_AUTOSELECT=$(if $(CONFIG_PCI),y) \ 
    811         CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=$(if $(CONFIG_PCI),y) \ 
    812         CONFIG_SSB_DRIVER_PCICORE=$(if $(CONFIG_PCI),y) \ 
    813         CONFIG_SSB_PCIHOST_POSSIBLE=$(if $(CONFIG_PCI),y) \ 
    814         CONFIG_SSB_PCIHOST=$(if $(CONFIG_PCI),y) \ 
    815809        CONFIG_B43LEGACY_LEDS=$(CONFIG_LEDS_TRIGGERS) \ 
    816810        CONFIG_B43_LEDS=$(CONFIG_LEDS_TRIGGERS) \ 
  • branches/backfire/package/mac80211/patches/005-disable_ssb_build.patch

    r19063 r21558  
    1010  
    1111 obj-$(CONFIG_COMPAT_BLUETOOTH) += net/bluetooth/ 
     12--- a/config.mk 
     13+++ b/config.mk 
     14@@ -9,7 +9,6 @@ ifeq ($(wildcard $(KLIB_BUILD)/.config), 
     15  CONFIG_PCI=y 
     16  CONFIG_USB=y 
     17  CONFIG_PCMCIA=y 
     18- CONFIG_SSB=m 
     19 else 
     20 include $(KLIB_BUILD)/.config 
     21 endif 
     22@@ -239,21 +238,6 @@ CONFIG_IPW2200_QOS=y 
     23 # 
     24 # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface 
     25  
     26-ifneq ($(CONFIG_SSB),) 
     27-# Sonics Silicon Backplane 
     28-CONFIG_SSB_SPROM=y 
     29-# CONFIG_SSB_DEBUG=y 
     30- 
     31-CONFIG_SSB_BLOCKIO=y 
     32-CONFIG_SSB_PCIHOST=y 
     33-CONFIG_SSB_B43_PCI_BRIDGE=y 
     34-ifneq ($(CONFIG_PCMCIA),) 
     35-CONFIG_SSB_PCMCIAHOST=y 
     36-endif 
     37-# CONFIG_SSB_DEBUG=y 
     38-CONFIG_SSB_DRIVER_PCICORE=y 
     39-endif 
     40- 
     41 CONFIG_P54_PCI=m 
     42  
     43 # CONFIG_B44=m 
     44@@ -411,7 +395,6 @@ endif # end of SPI driver list 
     45  
     46 ifneq ($(CONFIG_MMC),) 
     47  
     48-CONFIG_SSB_SDIOHOST=y 
     49 CONFIG_B43_SDIO=y 
     50 CONFIG_WL1251_SDIO=m 
     51  
  • branches/backfire/package/mac80211/patches/007-remove_misc_drivers.patch

    r21354 r21558  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -286,10 +286,10 @@ endif 
     3@@ -270,10 +270,10 @@ endif 
    44 CONFIG_MWL8K=m 
    55  
     
    1616 CONFIG_HERMES=m 
    1717 CONFIG_HERMES_CACHE_FW_ON_INIT=y 
    18 @@ -342,10 +342,10 @@ CONFIG_USB_NET_COMPAT_RNDIS_HOST=n 
     18@@ -326,10 +326,10 @@ CONFIG_USB_NET_COMPAT_RNDIS_HOST=n 
    1919 CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n 
    2020 CONFIG_USB_NET_COMPAT_CDCETHER=n 
  • branches/backfire/package/mac80211/patches/009-remove_mac80211_module_dependence.patch

    r19688 r21558  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -43,21 +43,6 @@ $(error "ERROR: Your 2.6.27 kernel has C 
     3@@ -42,21 +42,6 @@ $(error "ERROR: Your 2.6.27 kernel has C 
    44 endif 
    55 endif 
  • branches/backfire/package/mac80211/patches/010-no_pcmcia.patch

    r21354 r21558  
    77- CONFIG_PCMCIA=y 
    88+# CONFIG_PCMCIA=y 
    9   CONFIG_SSB=m 
    109 else 
    1110 include $(KLIB_BUILD)/.config 
    12 @@ -181,7 +181,7 @@ CONFIG_B43=m 
     11 endif 
     12@@ -180,7 +180,7 @@ CONFIG_B43=m 
    1313 CONFIG_B43_HWRNG=y 
    1414 CONFIG_B43_PCI_AUTOSELECT=y 
     
    1919 CONFIG_B43_LEDS=y 
    2020 CONFIG_B43_PHY_LP=y 
    21 @@ -233,7 +233,7 @@ CONFIG_SSB_BLOCKIO=y 
    22  CONFIG_SSB_PCIHOST=y 
    23  CONFIG_SSB_B43_PCI_BRIDGE=y 
    24  ifneq ($(CONFIG_PCMCIA),) 
    25 -CONFIG_SSB_PCMCIAHOST=y 
    26 +# CONFIG_SSB_PCMCIAHOST=y 
    27  endif 
    28  # CONFIG_SSB_DEBUG=y 
    29  CONFIG_SSB_DRIVER_PCICORE=y 
  • branches/backfire/package/mac80211/patches/011-no_sdio.patch

    r21354 r21558  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -396,8 +396,8 @@ endif # end of SPI driver list 
     3@@ -380,7 +380,7 @@ endif # end of SPI driver list 
    44  
    55 ifneq ($(CONFIG_MMC),) 
    66  
    7 -CONFIG_SSB_SDIOHOST=y 
    87-CONFIG_B43_SDIO=y 
    9 +# CONFIG_SSB_SDIOHOST=y 
    108+# CONFIG_B43_SDIO=y 
    119 CONFIG_WL1251_SDIO=m 
  • branches/backfire/package/mac80211/patches/013-disable_b43_nphy.patch

    r21354 r21558  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -185,7 +185,7 @@ ifneq ($(CONFIG_PCMCIA),) 
     3@@ -184,7 +184,7 @@ ifneq ($(CONFIG_PCMCIA),) 
    44 endif 
    55 CONFIG_B43_LEDS=y 
  • branches/backfire/package/mac80211/patches/015-remove-rt2x00-options.patch

    r21354 r21558  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -248,12 +248,12 @@ CONFIG_RTL8180=m 
     3@@ -232,12 +232,12 @@ CONFIG_RTL8180=m 
    44  
    55 CONFIG_ADM8211=m 
     
    1616 # CONFIG_RT2800PCI_RT35XX=y 
    1717 # CONFIG_RT2800PCI_SOC=y 
    18 @@ -355,7 +355,7 @@ CONFIG_RT2800USB=m 
     18@@ -339,7 +339,7 @@ CONFIG_RT2800USB=m 
    1919 # CONFIG_RT2800USB_RT35XX=y 
    2020 # CONFIG_RT2800USB_UNKNOWN=y 
  • branches/backfire/target/linux/generic-2.6/config-2.6.30

    r20426 r21558  
    21652165# CONFIG_SQUASHFS_VMALLOC is not set 
    21662166CONFIG_SQUASHFS=y 
    2167 # CONFIG_SSB_BLOCKIO is not set 
    21682167# CONFIG_SSB_DEBUG is not set 
    21692168# CONFIG_SSB is not set 
  • branches/backfire/target/linux/generic-2.6/config-2.6.32

    r20648 r21558  
    22842284# CONFIG_SQUASHFS_VMALLOC is not set 
    22852285CONFIG_SQUASHFS=y 
    2286 # CONFIG_SSB_BLOCKIO is not set 
    22872286# CONFIG_SSB_DEBUG is not set 
    22882287# CONFIG_SSB is not set 
  • branches/backfire/target/linux/generic-2.6/patches-2.6.30/974-ssb_b43_default_on.patch

    r15251 r21558  
    11--- a/drivers/ssb/Kconfig 
    22+++ b/drivers/ssb/Kconfig 
    3 @@ -49,7 +49,7 @@ config SSB_PCIHOST 
     3@@ -29,6 +29,7 @@ config SSB_SPROM 
     4 config SSB_BLOCKIO 
     5        bool 
     6        depends on SSB 
     7+       default y 
     8  
     9 config SSB_PCIHOST_POSSIBLE 
     10        bool 
     11@@ -49,7 +50,7 @@ config SSB_PCIHOST 
    412 config SSB_B43_PCI_BRIDGE 
    513        bool 
  • branches/backfire/target/linux/generic-2.6/patches-2.6.32/974-ssb_b43_default_on.patch

    r17351 r21558  
    11--- a/drivers/ssb/Kconfig 
    22+++ b/drivers/ssb/Kconfig 
    3 @@ -49,7 +49,7 @@ config SSB_PCIHOST 
     3@@ -29,6 +29,7 @@ config SSB_SPROM 
     4 config SSB_BLOCKIO 
     5        bool 
     6        depends on SSB 
     7+       default y 
     8  
     9 config SSB_PCIHOST_POSSIBLE 
     10        bool 
     11@@ -49,7 +50,7 @@ config SSB_PCIHOST 
    412 config SSB_B43_PCI_BRIDGE 
    513        bool 
Note: See TracChangeset for help on using the changeset viewer.