63 lines
1.7 KiB
Diff
63 lines
1.7 KiB
Diff
|
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||
|
|
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||
|
|
@@ -33,11 +33,16 @@
|
||
|
|
#include <bcm63xx_dev_usb_usbd.h>
|
||
|
|
#include <board_bcm963xx.h>
|
||
|
|
|
||
|
|
+#include <uapi/linux/bcm963xx_tag.h>
|
||
|
|
+
|
||
|
|
#define PFX "board_bcm963xx: "
|
||
|
|
|
||
|
|
#define BCM963XX_KEYS_POLL_INTERVAL 20
|
||
|
|
#define BCM963XX_KEYS_DEBOUNCE_INTERVAL (BCM963XX_KEYS_POLL_INTERVAL * 3)
|
||
|
|
|
||
|
|
+#define CFE_OFFSET_64K 0x10000
|
||
|
|
+#define CFE_OFFSET_128K 0x20000
|
||
|
|
+
|
||
|
|
static struct board_info board;
|
||
|
|
|
||
|
|
/*
|
||
|
|
@@ -742,6 +747,30 @@ const char *board_get_name(void)
|
||
|
|
return board.name;
|
||
|
|
}
|
||
|
|
|
||
|
|
+static void __init boardid_fixup(u8 *boot_addr)
|
||
|
|
+{
|
||
|
|
+ struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
|
||
|
|
+ char *board_name = (char *)bcm63xx_nvram_get_name();
|
||
|
|
+
|
||
|
|
+ /* check if bcm_tag is at 64k offset */
|
||
|
|
+ if (strncmp(board_name, tag->board_id, BOARDID_LEN) != 0) {
|
||
|
|
+ /* else try 128k */
|
||
|
|
+ tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_128K);
|
||
|
|
+ if (strncmp(board_name, tag->board_id, 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(board_name, &tag->information1[1], BOARDID_LEN);
|
||
|
|
+
|
||
|
|
+ printk(KERN_INFO "Overriding boardid with '%s'\n", board_name);
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
/*
|
||
|
|
* early init callback, read nvram data from flash and checksum it
|
||
|
|
*/
|
||
|
|
@@ -775,6 +804,11 @@ void __init board_prom_init(void)
|
||
|
|
|
||
|
|
bcm63xx_nvram_init(boot_addr + BCM963XX_NVRAM_OFFSET);
|
||
|
|
|
||
|
|
+ if (strcmp(cfe_version, "unknown") != 0) {
|
||
|
|
+ /* cfe present */
|
||
|
|
+ boardid_fixup(boot_addr);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
board_name = bcm63xx_nvram_get_name();
|
||
|
|
/* find board by name */
|
||
|
|
for (i = 0; i < ARRAY_SIZE(bcm963xx_boards); i++) {
|