hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

patches-2.6.35: mtd flashmap: Really fixed sparelen and rootfslen. The real rootfslen for OpenWRT images comes from a bigendian uint32_t in reserved1 of the bcm_tag, which is now used to correctly calculate the rootfslen (and thus the sparelen).

Browse Source 
SVN-Revision: 24843
master
Daniel Dickinson 14 years ago
parent 5ee2a6c696
commit dc9c1ac1f7
1 changed files with 5 additions and 17 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 22
      target/linux/brcm63xx/patches-2.6.35/040-bcm963xx_flashmap.patch

22
target/linux/brcm63xx/patches-2.6.35/040-bcm963xx_flashmap.patch
Unescape View File

@ -73,7 +73,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
+obj-$(CONFIG_MTD_BCM963XX) += bcm963xx-flash.o +obj-$(CONFIG_MTD_BCM963XX) += bcm963xx-flash.o
--- /dev/null --- /dev/null
+++ b/drivers/mtd/maps/bcm963xx-flash.c +++ b/drivers/mtd/maps/bcm963xx-flash.c
@@ -0,0 +1,288 @@ @@ -0,0 +1,276 @@
+/* +/*
+ * Copyright (C) 2006-2008 Florian Fainelli <florian@openwrt.org> + * Copyright (C) 2006-2008 Florian Fainelli <florian@openwrt.org>
+ * Mike Albon <malbon@openwrt.org> + * Mike Albon <malbon@openwrt.org>
@ -136,12 +136,11 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
+ int ret; + int ret;
+ size_t retlen; + size_t retlen;
+ unsigned int rootfsaddr, kerneladdr, spareaddr; + unsigned int rootfsaddr, kerneladdr, spareaddr;
+ unsigned int rootfslen, kernellen, sparelen, totallen; + unsigned int rootfslen, kernellen, sparelen;
+ int namelen = 0; + int namelen = 0;
+ int i, offset; + int i, offset;
+ char *boardid; + char *boardid;
+ char *tagversion; + char *tagversion;
+ struct squashfs_super_block sb;
+ +
+ /* Allocate memory for buffer */ + /* Allocate memory for buffer */
+ buf = vmalloc(sizeof(struct bcm_tag)); + buf = vmalloc(sizeof(struct bcm_tag));
@ -157,8 +156,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
+ +
+ sscanf(buf->kernelAddress, "%u", &kerneladdr); + sscanf(buf->kernelAddress, "%u", &kerneladdr);
+ sscanf(buf->kernelLength, "%u", &kernellen); + sscanf(buf->kernelLength, "%u", &kernellen);
+ sscanf(buf->totalLength, "%u", &totallen); + rootfslen = *(uint32_t *)(&(buf->rootLength[0]));
+ sscanf(buf->rootLength, "%u", &rootfslen);
+ tagversion = &(buf->tagVersion[0]); + tagversion = &(buf->tagVersion[0]);
+ boardid = &(buf->boardid[0]); + boardid = &(buf->boardid[0]);
+ +
@ -167,20 +165,10 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
+ kerneladdr = kerneladdr - EXTENDED_SIZE; + kerneladdr = kerneladdr - EXTENDED_SIZE;
+ rootfsaddr = kerneladdr + kernellen; + rootfsaddr = kerneladdr + kernellen;
+ +
+ // offset = master->erasesize + sizeof(struct bcm_tag) + kernellen;
+ offset = rootfsaddr;
+ ret = master->read(master, offset, sizeof(sb), &retlen, (void *) &sb);
+ if (ret || (retlen != sizeof(sb))) {
+ printk(KERN_ALERT PFX "parse_cfe_partitions: error occured while reading "
+ "from \"%s\"\n", master->name);
+ return -EINVAL;
+ }
+
+ rootfslen = ( ( rootfslen % master->erasesize ) > 0 ? (((rootfslen / master->erasesize) + 1 ) * master->erasesize) : rootfslen); + rootfslen = ( ( rootfslen % master->erasesize ) > 0 ? (((rootfslen / master->erasesize) + 1 ) * master->erasesize) : rootfslen);
+ totallen = rootfslen + kernellen + sizeof(struct bcm_tag);
+ +
+ spareaddr = rootfsaddr + rootfslen; + spareaddr = rootfsaddr + rootfslen;
+ sparelen = master->size - totallen - master->erasesize; + sparelen = master->size - spareaddr - master->erasesize;
+ +
+ /* Determine number of partitions */ + /* Determine number of partitions */
+ namelen = 8; + namelen = 8;

Write Preview
Loading…
Cancel
Save