Changeset 22388


Ignore:
Timestamp:
2010-07-25T18:10:51+02:00 (6 years ago)
Author:
hauke
Message:

brcm47xx: now hopfully realy commit the right things from r22385

Location:
trunk/target/linux/brcm47xx
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/brcm47xx/patches-2.6.34/012-MIPS-BCM47xx-Fill-values-for-b43-into-ssb-sprom.patch

    r22387 r22388  
    1 From f382c623892dad1c6a9ebc0e12d01fd45ee50db8 Mon Sep 17 00:00:00 2001 
     1From fbdfca0b2489ad94c6a3bc90b47adfd5c8179a89 Mon Sep 17 00:00:00 2001 
    22From: Hauke Mehrtens <hauke@hauke-m.de> 
    33Date: Sun, 18 Jul 2010 13:34:32 +0200 
    4 Subject: [PATCH 2/5] MIPS: BCM47xx: Fill more values into ssb sprom 
     4Subject: [PATCH 2/5] MIPS: BCM47xx: Fill values for b43 into ssb sprom 
    55 
    66Most of the values are stored in the nvram and not in the CFE. At first 
     
    1111Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> 
    1212--- 
    13  arch/mips/bcm47xx/setup.c |  130 +++++++++++++++++++++++++++++++++----------- 
    14  1 files changed, 97 insertions(+), 33 deletions(-) 
     13 arch/mips/bcm47xx/setup.c |  131 +++++++++++++++++++++++++++++++++----------- 
     14 1 files changed, 98 insertions(+), 33 deletions(-) 
    1515 
    1616--- a/arch/mips/bcm47xx/setup.c 
    1717+++ b/arch/mips/bcm47xx/setup.c 
    18 @@ -74,6 +74,94 @@ static void str2eaddr(char *str, char *d 
     18@@ -74,6 +74,95 @@ static void str2eaddr(char *str, char *d 
    1919        } 
    2020 } 
    2121  
     22+#define READ_FROM_NVRAM(_outvar, name, buf) \ 
     23+       if (nvram_getenv(name, buf, sizeof(buf)) >= 0 || \ 
     24+           cfe_getenv(name, buf, sizeof(buf)) >= 0) \ 
     25+               sprom->_outvar = simple_strtoul(buf, NULL, 0); 
     26+ 
    2227+static void bcm47xx_fill_sprom(struct ssb_sprom *sprom) 
    2328+{ 
     
    2732+       memset(sprom, 0, sizeof(struct ssb_sprom)); 
    2833+ 
    29 +       sprom->revision = 3; 
     34+       sprom->revision = 1; /* Fallback: Old hardware does not define this. */ 
     35+       READ_FROM_NVRAM(revision, "sromrev", buf); 
    3036+       if (nvram_getenv("il0macaddr", buf, sizeof(buf)) >= 0 || 
    3137+           cfe_getenv("il0macaddr", buf, sizeof(buf)) >= 0) 
     
    3743+           cfe_getenv("et1macaddr", buf, sizeof(buf)) >= 0) 
    3844+               str2eaddr(buf, sprom->et1mac); 
    39 +       if (nvram_getenv("et0phyaddr", buf, sizeof(buf)) >= 0 || 
    40 +           cfe_getenv("et0phyaddr", buf, sizeof(buf)) >= 0) 
    41 +               sprom->et0phyaddr = simple_strtoul(buf, NULL, 0); 
    42 +       if (nvram_getenv("et1phyaddr", buf, sizeof(buf)) >= 0 || 
    43 +           cfe_getenv("et1phyaddr", buf, sizeof(buf)) >= 0) 
    44 +               sprom->et1phyaddr = simple_strtoul(buf, NULL, 0); 
    45 +       if (nvram_getenv("et0mdcport", buf, sizeof(buf)) >= 0 || 
    46 +           cfe_getenv("et0mdcport", buf, sizeof(buf)) >= 0) 
    47 +               sprom->et0mdcport = !!simple_strtoul(buf, NULL, 10); 
    48 +       if (nvram_getenv("et1mdcport", buf, sizeof(buf)) >= 0 || 
    49 +           cfe_getenv("et1mdcport", buf, sizeof(buf)) >= 0) 
    50 +               sprom->et1mdcport = !!simple_strtoul(buf, NULL, 10); 
    51 +       if (nvram_getenv("pa0b0", buf, sizeof(buf)) >= 0 || 
    52 +           cfe_getenv("pa0b0", buf, sizeof(buf)) >= 0) 
    53 +               sprom->pa0b0 = simple_strtoul(buf, NULL, 0); 
    54 +       if (nvram_getenv("pa0b1", buf, sizeof(buf)) >= 0 || 
    55 +           cfe_getenv("pa0b1", buf, sizeof(buf)) >= 0) 
    56 +               sprom->pa0b1 = simple_strtoul(buf, NULL, 0); 
    57 +       if (nvram_getenv("pa0b2", buf, sizeof(buf)) >= 0 || 
    58 +           cfe_getenv("pa0b2", buf, sizeof(buf)) >= 0) 
    59 +               sprom->pa0b2 = simple_strtoul(buf, NULL, 0); 
    60 +       if (nvram_getenv("pa1b0", buf, sizeof(buf)) >= 0 || 
    61 +           cfe_getenv("pa1b0", buf, sizeof(buf)) >= 0) 
    62 +               sprom->pa1b0 = simple_strtoul(buf, NULL, 0); 
    63 +       if (nvram_getenv("pa1b1", buf, sizeof(buf)) >= 0 || 
    64 +           cfe_getenv("pa1b1", buf, sizeof(buf)) >= 0) 
    65 +               sprom->pa1b1 = simple_strtoul(buf, NULL, 0); 
    66 +       if (nvram_getenv("pa1b2", buf, sizeof(buf)) >= 0 || 
    67 +           cfe_getenv("pa1b2", buf, sizeof(buf)) >= 0) 
    68 +               sprom->pa1b2 = simple_strtoul(buf, NULL, 0); 
    69 +       if (nvram_getenv("wl0gpio0", buf, sizeof(buf)) >= 0 || 
    70 +           cfe_getenv("wl0gpio0", buf, sizeof(buf)) >= 0) 
    71 +               sprom->gpio0 = simple_strtoul(buf, NULL, 0); 
    72 +       if (nvram_getenv("wl0gpio1", buf, sizeof(buf)) >= 0 || 
    73 +           cfe_getenv("wl0gpio1", buf, sizeof(buf)) >= 0) 
    74 +               sprom->gpio1 = simple_strtoul(buf, NULL, 0); 
    75 +       if (nvram_getenv("wl0gpio2", buf, sizeof(buf)) >= 0 || 
    76 +           cfe_getenv("wl0gpio2", buf, sizeof(buf)) >= 0) 
    77 +               sprom->gpio2 = simple_strtoul(buf, NULL, 0); 
    78 +       if (nvram_getenv("wl0gpio3", buf, sizeof(buf)) >= 0 || 
    79 +           cfe_getenv("wl0gpio3", buf, sizeof(buf)) >= 0) 
    80 +               sprom->gpio3 = simple_strtoul(buf, NULL, 0); 
    81 +       if (nvram_getenv("pa0maxpwr", buf, sizeof(buf)) >= 0 || 
    82 +           cfe_getenv("pa0maxpwr", buf, sizeof(buf)) >= 0) 
    83 +               sprom->maxpwr_bg = simple_strtoul(buf, NULL, 0); 
    84 +       if (nvram_getenv("pa1maxpwr", buf, sizeof(buf)) >= 0 || 
    85 +           cfe_getenv("pa1maxpwr", buf, sizeof(buf)) >= 0) 
    86 +               sprom->maxpwr_a = simple_strtoul(buf, NULL, 0); 
    87 +       if (nvram_getenv("pa0itssit", buf, sizeof(buf)) >= 0 || 
    88 +           cfe_getenv("pa0itssit", buf, sizeof(buf)) >= 0) 
    89 +               sprom->itssi_bg = simple_strtoul(buf, NULL, 0); 
    90 +       if (nvram_getenv("pa1itssit", buf, sizeof(buf)) >= 0 || 
    91 +           cfe_getenv("pa1itssit", buf, sizeof(buf)) >= 0) 
    92 +               sprom->itssi_a = simple_strtoul(buf, NULL, 0); 
     45+       READ_FROM_NVRAM(et0phyaddr, "et0phyaddr", buf); 
     46+       READ_FROM_NVRAM(et1phyaddr, "et1phyaddr", buf); 
     47+       READ_FROM_NVRAM(et0mdcport, "et0mdcport", buf); 
     48+       READ_FROM_NVRAM(et1mdcport, "et1mdcport", buf); 
     49+       READ_FROM_NVRAM(board_rev, "boardrev", buf); 
     50+       READ_FROM_NVRAM(country_code, "ccode", buf); 
     51+       READ_FROM_NVRAM(ant_available_a, "aa5g", buf); 
     52+       READ_FROM_NVRAM(ant_available_bg, "aa2g", buf); 
     53+       READ_FROM_NVRAM(pa0b0, "pa0b0", buf); 
     54+       READ_FROM_NVRAM(pa0b1, "pa0b1", buf); 
     55+       READ_FROM_NVRAM(pa0b2, "pa0b2", buf); 
     56+       READ_FROM_NVRAM(pa1b0, "pa1b0", buf); 
     57+       READ_FROM_NVRAM(pa1b1, "pa1b1", buf); 
     58+       READ_FROM_NVRAM(pa1b2, "pa1b2", buf); 
     59+       READ_FROM_NVRAM(pa1lob0, "pa1lob0", buf); 
     60+       READ_FROM_NVRAM(pa1lob2, "pa1lob1", buf); 
     61+       READ_FROM_NVRAM(pa1lob1, "pa1lob2", buf); 
     62+       READ_FROM_NVRAM(pa1hib0, "pa1hib0", buf); 
     63+       READ_FROM_NVRAM(pa1hib2, "pa1hib1", buf); 
     64+       READ_FROM_NVRAM(pa1hib1, "pa1hib2", buf); 
     65+       READ_FROM_NVRAM(gpio0, "wl0gpio0", buf); 
     66+       READ_FROM_NVRAM(gpio1, "wl0gpio1", buf); 
     67+       READ_FROM_NVRAM(gpio2, "wl0gpio2", buf); 
     68+       READ_FROM_NVRAM(gpio3, "wl0gpio3", buf); 
     69+       READ_FROM_NVRAM(maxpwr_bg, "pa0maxpwr", buf); 
     70+       READ_FROM_NVRAM(maxpwr_al, "pa1lomaxpwr", buf); 
     71+       READ_FROM_NVRAM(maxpwr_a, "pa1maxpwr", buf); 
     72+       READ_FROM_NVRAM(maxpwr_ah, "pa1himaxpwr", buf); 
     73+       READ_FROM_NVRAM(itssi_a, "pa1itssit", buf); 
     74+       READ_FROM_NVRAM(itssi_bg, "pa0itssit", buf); 
     75+       READ_FROM_NVRAM(tri2g, "tri2g", buf); 
     76+       READ_FROM_NVRAM(tri5gl, "tri5gl", buf); 
     77+       READ_FROM_NVRAM(tri5g, "tri5g", buf); 
     78+       READ_FROM_NVRAM(tri5gh, "tri5gh", buf); 
     79+       READ_FROM_NVRAM(rxpo2g, "rxpo2g", buf); 
     80+       READ_FROM_NVRAM(rxpo5g, "rxpo5g", buf); 
     81+       READ_FROM_NVRAM(rssisav2g, "rssisav2g", buf); 
     82+       READ_FROM_NVRAM(rssismc2g, "rssismc2g", buf); 
     83+       READ_FROM_NVRAM(rssismf2g, "rssismf2g", buf); 
     84+       READ_FROM_NVRAM(bxa2g, "bxa2g", buf); 
     85+       READ_FROM_NVRAM(rssisav5g, "rssisav5g", buf); 
     86+       READ_FROM_NVRAM(rssismc5g, "rssismc5g", buf); 
     87+       READ_FROM_NVRAM(rssismf5g, "rssismf5g", buf); 
     88+       READ_FROM_NVRAM(bxa5g, "bxa5g", buf); 
     89+       READ_FROM_NVRAM(cck2gpo, "cck2gpo", buf); 
     90+       READ_FROM_NVRAM(ofdm2gpo, "ofdm2gpo", buf); 
     91+       READ_FROM_NVRAM(ofdm5glpo, "ofdm5glpo", buf); 
     92+       READ_FROM_NVRAM(ofdm5gpo, "ofdm5gpo", buf); 
     93+       READ_FROM_NVRAM(ofdm5ghpo, "ofdm5ghpo", buf); 
    9394+ 
    9495+       if (nvram_getenv("boardflags", buf, sizeof(buf)) >= 0 || 
     
    111112                                   struct ssb_init_invariants *iv) 
    112113 { 
    113 @@ -82,43 +170,19 @@ static int bcm47xx_get_invariants(struct 
     114@@ -82,43 +171,19 @@ static int bcm47xx_get_invariants(struct 
    114115        /* Fill boardinfo structure */ 
    115116        memset(&(iv->boardinfo), 0 , sizeof(struct ssb_boardinfo)); 
  • trunk/target/linux/brcm47xx/patches-2.6.35/012-MIPS-BCM47xx-Fill-values-for-b43-into-ssb-sprom.patch

    r22385 r22388  
    1 From f382c623892dad1c6a9ebc0e12d01fd45ee50db8 Mon Sep 17 00:00:00 2001 
     1From fbdfca0b2489ad94c6a3bc90b47adfd5c8179a89 Mon Sep 17 00:00:00 2001 
    22From: Hauke Mehrtens <hauke@hauke-m.de> 
    33Date: Sun, 18 Jul 2010 13:34:32 +0200 
    4 Subject: [PATCH 2/5] MIPS: BCM47xx: Fill more values into ssb sprom 
     4Subject: [PATCH 2/5] MIPS: BCM47xx: Fill values for b43 into ssb sprom 
    55 
    66Most of the values are stored in the nvram and not in the CFE. At first 
     
    1111Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> 
    1212--- 
    13  arch/mips/bcm47xx/setup.c |  130 +++++++++++++++++++++++++++++++++----------- 
    14  1 files changed, 97 insertions(+), 33 deletions(-) 
     13 arch/mips/bcm47xx/setup.c |  131 +++++++++++++++++++++++++++++++++----------- 
     14 1 files changed, 98 insertions(+), 33 deletions(-) 
    1515 
    1616--- a/arch/mips/bcm47xx/setup.c 
    1717+++ b/arch/mips/bcm47xx/setup.c 
    18 @@ -74,6 +74,94 @@ static void str2eaddr(char *str, char *d 
     18@@ -74,6 +74,95 @@ static void str2eaddr(char *str, char *d 
    1919        } 
    2020 } 
    2121  
     22+#define READ_FROM_NVRAM(_outvar, name, buf) \ 
     23+       if (nvram_getenv(name, buf, sizeof(buf)) >= 0 || \ 
     24+           cfe_getenv(name, buf, sizeof(buf)) >= 0) \ 
     25+               sprom->_outvar = simple_strtoul(buf, NULL, 0); 
     26+ 
    2227+static void bcm47xx_fill_sprom(struct ssb_sprom *sprom) 
    2328+{ 
     
    2732+       memset(sprom, 0, sizeof(struct ssb_sprom)); 
    2833+ 
    29 +       sprom->revision = 3; 
     34+       sprom->revision = 1; /* Fallback: Old hardware does not define this. */ 
     35+       READ_FROM_NVRAM(revision, "sromrev", buf); 
    3036+       if (nvram_getenv("il0macaddr", buf, sizeof(buf)) >= 0 || 
    3137+           cfe_getenv("il0macaddr", buf, sizeof(buf)) >= 0) 
     
    3743+           cfe_getenv("et1macaddr", buf, sizeof(buf)) >= 0) 
    3844+               str2eaddr(buf, sprom->et1mac); 
    39 +       if (nvram_getenv("et0phyaddr", buf, sizeof(buf)) >= 0 || 
    40 +           cfe_getenv("et0phyaddr", buf, sizeof(buf)) >= 0) 
    41 +               sprom->et0phyaddr = simple_strtoul(buf, NULL, 0); 
    42 +       if (nvram_getenv("et1phyaddr", buf, sizeof(buf)) >= 0 || 
    43 +           cfe_getenv("et1phyaddr", buf, sizeof(buf)) >= 0) 
    44 +               sprom->et1phyaddr = simple_strtoul(buf, NULL, 0); 
    45 +       if (nvram_getenv("et0mdcport", buf, sizeof(buf)) >= 0 || 
    46 +           cfe_getenv("et0mdcport", buf, sizeof(buf)) >= 0) 
    47 +               sprom->et0mdcport = !!simple_strtoul(buf, NULL, 10); 
    48 +       if (nvram_getenv("et1mdcport", buf, sizeof(buf)) >= 0 || 
    49 +           cfe_getenv("et1mdcport", buf, sizeof(buf)) >= 0) 
    50 +               sprom->et1mdcport = !!simple_strtoul(buf, NULL, 10); 
    51 +       if (nvram_getenv("pa0b0", buf, sizeof(buf)) >= 0 || 
    52 +           cfe_getenv("pa0b0", buf, sizeof(buf)) >= 0) 
    53 +               sprom->pa0b0 = simple_strtoul(buf, NULL, 0); 
    54 +       if (nvram_getenv("pa0b1", buf, sizeof(buf)) >= 0 || 
    55 +           cfe_getenv("pa0b1", buf, sizeof(buf)) >= 0) 
    56 +               sprom->pa0b1 = simple_strtoul(buf, NULL, 0); 
    57 +       if (nvram_getenv("pa0b2", buf, sizeof(buf)) >= 0 || 
    58 +           cfe_getenv("pa0b2", buf, sizeof(buf)) >= 0) 
    59 +               sprom->pa0b2 = simple_strtoul(buf, NULL, 0); 
    60 +       if (nvram_getenv("pa1b0", buf, sizeof(buf)) >= 0 || 
    61 +           cfe_getenv("pa1b0", buf, sizeof(buf)) >= 0) 
    62 +               sprom->pa1b0 = simple_strtoul(buf, NULL, 0); 
    63 +       if (nvram_getenv("pa1b1", buf, sizeof(buf)) >= 0 || 
    64 +           cfe_getenv("pa1b1", buf, sizeof(buf)) >= 0) 
    65 +               sprom->pa1b1 = simple_strtoul(buf, NULL, 0); 
    66 +       if (nvram_getenv("pa1b2", buf, sizeof(buf)) >= 0 || 
    67 +           cfe_getenv("pa1b2", buf, sizeof(buf)) >= 0) 
    68 +               sprom->pa1b2 = simple_strtoul(buf, NULL, 0); 
    69 +       if (nvram_getenv("wl0gpio0", buf, sizeof(buf)) >= 0 || 
    70 +           cfe_getenv("wl0gpio0", buf, sizeof(buf)) >= 0) 
    71 +               sprom->gpio0 = simple_strtoul(buf, NULL, 0); 
    72 +       if (nvram_getenv("wl0gpio1", buf, sizeof(buf)) >= 0 || 
    73 +           cfe_getenv("wl0gpio1", buf, sizeof(buf)) >= 0) 
    74 +               sprom->gpio1 = simple_strtoul(buf, NULL, 0); 
    75 +       if (nvram_getenv("wl0gpio2", buf, sizeof(buf)) >= 0 || 
    76 +           cfe_getenv("wl0gpio2", buf, sizeof(buf)) >= 0) 
    77 +               sprom->gpio2 = simple_strtoul(buf, NULL, 0); 
    78 +       if (nvram_getenv("wl0gpio3", buf, sizeof(buf)) >= 0 || 
    79 +           cfe_getenv("wl0gpio3", buf, sizeof(buf)) >= 0) 
    80 +               sprom->gpio3 = simple_strtoul(buf, NULL, 0); 
    81 +       if (nvram_getenv("pa0maxpwr", buf, sizeof(buf)) >= 0 || 
    82 +           cfe_getenv("pa0maxpwr", buf, sizeof(buf)) >= 0) 
    83 +               sprom->maxpwr_bg = simple_strtoul(buf, NULL, 0); 
    84 +       if (nvram_getenv("pa1maxpwr", buf, sizeof(buf)) >= 0 || 
    85 +           cfe_getenv("pa1maxpwr", buf, sizeof(buf)) >= 0) 
    86 +               sprom->maxpwr_a = simple_strtoul(buf, NULL, 0); 
    87 +       if (nvram_getenv("pa0itssit", buf, sizeof(buf)) >= 0 || 
    88 +           cfe_getenv("pa0itssit", buf, sizeof(buf)) >= 0) 
    89 +               sprom->itssi_bg = simple_strtoul(buf, NULL, 0); 
    90 +       if (nvram_getenv("pa1itssit", buf, sizeof(buf)) >= 0 || 
    91 +           cfe_getenv("pa1itssit", buf, sizeof(buf)) >= 0) 
    92 +               sprom->itssi_a = simple_strtoul(buf, NULL, 0); 
     45+       READ_FROM_NVRAM(et0phyaddr, "et0phyaddr", buf); 
     46+       READ_FROM_NVRAM(et1phyaddr, "et1phyaddr", buf); 
     47+       READ_FROM_NVRAM(et0mdcport, "et0mdcport", buf); 
     48+       READ_FROM_NVRAM(et1mdcport, "et1mdcport", buf); 
     49+       READ_FROM_NVRAM(board_rev, "boardrev", buf); 
     50+       READ_FROM_NVRAM(country_code, "ccode", buf); 
     51+       READ_FROM_NVRAM(ant_available_a, "aa5g", buf); 
     52+       READ_FROM_NVRAM(ant_available_bg, "aa2g", buf); 
     53+       READ_FROM_NVRAM(pa0b0, "pa0b0", buf); 
     54+       READ_FROM_NVRAM(pa0b1, "pa0b1", buf); 
     55+       READ_FROM_NVRAM(pa0b2, "pa0b2", buf); 
     56+       READ_FROM_NVRAM(pa1b0, "pa1b0", buf); 
     57+       READ_FROM_NVRAM(pa1b1, "pa1b1", buf); 
     58+       READ_FROM_NVRAM(pa1b2, "pa1b2", buf); 
     59+       READ_FROM_NVRAM(pa1lob0, "pa1lob0", buf); 
     60+       READ_FROM_NVRAM(pa1lob2, "pa1lob1", buf); 
     61+       READ_FROM_NVRAM(pa1lob1, "pa1lob2", buf); 
     62+       READ_FROM_NVRAM(pa1hib0, "pa1hib0", buf); 
     63+       READ_FROM_NVRAM(pa1hib2, "pa1hib1", buf); 
     64+       READ_FROM_NVRAM(pa1hib1, "pa1hib2", buf); 
     65+       READ_FROM_NVRAM(gpio0, "wl0gpio0", buf); 
     66+       READ_FROM_NVRAM(gpio1, "wl0gpio1", buf); 
     67+       READ_FROM_NVRAM(gpio2, "wl0gpio2", buf); 
     68+       READ_FROM_NVRAM(gpio3, "wl0gpio3", buf); 
     69+       READ_FROM_NVRAM(maxpwr_bg, "pa0maxpwr", buf); 
     70+       READ_FROM_NVRAM(maxpwr_al, "pa1lomaxpwr", buf); 
     71+       READ_FROM_NVRAM(maxpwr_a, "pa1maxpwr", buf); 
     72+       READ_FROM_NVRAM(maxpwr_ah, "pa1himaxpwr", buf); 
     73+       READ_FROM_NVRAM(itssi_a, "pa1itssit", buf); 
     74+       READ_FROM_NVRAM(itssi_bg, "pa0itssit", buf); 
     75+       READ_FROM_NVRAM(tri2g, "tri2g", buf); 
     76+       READ_FROM_NVRAM(tri5gl, "tri5gl", buf); 
     77+       READ_FROM_NVRAM(tri5g, "tri5g", buf); 
     78+       READ_FROM_NVRAM(tri5gh, "tri5gh", buf); 
     79+       READ_FROM_NVRAM(rxpo2g, "rxpo2g", buf); 
     80+       READ_FROM_NVRAM(rxpo5g, "rxpo5g", buf); 
     81+       READ_FROM_NVRAM(rssisav2g, "rssisav2g", buf); 
     82+       READ_FROM_NVRAM(rssismc2g, "rssismc2g", buf); 
     83+       READ_FROM_NVRAM(rssismf2g, "rssismf2g", buf); 
     84+       READ_FROM_NVRAM(bxa2g, "bxa2g", buf); 
     85+       READ_FROM_NVRAM(rssisav5g, "rssisav5g", buf); 
     86+       READ_FROM_NVRAM(rssismc5g, "rssismc5g", buf); 
     87+       READ_FROM_NVRAM(rssismf5g, "rssismf5g", buf); 
     88+       READ_FROM_NVRAM(bxa5g, "bxa5g", buf); 
     89+       READ_FROM_NVRAM(cck2gpo, "cck2gpo", buf); 
     90+       READ_FROM_NVRAM(ofdm2gpo, "ofdm2gpo", buf); 
     91+       READ_FROM_NVRAM(ofdm5glpo, "ofdm5glpo", buf); 
     92+       READ_FROM_NVRAM(ofdm5gpo, "ofdm5gpo", buf); 
     93+       READ_FROM_NVRAM(ofdm5ghpo, "ofdm5ghpo", buf); 
    9394+ 
    9495+       if (nvram_getenv("boardflags", buf, sizeof(buf)) >= 0 || 
     
    111112                                   struct ssb_init_invariants *iv) 
    112113 { 
    113 @@ -82,43 +170,19 @@ static int bcm47xx_get_invariants(struct 
     114@@ -82,43 +171,19 @@ static int bcm47xx_get_invariants(struct 
    114115        /* Fill boardinfo structure */ 
    115116        memset(&(iv->boardinfo), 0 , sizeof(struct ssb_boardinfo)); 
Note: See TracChangeset for help on using the changeset viewer.