aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.2/250-boardid_fixup.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2012-01-13 14:59:50 +0000
committerJonas Gorski <jogo@openwrt.org>2012-01-13 14:59:50 +0000
commit4aabd3dd855cbb5215425ec5da003c143a5228b3 (patch)
treeabceeb8ba10db54a6bceef7e8d5769190911c021 /target/linux/brcm63xx/patches-3.2/250-boardid_fixup.patch
parentb49e97601bba8ba4075085b69e00952373e18af2 (diff)
downloadupstream-4aabd3dd855cbb5215425ec5da003c143a5228b3.tar.gz
upstream-4aabd3dd855cbb5215425ec5da003c143a5228b3.tar.bz2
upstream-4aabd3dd855cbb5215425ec5da003c143a5228b3.zip
brcm63xx: add support for linux 3.2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29731 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.2/250-boardid_fixup.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.2/250-boardid_fixup.patch58
1 files changed, 58 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.2/250-boardid_fixup.patch b/target/linux/brcm63xx/patches-3.2/250-boardid_fixup.patch
new file mode 100644
index 0000000000..e97b7d7569
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.2/250-boardid_fixup.patch
@@ -0,0 +1,58 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -33,9 +33,13 @@
+ #include <bcm63xx_dev_usb_udc.h>
+ #include <bcm63xx_dev_spi.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;
+@@ -735,6 +739,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
+ */
+@@ -777,6 +804,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,