aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.7/304-boardid_fixup.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-02-04 10:19:50 +0000
committerJonas Gorski <jogo@openwrt.org>2013-02-04 10:19:50 +0000
commit3b4fced67dad0b733d77f78205cfecfc0d654695 (patch)
treea672ce6b4f937cdff5c23c4d96583c95c6357b9e /target/linux/brcm63xx/patches-3.7/304-boardid_fixup.patch
parent0e9365b3462d456baba85cad7269c85b0d0f7d8a (diff)
downloadupstream-3b4fced67dad0b733d77f78205cfecfc0d654695.tar.gz
upstream-3b4fced67dad0b733d77f78205cfecfc0d654695.tar.bz2
upstream-3b4fced67dad0b733d77f78205cfecfc0d654695.zip
bcm63xx: add support for linux 3.7
Based on 3.7.6. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 35481
Diffstat (limited to 'target/linux/brcm63xx/patches-3.7/304-boardid_fixup.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.7/304-boardid_fixup.patch62
1 files changed, 62 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.7/304-boardid_fixup.patch b/target/linux/brcm63xx/patches-3.7/304-boardid_fixup.patch
new file mode 100644
index 0000000000..9df5e56d80
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.7/304-boardid_fixup.patch
@@ -0,0 +1,62 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -31,11 +31,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;
+
+ /*
+@@ -740,6 +745,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
+ */
+@@ -776,6 +805,11 @@ void __init board_prom_init(void)
+ return;
+ }
+
++ 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++) {