aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.10/304-boardid_fixup.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/brcm63xx/patches-3.10/304-boardid_fixup.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.10/304-boardid_fixup.patch62
1 files changed, 0 insertions, 62 deletions
diff --git a/target/linux/brcm63xx/patches-3.10/304-boardid_fixup.patch b/target/linux/brcm63xx/patches-3.10/304-boardid_fixup.patch
deleted file mode 100644
index a206abab92..0000000000
--- a/target/linux/brcm63xx/patches-3.10/304-boardid_fixup.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -23,6 +23,7 @@
- #include "board_common.h"
-
- #include <uapi/linux/bcm933xx_hcs.h>
-+#include <uapi/linux/bcm963xx_tag.h>
-
- #define PFX "board_bcm963xx: "
-
-@@ -31,6 +32,9 @@
- #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
-+
- /*
- * known 3368 boards
- */
-@@ -722,6 +726,30 @@ static const struct board_info __initcon
- #endif
- };
-
-+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
- */
-@@ -760,6 +788,10 @@ void __init board_prom_init(void)
- hcs = (struct bcm_hcs *)boot_addr;
- board_name = hcs->filename;
- } else {
-+ if (strcmp(cfe_version, "unknown") != 0) {
-+ /* cfe present */
-+ boardid_fixup(boot_addr);
-+ }
- board_name = bcm63xx_nvram_get_name();
- }
- /* find board by name */