diff options
author | Jonas Gorski <jogo@openwrt.org> | 2012-03-28 20:42:09 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2012-03-28 20:42:09 +0000 |
commit | 44d546290ac04ce74b3851cb0d21d598b1130bc3 (patch) | |
tree | 37a8e1f2b48b16992e0883e0eb2463c20be2141b /target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch | |
parent | 13b6ec1d0562c6e97a2e71f58f2cbf93d5ed9c0b (diff) | |
download | master-31e0f0ae-44d546290ac04ce74b3851cb0d21d598b1130bc3.tar.gz master-31e0f0ae-44d546290ac04ce74b3851cb0d21d598b1130bc3.tar.bz2 master-31e0f0ae-44d546290ac04ce74b3851cb0d21d598b1130bc3.zip |
bcm63xx: reorder patches
Reorder patches for a clearer distinction between the purposes of
the different patches.
SVN-Revision: 31127
Diffstat (limited to 'target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch b/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch new file mode 100644 index 0000000000..96b871dbfb --- /dev/null +++ b/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch @@ -0,0 +1,58 @@ +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +@@ -28,9 +28,13 @@ + #include <bcm63xx_dev_dsp.h> + #include <bcm63xx_dev_pcmcia.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; +@@ -721,6 +725,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 + */ +@@ -762,6 +789,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, |