diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2014-12-10 18:29:26 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2014-12-10 18:29:26 +0000 |
| commit | 1cef9e38ebef38ddbe5ece90d8f405db7c90a1d0 (patch) | |
| tree | 95f988b38358340a9180bc3554e2f0521708345b /target/linux/bcm53xx/files/drivers | |
| parent | b7455c2192d0b7502cd1884bbdb5a175eb257482 (diff) | |
| download | master-187ad058-1cef9e38ebef38ddbe5ece90d8f405db7c90a1d0.tar.gz master-187ad058-1cef9e38ebef38ddbe5ece90d8f405db7c90a1d0.tar.bz2 master-187ad058-1cef9e38ebef38ddbe5ece90d8f405db7c90a1d0.zip | |
bcm53xx: clean up nvram header
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43606 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/bcm53xx/files/drivers')
| -rw-r--r-- | target/linux/bcm53xx/files/drivers/misc/bcm47xx-nvram.c | 13 | ||||
| -rw-r--r-- | target/linux/bcm53xx/files/drivers/misc/bcm47xx-sprom.c | 14 |
2 files changed, 27 insertions, 0 deletions
diff --git a/target/linux/bcm53xx/files/drivers/misc/bcm47xx-nvram.c b/target/linux/bcm53xx/files/drivers/misc/bcm47xx-nvram.c index 6ea715c2cd..55374799c0 100644 --- a/target/linux/bcm53xx/files/drivers/misc/bcm47xx-nvram.c +++ b/target/linux/bcm53xx/files/drivers/misc/bcm47xx-nvram.c @@ -21,6 +21,19 @@ #include <linux/io.h> #include <linux/bcm47xx_nvram.h> +#define NVRAM_HEADER 0x48534C46 /* 'FLSH' */ +#define NVRAM_SPACE 0x8000 + +#define FLASH_MIN 0x00020000 /* Minimum flash size */ + +struct nvram_header { + u32 magic; + u32 len; + u32 crc_ver_init; /* 0:7 crc, 8:15 ver, 16:31 sdram_init */ + u32 config_refresh; /* 0:15 sdram_config, 16:31 sdram_refresh */ + u32 config_ncdl; /* ncdl values for memc */ +}; + struct bcm47xx_nvram { size_t nvram_len; char *nvram_buf; diff --git a/target/linux/bcm53xx/files/drivers/misc/bcm47xx-sprom.c b/target/linux/bcm53xx/files/drivers/misc/bcm47xx-sprom.c index 3221b12c29..4e56208b8a 100644 --- a/target/linux/bcm53xx/files/drivers/misc/bcm47xx-sprom.c +++ b/target/linux/bcm53xx/files/drivers/misc/bcm47xx-sprom.c @@ -141,6 +141,20 @@ static void nvram_read_leddc(const struct bcm47xx_sprom_fill *fill, *leddc_off_time = (val >> 16) & 0xff; } +static void bcm47xx_nvram_parse_macaddr(char *buf, u8 macaddr[6]) +{ + if (strchr(buf, ':')) + sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &macaddr[0], + &macaddr[1], &macaddr[2], &macaddr[3], &macaddr[4], + &macaddr[5]); + else if (strchr(buf, '-')) + sscanf(buf, "%hhx-%hhx-%hhx-%hhx-%hhx-%hhx", &macaddr[0], + &macaddr[1], &macaddr[2], &macaddr[3], &macaddr[4], + &macaddr[5]); + else + pr_warn("Can not parse mac address: %s\n", buf); +} + static void nvram_read_macaddr(const struct bcm47xx_sprom_fill *fill, const char *name, u8 val[6]) { |