aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.6/304-boardid_fixup.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2013-02-05 22:36:54 +0000
committerFlorian Fainelli <florian@openwrt.org>2013-02-05 22:36:54 +0000
commit6b0da6db6ac74860561b77849b769b2a755b170c (patch)
treeb02fe0e0468660a2119c67903f194ff8782a8bff /target/linux/brcm63xx/patches-3.6/304-boardid_fixup.patch
parente22926a46bd634bc5693048ed48ebf46121d039f (diff)
downloadupstream-6b0da6db6ac74860561b77849b769b2a755b170c.tar.gz
upstream-6b0da6db6ac74860561b77849b769b2a755b170c.tar.bz2
upstream-6b0da6db6ac74860561b77849b769b2a755b170c.zip
remove support for 3.6 kernel
Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 35506
Diffstat (limited to 'target/linux/brcm63xx/patches-3.6/304-boardid_fixup.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.6/304-boardid_fixup.patch61
1 files changed, 0 insertions, 61 deletions
diff --git a/target/linux/brcm63xx/patches-3.6/304-boardid_fixup.patch b/target/linux/brcm63xx/patches-3.6/304-boardid_fixup.patch
deleted file mode 100644
index a463fe739c..0000000000
--- a/target/linux/brcm63xx/patches-3.6/304-boardid_fixup.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -28,12 +28,16 @@
- #include <bcm63xx_dev_pcmcia.h>
- #include <bcm63xx_dev_spi.h>
- #include <board_bcm963xx.h>
-+#include <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 bcm963xx_nvram nvram;
- static unsigned int mac_addr_used;
- static struct board_info board;
-@@ -769,6 +773,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->board_id, BOARDID_LEN) != 0) {
-+ /* else try 128k */
-+ tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_128K);
-+ if (strncmp(nvram.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(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
- */
-@@ -816,6 +843,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,