summaryrefslogtreecommitdiff
path: root/target/linux/brcm63xx/patches-3.8/404-bcm963xx_flashmap.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-02-04 10:19:55 +0000
committerJonas Gorski <jogo@openwrt.org>2013-02-04 10:19:55 +0000
commit8506964e6d6f89ae67951d0eafe4717b63b1f610 (patch)
treea60f167fa77a88974c7304c47fd3c0a29a43505e /target/linux/brcm63xx/patches-3.8/404-bcm963xx_flashmap.patch
parent3b4fced67dad0b733d77f78205cfecfc0d654695 (diff)
downloadmtk-20170518-8506964e6d6f89ae67951d0eafe4717b63b1f610.zip
mtk-20170518-8506964e6d6f89ae67951d0eafe4717b63b1f610.tar.gz
mtk-20170518-8506964e6d6f89ae67951d0eafe4717b63b1f610.tar.bz2
bcm63xx: add support for linux 3.8
Based on 3.8-rc6 Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 35482
Diffstat (limited to 'target/linux/brcm63xx/patches-3.8/404-bcm963xx_flashmap.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.8/404-bcm963xx_flashmap.patch65
1 files changed, 65 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.8/404-bcm963xx_flashmap.patch b/target/linux/brcm63xx/patches-3.8/404-bcm963xx_flashmap.patch
new file mode 100644
index 0000000..1aadfff
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.8/404-bcm963xx_flashmap.patch
@@ -0,0 +1,65 @@
+From a4d005c91d403d9f3d0272db6cc46202c06ec774 Mon Sep 17 00:00:00 2001
+From: Axel Gembe <ago@bastart.eu.org>
+Date: Mon, 12 May 2008 18:54:09 +0200
+Subject: [PATCH] bcm963xx: flashmap support
+
+Signed-off-by: Axel Gembe <ago@bastart.eu.org>
+---
+ arch/mips/bcm63xx/boards/board_bcm963xx.c | 19 +----------------
+ drivers/mtd/maps/bcm963xx-flash.c | 32 ++++++++++++++++++++++++----
+ drivers/mtd/redboot.c | 13 +++++++++--
+ 3 files changed, 38 insertions(+), 26 deletions(-)
+
+--- a/arch/mips/bcm63xx/dev-flash.c
++++ b/arch/mips/bcm63xx/dev-flash.c
+@@ -30,7 +30,7 @@ static struct mtd_partition mtd_partitio
+ }
+ };
+
+-static const char *bcm63xx_part_types[] = { "bcm63xxpart", NULL };
++static const char *bcm63xx_part_types[] = { "bcm63xxpart", "RedBoot", NULL };
+
+ static struct physmap_flash_data flash_data = {
+ .width = 2,
+--- a/drivers/mtd/redboot.c
++++ b/drivers/mtd/redboot.c
+@@ -72,6 +72,7 @@ static int parse_redboot_partitions(stru
+ int nulllen = 0;
+ int numslots;
+ unsigned long offset;
++ unsigned long fis_origin = 0;
+ #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
+ static char nullstring[] = "unallocated";
+ #endif
+@@ -176,6 +177,16 @@ static int parse_redboot_partitions(stru
+ goto out;
+ }
+
++ if (data && data->origin) {
++ fis_origin = data->origin;
++ } else {
++ for (i = 0; i < numslots; i++) {
++ if (!strncmp(buf[i].name, "RedBoot", 8)) {
++ fis_origin = (buf[i].flash_base & (master->size << 1) - 1);
++ }
++ }
++ }
++
+ for (i = 0; i < numslots; i++) {
+ struct fis_list *new_fl, **prev;
+
+@@ -196,10 +207,10 @@ static int parse_redboot_partitions(stru
+ goto out;
+ }
+ new_fl->img = &buf[i];
+- if (data && data->origin)
+- buf[i].flash_base -= data->origin;
+- else
+- buf[i].flash_base &= master->size-1;
++ if (fis_origin)
++ buf[i].flash_base -= fis_origin;
++
++ buf[i].flash_base &= (master->size << 1) - 1;
+
+ /* I'm sure the JFFS2 code has done me permanent damage.
+ * I now think the following is _normal_