summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.8/324-bcm63xxpart_use_cfedetection.patch
diff options
context:
space:
mode:
authorjogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-05-19 18:32:02 +0000
committerjogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-05-19 18:32:02 +0000
commit2ce30d075aab8baa7aae7ac3d58e46690e02f282 (patch)
tree582682b6f61eae43ecc27e162034e6d92d0644f7 /target/linux/brcm63xx/patches-3.8/324-bcm63xxpart_use_cfedetection.patch
parent2b7cc9340a9ee7d66e352990abbf64ef1192b488 (diff)
bcm63xx: Simplify CFE detection.
Check bootloader argument in mtd. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> [jogo@openwrt.org: split into two patches, one for detection, one letting bcm63xxpart use it.] Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36659 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.8/324-bcm63xxpart_use_cfedetection.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.8/324-bcm63xxpart_use_cfedetection.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.8/324-bcm63xxpart_use_cfedetection.patch b/target/linux/brcm63xx/patches-3.8/324-bcm63xxpart_use_cfedetection.patch
new file mode 100644
index 000000000..fd7d08a3d
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.8/324-bcm63xxpart_use_cfedetection.patch
@@ -0,0 +1,51 @@
+--- a/drivers/mtd/bcm63xxpart.c
++++ b/drivers/mtd/bcm63xxpart.c
+@@ -35,7 +35,7 @@
+
+ #include <linux/bcm963xx_tag.h>
+ #include <asm/mach-bcm63xx/bcm63xx_nvram.h>
+-#include <asm/mach-bcm63xx/board_bcm963xx.h>
++#include <asm/mach-bcm63xx/bcm63xx_board.h>
+
+ #define BCM63XX_EXTENDED_SIZE 0xBFC00000 /* Extended flash address */
+
+@@ -43,30 +43,6 @@
+
+ #define BCM63XX_CFE_MAGIC_OFFSET 0x4e0
+
+-static int bcm63xx_detect_cfe(struct mtd_info *master)
+-{
+- char buf[9];
+- int ret;
+- size_t retlen;
+-
+- ret = mtd_read(master, BCM963XX_CFE_VERSION_OFFSET, 5, &retlen,
+- (void *)buf);
+- buf[retlen] = 0;
+-
+- if (ret)
+- return ret;
+-
+- if (strncmp("cfe-v", buf, 5) == 0)
+- return 0;
+-
+- /* very old CFE's do not have the cfe-v string, so check for magic */
+- ret = mtd_read(master, BCM63XX_CFE_MAGIC_OFFSET, 8, &retlen,
+- (void *)buf);
+- buf[retlen] = 0;
+-
+- return strncmp("CFE1CFE1", buf, 8);
+-}
+-
+ static int bcm63xx_parse_cfe_partitions(struct mtd_info *master,
+ struct mtd_partition **pparts,
+ struct mtd_part_parser_data *data)
+@@ -85,7 +61,7 @@ static int bcm63xx_parse_cfe_partitions(
+ u32 computed_crc;
+ bool rootfs_first = false;
+
+- if (bcm63xx_detect_cfe(master))
++ if (!bcm63xx_is_cfe_present())
+ return -EINVAL;
+
+ cfe_erasesize = max_t(uint32_t, master->erasesize,