diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-01-03 01:53:30 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-01-03 01:53:30 +0000 |
| commit | 25afeba608b9db64cc0cab1f7be790f64193f590 (patch) | |
| tree | f293f93d06a2a30ce21d64d2a64763ba7bbd4e6c /target/linux/brcm47xx/patches-3.6/050-mtd-add-bcm47xx-part-parser.patch | |
| parent | edc7ab525ff7cc45ea478b8b936e596789eb851a (diff) | |
| download | upstream-25afeba608b9db64cc0cab1f7be790f64193f590.tar.gz upstream-25afeba608b9db64cc0cab1f7be790f64193f590.tar.bz2 upstream-25afeba608b9db64cc0cab1f7be790f64193f590.zip | |
brcm47xx: add a new version of the nvram rewrite patch
This is the version like it was send for mainline inclusion.
SVN-Revision: 34988
Diffstat (limited to 'target/linux/brcm47xx/patches-3.6/050-mtd-add-bcm47xx-part-parser.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.6/050-mtd-add-bcm47xx-part-parser.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/050-mtd-add-bcm47xx-part-parser.patch b/target/linux/brcm47xx/patches-3.6/050-mtd-add-bcm47xx-part-parser.patch index 61e8838c0d..ea092cc272 100644 --- a/target/linux/brcm47xx/patches-3.6/050-mtd-add-bcm47xx-part-parser.patch +++ b/target/linux/brcm47xx/patches-3.6/050-mtd-add-bcm47xx-part-parser.patch @@ -76,8 +76,8 @@ +#include <linux/mtd/partitions.h> +#include <linux/crc32.h> +#include <linux/io.h> -+#include <asm/mach-bcm47xx/nvram.h> -+#include <asm/mach-bcm47xx/bcm47xx.h> ++#include <bcm47xx_nvram.h> ++#include <bcm47xx.h> +#include <asm/fw/cfe/cfe_api.h> + + @@ -378,19 +378,19 @@ + u16 cardbus = 0; + u16 strev = 0; + -+ if (nvram_getenv("boardnum", buf, sizeof(buf)) >= 0) ++ if (bcm47xx_nvram_getenv("boardnum", buf, sizeof(buf)) >= 0) + boardnum = simple_strtoul(buf, NULL, 0); -+ if (nvram_getenv("boardtype", buf, sizeof(buf)) >= 0) ++ if (bcm47xx_nvram_getenv("boardtype", buf, sizeof(buf)) >= 0) + boardtype = simple_strtoul(buf, NULL, 0); -+ if (nvram_getenv("boardrev", buf, sizeof(buf)) >= 0) ++ if (bcm47xx_nvram_getenv("boardrev", buf, sizeof(buf)) >= 0) + boardrev = simple_strtoul(buf, NULL, 0); -+ if (nvram_getenv("boardflags", buf, sizeof(buf)) >= 0) ++ if (bcm47xx_nvram_getenv("boardflags", buf, sizeof(buf)) >= 0) + boardflags = simple_strtoul(buf, NULL, 0); -+ if (nvram_getenv("sdram_init", buf, sizeof(buf)) >= 0) ++ if (bcm47xx_nvram_getenv("sdram_init", buf, sizeof(buf)) >= 0) + sdram_init = simple_strtoul(buf, NULL, 0); -+ if (nvram_getenv("cardbus", buf, sizeof(buf)) >= 0) ++ if (bcm47xx_nvram_getenv("cardbus", buf, sizeof(buf)) >= 0) + cardbus = simple_strtoul(buf, NULL, 0); -+ if (nvram_getenv("st_rev", buf, sizeof(buf)) >= 0) ++ if (bcm47xx_nvram_getenv("st_rev", buf, sizeof(buf)) >= 0) + strev = simple_strtoul(buf, NULL, 0); + + if ((boardnum == 8 || boardnum == 01) |