SW/openwrt
2
0
Fork 0
forked from Ivasoft/openwrt
Code Pull Requests Activity

bcm53xx: clean up nvram header

Browse Source 
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 43606
This commit is contained in:
Rafał Miłecki
2014-12-10 18:29:26 +00:00
parent fa5f896cb7
commit 960130e99c
5 changed files with 57 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
target/linux/bcm53xx/files/drivers/misc/bcm47xx-nvram.c
View File

@@ -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;

14
target/linux/bcm53xx/files/drivers/misc/bcm47xx-sprom.c
View File

@@ -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])
{