aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2011-03-07 16:55:01 +0000
committerFlorian Fainelli <florian@openwrt.org>2011-03-07 16:55:01 +0000
commitaa580d336b7dd899bab82b9abb004b9312ac0ff4 (patch)
treefd671f72d961b4e7496d13dd549eb24bb94aeb6c /target/linux
parentb52beae1afe0be88f4ba9c1af593619f0303aedd (diff)
downloadupstream-aa580d336b7dd899bab82b9abb004b9312ac0ff4.tar.gz
upstream-aa580d336b7dd899bab82b9abb004b9312ac0ff4.tar.bz2
upstream-aa580d336b7dd899bab82b9abb004b9312ac0ff4.zip
bcm63xx: Really fix the flash driver in 2.6.37
Read back the actual rootfs length from the image tag. Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com> SVN-Revision: 25938
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/brcm63xx/patches-2.6.37/041-bcm963xx_real_rootfs_length.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-2.6.37/041-bcm963xx_real_rootfs_length.patch b/target/linux/brcm63xx/patches-2.6.37/041-bcm963xx_real_rootfs_length.patch
new file mode 100644
index 0000000000..cde2b92233
--- /dev/null
+++ b/target/linux/brcm63xx/patches-2.6.37/041-bcm963xx_real_rootfs_length.patch
@@ -0,0 +1,45 @@
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h
+@@ -86,8 +86,10 @@ struct bcm_tag {
+ char rootfs_crc[CRC_LEN];
+ /* 224-227: CRC32 of kernel partition */
+ char kernel_crc[CRC_LEN];
+- /* 228-235: Unused at present */
+- char reserved1[8];
++ /* 228-231: OpenWrt: real rootfs length */
++ char real_rootfs_length[4];
++ /* 222-235: Unused at present */
++ char reserved1[4];
+ /* 236-239: CRC32 of header excluding tagVersion */
+ char header_crc[CRC_LEN];
+ /* 240-255: Unused at present */
+--- a/drivers/mtd/maps/bcm963xx-flash.c
++++ b/drivers/mtd/maps/bcm963xx-flash.c
+@@ -64,7 +64,7 @@ static int parse_cfe_partitions(struct m
+ int ret;
+ size_t retlen;
+ unsigned int rootfsaddr, kerneladdr, spareaddr;
+- unsigned int rootfslen, kernellen, sparelen, totallen;
++ unsigned int rootfslen, kernellen, sparelen;
+ int namelen = 0;
+ int i;
+ char *boardid;
+@@ -85,7 +85,7 @@ static int parse_cfe_partitions(struct m
+
+ sscanf(buf->kernel_address, "%u", &kerneladdr);
+ sscanf(buf->kernel_length, "%u", &kernellen);
+- sscanf(buf->total_length, "%u", &totallen);
++ rootfslen = *(uint32_t *)(&(buf->real_rootfs_length));
+ tagversion = &(buf->tag_version[0]);
+ boardid = &(buf->board_id[0]);
+
+@@ -94,7 +94,8 @@ static int parse_cfe_partitions(struct m
+
+ kerneladdr = kerneladdr - BCM63XX_EXTENDED_SIZE;
+ rootfsaddr = kerneladdr + kernellen;
+- spareaddr = roundup(totallen, master->erasesize) + master->erasesize;
++ rootfslen = roundup(rootfslen, master->erasesize);
++ spareaddr = rootfsaddr + rootfslen;
+ sparelen = master->size - spareaddr - master->erasesize;
+ rootfslen = spareaddr - rootfsaddr;
+