diff options
| author | Florian Fainelli <florian@openwrt.org> | 2011-06-16 14:34:40 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2011-06-16 14:34:40 +0000 |
| commit | 426dccd0197090291e35e74e1f801ba2ec386f0d (patch) | |
| tree | 467322b77c9029f6c20eb0dc4ed18212913c2b2f /target/linux/brcm63xx/patches-3.0/250-boardid_fixup.patch | |
| parent | 235e3319876d5d1354e2774ec73495fdeb2616ec (diff) | |
| download | upstream-426dccd0197090291e35e74e1f801ba2ec386f0d.tar.gz upstream-426dccd0197090291e35e74e1f801ba2ec386f0d.tar.bz2 upstream-426dccd0197090291e35e74e1f801ba2ec386f0d.zip | |
bcm63xx: Add support for Linux 3.0-rc3
Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com>
SVN-Revision: 27192
Diffstat (limited to 'target/linux/brcm63xx/patches-3.0/250-boardid_fixup.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.0/250-boardid_fixup.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.0/250-boardid_fixup.patch b/target/linux/brcm63xx/patches-3.0/250-boardid_fixup.patch new file mode 100644 index 0000000000..36a5805141 --- /dev/null +++ b/target/linux/brcm63xx/patches-3.0/250-boardid_fixup.patch @@ -0,0 +1,58 @@ +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +@@ -32,9 +32,13 @@ + #include <bcm63xx_dev_usb_udc.h> + #include <bcm63xx_dev_spi.h> + #include <board_bcm963xx.h> ++#include <bcm_tag.h> + + #define PFX "board_bcm963xx: " + ++#define CFE_OFFSET_64K 0x10000 ++#define CFE_OFFSET_128K 0x20000 ++ + static struct bcm963xx_nvram nvram; + static unsigned int mac_addr_used; + static struct board_info board; +@@ -734,6 +738,29 @@ static int board_get_mac_address(u8 *mac + return 0; + } + ++static void __init boardid_fixup(u8 *boot_addr) ++{ ++ struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K); ++ ++ /* check if bcm_tag is at 64k offset */ ++ if (strncmp(nvram.name, tag->boardid, BOARDID_LEN) != 0) { ++ /* else try 128k */ ++ tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_128K); ++ if (strncmp(nvram.name, tag->boardid, BOARDID_LEN) != 0) { ++ /* No tag found */ ++ printk(KERN_DEBUG "No bcm_tag found!\n"); ++ return; ++ } ++ } ++ /* check if we should override the boardid */ ++ if (tag->information1[0] != '+') ++ return; ++ ++ strncpy(nvram.name, &tag->information1[1], BOARDID_LEN); ++ ++ printk(KERN_INFO "Overriding boardid with '%s'\n", nvram.name); ++} ++ + /* + * early init callback, read nvram data from flash and checksum it + */ +@@ -782,6 +809,11 @@ void __init board_prom_init(void) + return; + } + ++ if (strcmp(cfe_version, "unknown") != 0) { ++ /* cfe present */ ++ boardid_fixup(boot_addr); ++ } ++ + /* find board by name */ + for (i = 0; i < ARRAY_SIZE(bcm963xx_boards); i++) { + if (strncmp(nvram.name, bcm963xx_boards[i]->name, |