Author: jogo Date: 2014-10-02 14:24:05 +0200 (Thu, 02 Oct 2014) New Revision: 42725
Modified: trunk/package/kernel/broadcom-wl/patches/910-fallback-sprom.patch Log: brcm-wl: use new brcm63xx fallback sprom This fixes brcm63xx fallback sprom extraction. Signed-off-by: ?\195?\129lvaro Fern?\195?\161ndez Rojas <[email protected]> Signed-off-by: Jonas Gorski <[email protected]> Modified: trunk/package/kernel/broadcom-wl/patches/910-fallback-sprom.patch =================================================================== --- trunk/package/kernel/broadcom-wl/patches/910-fallback-sprom.patch 2014-10-02 12:19:37 UTC (rev 42724) +++ trunk/package/kernel/broadcom-wl/patches/910-fallback-sprom.patch 2014-10-02 12:24:05 UTC (rev 42725) @@ -6,24 +6,13 @@ +#if defined(CONFIG_SSB_PCIHOST) && defined(CONFIG_BOARD_BCM963XX) +#include <linux/ssb/ssb.h> -+extern struct ssb_sprom bcm63xx_sprom; ++extern int bcm63xx_get_fallback_sprom(uint pci_bus, uint pci_slot, struct ssb_sprom *out); +#endif + #ifdef WLTEST #include <sbsprom.h> #endif /* WLTEST */ -@@ -2058,6 +2063,10 @@ BCMATTACHFN(initvars_srom_pci)(si_t *sih - bool flash = FALSE; - int err = 0; - -+#if defined(CONFIG_SSB_PCIHOST) && defined(CONFIG_BOARD_BCM963XX) -+ char eabuf[18]; -+#endif -+ - /* - * Apply CRC over SROM content regardless SROM is present or not, - * and use variable <devpath>sromrev's existance in flash to decide -@@ -2120,6 +2129,58 @@ BCMATTACHFN(initvars_srom_pci)(si_t *sih +@@ -2120,6 +2125,63 @@ BCMATTACHFN(initvars_srom_pci)(si_t *sih goto varscont; } @@ -32,10 +21,15 @@ + + if( base != NULL ) + { ++ char eabuf[18]; ++ struct ssb_sprom bcm63xx_sprom; ++ uint pci_bus = osl_pci_bus(osh), pci_slot = osl_pci_slot(osh); ++ ++ bcm63xx_get_fallback_sprom(pci_bus, pci_slot, &bcm63xx_sprom); ++ printk("BCM%X(%02x:%02x) using sprom version %i\n", sih->chip, pci_bus, pci_slot, bcm63xx_sprom.revision); ++ + varbuf_init(&b, base, MAXSZ_NVRAM_VARS); + -+ printk("Got version %i SPROM from SSB\n", bcm63xx_sprom.revision); -+ + varbuf_append(&b, vstr_sromrev, bcm63xx_sprom.revision); + varbuf_append(&b, vstr_boardrev, bcm63xx_sprom.board_rev); + _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
