aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-11-03 19:59:04 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-11-03 19:59:04 +0000
commit9a84de9e010fe1bb6d3bae6ed41d5205555a1913 (patch)
tree824a96b631153eae1b73733013b3bc2a8f66ee1a
parent7f75186333d4279cc23c676ef52044603a9f9bf2 (diff)
downloadupstream-9a84de9e010fe1bb6d3bae6ed41d5205555a1913.tar.gz
upstream-9a84de9e010fe1bb6d3bae6ed41d5205555a1913.tar.bz2
upstream-9a84de9e010fe1bb6d3bae6ed41d5205555a1913.zip
images without tagid now fallback to the untouched partition layout (#6093)
SVN-Revision: 18288
-rw-r--r--target/linux/brcm63xx/files/drivers/mtd/maps/bcm963xx-flash.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/target/linux/brcm63xx/files/drivers/mtd/maps/bcm963xx-flash.c b/target/linux/brcm63xx/files/drivers/mtd/maps/bcm963xx-flash.c
index de373b22b8..e24a08110c 100644
--- a/target/linux/brcm63xx/files/drivers/mtd/maps/bcm963xx-flash.c
+++ b/target/linux/brcm63xx/files/drivers/mtd/maps/bcm963xx-flash.c
@@ -199,8 +199,15 @@ static int parse_cfe_partitions( struct mtd_info *master, struct mtd_partition *
}
if (!tagid_match) {
- printk(KERN_ERR PFX "Failed to find a valid tag id\n");
- return -EIO;
+ tagid = "bcram";
+ sscanf(buf->bccfe.rootAddress,"%u", &rootfsaddr);
+ sscanf(buf->bccfe.rootLength, "%u", &rootfslen);
+ sscanf(buf->bccfe.kernelAddress, "%u", &kerneladdr);
+ sscanf(buf->bccfe.kernelLength, "%u", &kernellen);
+ sscanf(buf->bccfe.totalLength, "%u", &totallen);
+ tagidcrc = *(uint32_t *)&(buf->bccfe.tagIdCRC[0]);
+ tagversion = &(buf->bccfe.tagVersion[0]);
+ boardid = &(buf->bccfe.boardid[0]);
}
printk(KERN_INFO PFX "CFE boot tag found with version %s, board type %s, and tagid %s.\n",tagversion,boardid,tagid);