diff options
| author | John Crispin <john@openwrt.org> | 2013-06-21 16:54:37 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2013-06-21 16:54:37 +0000 |
| commit | 4ebf19b48fafc8d94e14e4ba779969613b241a6a (patch) | |
| tree | 9918f890a8915023b49ea30948beb5d048c333fa /package/kernel/broadcom-wl/patches/910-fallback-sprom.patch | |
| parent | 44b1688e6c7b4f16f7165fbd560e1183aef69090 (diff) | |
| download | upstream-4ebf19b48fafc8d94e14e4ba779969613b241a6a.tar.gz upstream-4ebf19b48fafc8d94e14e4ba779969613b241a6a.tar.bz2 upstream-4ebf19b48fafc8d94e14e4ba779969613b241a6a.zip | |
packages: clean up the package folder
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 37007
Diffstat (limited to 'package/kernel/broadcom-wl/patches/910-fallback-sprom.patch')
| -rw-r--r-- | package/kernel/broadcom-wl/patches/910-fallback-sprom.patch | 84 |
1 files changed, 84 insertions, 0 deletions
diff --git a/package/kernel/broadcom-wl/patches/910-fallback-sprom.patch b/package/kernel/broadcom-wl/patches/910-fallback-sprom.patch new file mode 100644 index 0000000000..749ecbf31f --- /dev/null +++ b/package/kernel/broadcom-wl/patches/910-fallback-sprom.patch @@ -0,0 +1,84 @@ +--- a/driver/bcmsrom.c ++++ b/driver/bcmsrom.c +@@ -39,6 +39,11 @@ + #include <sbsdpcmdev.h> + #endif + ++#if defined(CONFIG_SSB_PCIHOST) && defined(CONFIG_BOARD_BCM963XX) ++#include <linux/ssb/ssb.h> ++extern struct ssb_sprom bcm63xx_sprom; ++#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 + goto varscont; + } + ++#if defined(CONFIG_SSB_PCIHOST) && defined(CONFIG_BOARD_BCM963XX) ++ base = vp = MALLOC(osh, MAXSZ_NVRAM_VARS); ++ ++ if( base != NULL ) ++ { ++ 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); ++ ++ /* ToDo: map bcm63xx_sprom.country_code */ ++ varbuf_append(&b, vstr_noccode); ++ ++ varbuf_append(&b, vstr_aa2g, bcm63xx_sprom.ant_available_bg); ++ ++ varbuf_append(&b, vstr_pa0b[0], bcm63xx_sprom.pa0b0); ++ varbuf_append(&b, vstr_pa1b[0], bcm63xx_sprom.pa1b0); ++ varbuf_append(&b, vstr_pa0b[1], bcm63xx_sprom.pa0b1); ++ varbuf_append(&b, vstr_pa1b[1], bcm63xx_sprom.pa1b1); ++ varbuf_append(&b, vstr_pa0b[2], bcm63xx_sprom.pa0b2); ++ varbuf_append(&b, vstr_pa1b[2], bcm63xx_sprom.pa1b2); ++ ++ varbuf_append(&b, vstr_pa0maxpwr, bcm63xx_sprom.maxpwr_bg); ++ varbuf_append(&b, vstr_pa0itssit, bcm63xx_sprom.itssi_bg); ++ ++ varbuf_append(&b, vstr_boardflags, (bcm63xx_sprom.boardflags_hi << 16) | bcm63xx_sprom.boardflags_lo); ++ varbuf_append(&b, vstr_boardflags2, (bcm63xx_sprom.boardflags2_hi << 16) | bcm63xx_sprom.boardflags2_lo); ++ ++ snprintf(eabuf, sizeof(eabuf), "%02x:%02x:%02x:%02x:%02x:%02x", ++ bcm63xx_sprom.il0mac[0], bcm63xx_sprom.il0mac[1], bcm63xx_sprom.il0mac[2], ++ bcm63xx_sprom.il0mac[3], bcm63xx_sprom.il0mac[4], bcm63xx_sprom.il0mac[5] ++ ); ++ ++ varbuf_append(&b, vstr_macaddr, eabuf); ++ ++ /* final nullbyte terminator */ ++ ASSERT(b.size >= 1); ++ vp = b.buf; ++ *vp++ = '\0'; ++ ++ ASSERT((vp - base) <= MAXSZ_NVRAM_VARS); ++ goto varsdone; ++ } ++ else ++ { ++ err = -2; ++ goto errout; ++ } ++#endif ++ + BS_ERROR(("SROM CRC Error\n")); + + #if defined(WLTEST) |