Changeset 47467


Ignore:
Timestamp:
2015-11-14T00:51:31+01:00 (2 years ago)
Author:
hauke
Message:

kernel: take bcm47xx_nvram.h from kernel and not backports

compat-wireless/backports now contains a bcm47xx_nvram.h file to
backport some of the functions in it which are used by the bcmfmac
driver. This file just checks for the kernel versions and provide an
empty implementations on older kernel versions. This is OK on most
systems, but on bcm47xx / bcm53xx systems we want to call the real
functions here. This commit removes the file from backports in our
build process like we do it with the bcma and ssb header files. Instead
we add a recent version into our kernel so all code uses only one
header file. On bcm47xx / bcm53xx the real implementations of this code
will be used.

Reported-by: Hante Meuleman <meuleman@…>
Signed-off-by: Hauke Mehrtens <hauke@…>

Location:
trunk
Files:
2 added
1 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/kernel/mac80211/Makefile

    r47294 r47467  
    17831783                $(PKG_BUILD_DIR)/include/linux/wl12xx.h \ 
    17841784                $(PKG_BUILD_DIR)/include/linux/spi/libertas_spi.h \ 
    1785                 $(PKG_BUILD_DIR)/include/net/ieee80211.h 
     1785                $(PKG_BUILD_DIR)/include/net/ieee80211.h \ 
     1786                $(PKG_BUILD_DIR)/backport-include/linux/bcm47xx_nvram.h 
    17861787 
    17871788        echo 'compat-wireless-$(PKG_VERSION)-$(PKG_RELEASE)-$(REVISION)' > $(PKG_BUILD_DIR)/compat_version 
  • trunk/target/linux/bcm53xx/patches-4.1/132-ARM-BCM5301X-Add-missing-Netgear-R8000-LEDs.patch

    r47282 r47467  
    1212 1 file changed, 30 insertions(+) 
    1313 
    14 diff --git a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts 
    15 index 446c586..b52927c 100644 
    1614--- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts 
    1715+++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts 
     
    5351  
    5452        gpio-keys { 
    55 --  
    56 1.8.4.5 
    57  
  • trunk/target/linux/bcm53xx/patches-4.1/186-USB-bcma-switch-to-GPIO-descriptor-for-power-control.patch

    r47336 r47467  
    1818 1 file changed, 10 insertions(+), 11 deletions(-) 
    1919 
    20 diff --git a/drivers/usb/host/bcma-hcd.c b/drivers/usb/host/bcma-hcd.c 
    21 index 5398e3d..291aaa2 100644 
    2220--- a/drivers/usb/host/bcma-hcd.c 
    2321+++ b/drivers/usb/host/bcma-hcd.c 
     
    3836  
    3937 /* Wait for bitmask in a register to get set or cleared. 
    40 @@ -228,19 +230,12 @@ static void bcma_hcd_init_chip_arm(struct bcma_device *dev) 
     38@@ -228,19 +230,12 @@ static void bcma_hcd_init_chip_arm(struc 
    4139  
    4240 static void bcma_hci_platform_power_gpio(struct bcma_device *dev, bool val) 
     
    6159  
    6260 static const struct usb_ehci_pdata ehci_pdata = { 
    63 @@ -314,7 +309,11 @@ static int bcma_hcd_probe(struct bcma_device *dev) 
     61@@ -314,7 +309,11 @@ static int bcma_hcd_probe(struct bcma_de 
    6462        if (!usb_dev) 
    6563                return -ENOMEM; 
  • trunk/target/linux/brcm47xx/patches-4.1/031-08-mips-bcm47xx-allow-retrieval-of-complete-nvram-conte.patch

    r46063 r47467  
    122122--- a/include/linux/bcm47xx_nvram.h 
    123123+++ b/include/linux/bcm47xx_nvram.h 
    124 @@ -10,11 +10,17 @@ 
     124@@ -12,7 +12,7 @@ 
     125 #include <linux/kernel.h> 
     126 #include <linux/vmalloc.h> 
    125127  
    126  #include <linux/types.h> 
    127  #include <linux/kernel.h> 
    128 +#include <linux/vmalloc.h> 
    129   
    130  #ifdef CONFIG_BCM47XX 
     128-#ifdef CONFIG_BCM47XX_NVRAM 
     129+#ifdef CONFIG_BCM47XX 
    131130 int bcm47xx_nvram_init_from_mem(u32 base, u32 lim); 
    132131 int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len); 
    133132 int bcm47xx_nvram_gpio_pin(const char *name); 
    134 +char *bcm47xx_nvram_get_contents(size_t *val_len); 
    135 +static inline void bcm47xx_nvram_release_contents(char *nvram) 
    136 +{ 
    137 +       vfree(nvram); 
    138 +}; 
    139  #else 
    140  static inline int bcm47xx_nvram_init_from_mem(u32 base, u32 lim) 
    141  { 
    142 @@ -29,6 +35,15 @@ static inline int bcm47xx_nvram_gpio_pin 
    143  { 
    144         return -ENOTSUPP; 
    145  }; 
    146 + 
    147 +static inline char *bcm47xx_nvram_get_contents(size_t *val_len) 
    148 +{ 
    149 +       return NULL; 
    150 +}; 
    151 + 
    152 +static inline void bcm47xx_nvram_release_contents(char *nvram) 
    153 +{ 
    154 +}; 
    155  #endif 
    156   
    157  #endif /* __BCM47XX_NVRAM_H */ 
  • trunk/target/linux/generic/patches-4.1/133-MIPS-UAPI-Ignore-__arch_swab-16-32-64-when-using-MIP.patch

    r47322 r47467  
    3131 1 file changed, 4 insertions(+), 3 deletions(-) 
    3232 
    33 diff --git a/arch/mips/include/uapi/asm/swab.h b/arch/mips/include/uapi/asm/swab.h 
    34 index 8f2d184..23cd9b1 100644 
    3533--- a/arch/mips/include/uapi/asm/swab.h 
    3634+++ b/arch/mips/include/uapi/asm/swab.h 
     
    4745 static inline __attribute_const__ __u16 __arch_swab16(__u16 x) 
    4846 { 
    49 @@ -65,5 +66,5 @@ static inline __attribute_const__ __u64 __arch_swab64(__u64 x) 
     47@@ -65,5 +66,5 @@ static inline __attribute_const__ __u64 
    5048 } 
    5149 #define __arch_swab64 __arch_swab64 
     
    5452+#endif /* (not __mips16) and (MIPS R2 or newer or Loongson 3A) */ 
    5553 #endif /* _ASM_SWAB_H */ 
    56 --  
    57 1.7.10.4 
    58  
  • trunk/target/linux/generic/patches-4.1/222-perf-build-Do-not-fail-on-missing-Build-file.patch

    r47338 r47467  
    3030 create mode 100644 tools/build/tests/ex/empty2/README 
    3131 
    32 diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build 
    33 index 10df572..69c35cf 100644 
    3432--- a/tools/build/Makefile.build 
    3533+++ b/tools/build/Makefile.build 
     
    4341 quiet_cmd_flex  = FLEX     $@ 
    4442 quiet_cmd_bison = BISON    $@ 
    45 diff --git a/tools/build/tests/ex/Build b/tools/build/tests/ex/Build 
    46 index 0e6c3e6..70d8762 100644 
    4743--- a/tools/build/tests/ex/Build 
    4844+++ b/tools/build/tests/ex/Build 
     
    5551 libex-y += c.o 
    5652 libex-y += d.o 
    57 diff --git a/tools/build/tests/ex/empty2/README b/tools/build/tests/ex/empty2/README 
    58 new file mode 100644 
    59 index 0000000..2107cc5 
    6053--- /dev/null 
    6154+++ b/tools/build/tests/ex/empty2/README 
     
    6356+This directory is left intentionally without Build file 
    6457+to test proper nesting into Build-less directories. 
    65 --  
    66 2.1.4 
    67  
Note: See TracChangeset for help on using the changeset viewer.