1 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
2 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
4 #include <bcm63xx_dev_pcmcia.h>
5 #include <bcm63xx_dev_spi.h>
6 #include <board_bcm963xx.h>
7 +#include <linux/bcm963xx_tag.h>
9 #define PFX "board_bcm963xx: "
11 #define BCM963XX_KEYS_POLL_INTERVAL 20
12 #define BCM963XX_KEYS_DEBOUNCE_INTERVAL (BCM963XX_KEYS_POLL_INTERVAL * 3)
14 +#define CFE_OFFSET_64K 0x10000
15 +#define CFE_OFFSET_128K 0x20000
17 static struct bcm963xx_nvram nvram;
18 static unsigned int mac_addr_used;
19 static struct board_info board;
20 @@ -769,6 +773,29 @@ static int board_get_mac_address(u8 *mac
24 +static void __init boardid_fixup(u8 *boot_addr)
26 + struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
28 + /* check if bcm_tag is at 64k offset */
29 + if (strncmp(nvram.name, tag->board_id, BOARDID_LEN) != 0) {
31 + tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_128K);
32 + if (strncmp(nvram.name, tag->board_id, BOARDID_LEN) != 0) {
34 + printk(KERN_DEBUG "No bcm_tag found!\n");
38 + /* check if we should override the boardid */
39 + if (tag->information1[0] != '+')
42 + strncpy(nvram.name, &tag->information1[1], BOARDID_LEN);
44 + printk(KERN_INFO "Overriding boardid with '%s'\n", nvram.name);
48 * early init callback, read nvram data from flash and checksum it
50 @@ -816,6 +843,11 @@ void __init board_prom_init(void)
54 + if (strcmp(cfe_version, "unknown") != 0) {
56 + boardid_fixup(boot_addr);
59 /* find board by name */
60 for (i = 0; i < ARRAY_SIZE(bcm963xx_boards); i++) {
61 if (strncmp(nvram.name, bcm963xx_boards[i]->name,