Changeset 10773

Timestamp:

11/05/08 14:22:29 (5 years ago)

Author:

eko

Message:

flash map fix for zero jffs size

File:

• src/linux/brcm/linux.v24_2/drivers/mtd/maps/bcm947xx-flash.c (modified) (7 diffs)

src/linux/brcm/linux.v24_2/drivers/mtd/maps/bcm947xx-flash.c

@@ -329 +329 @@
                 /* Update the squashfs partition size based on the superblock info */
                 part->size = sb->bytes_used;
+                //part->size = part->size + 1024; /* uncomment for belkin v2000 ! */
                 len = part->offset + part->size;
                 len +=  (mtd->erasesize - 1);
@@ -390 +391 @@
 
         int board_data_size = 0; // e.g Netgear 0x003e0000-0x003f0000 : "board_data", we exclude this part from our mapping
-
+        int jffs_exclude_size = 0;  // to prevent overwriting len/checksum on e.g. Netgear WGR614v8/L/WW
+        
         uint boardnum = bcm_strtoul( nvram_safe_get( "boardnum" ), NULL, 0 );   
                 
@@ -396 +398 @@
           && nvram_match ("boardtype", "0x0472")
           && nvram_match ("cardbus", "1") ) {
-                board_data_size = ROUNDUP(NVRAM_SPACE, mtd->erasesize);  //Netgear WNR834B, Netgear WNR834Bv2
+                board_data_size = 0x10000;  //Netgear WNR834B, Netgear WNR834Bv2
         }
 
@@ -402 +404 @@
           && nvram_match ("boardtype", "0x0472")
           && nvram_match ("boardrev", "0x23") ) {
-                board_data_size = ROUNDUP(NVRAM_SPACE, mtd->erasesize);  //Netgear WNDR-3300
+                board_data_size = 0x10000;  //Netgear WNDR-3300
         }       
         
@@ -409 +411 @@
           && (nvram_match("boardrev", "0x11") || nvram_match("boardrev", "0x10"))
           && (nvram_match("boardflags", "0x750") || nvram_match("boardflags", "0x0750")) ) {
-                  if (nvram_match ("sdram_init", "0x000A") )  //Netgear WGR614v8/L/WW 16MB ram, cfe v1.3 or v1.5
-                        board_data_size = 5 * ROUNDUP(NVRAM_SPACE, mtd->erasesize);  // checksum is @ 0x003AFFF8
-                  else if (nvram_match ("sdram_init", "0x0002") )  //Netgear WGR614v9, cfe v1.5, 8MB ram
-                        board_data_size = ROUNDUP(NVRAM_SPACE, mtd->erasesize);  // checksum is @ 0x001F9FFF8
+                if (nvram_match ("sdram_init", "0x000A") ) {  //Netgear WGR614v8/L/WW 16MB ram, cfe v1.3 or v1.5
+                        board_data_size = 4 * 0x10000;  // checksum is @ 0x003AFFF8
+                        jffs_exclude_size = 0x10000;
+                }
+                else if (nvram_match ("sdram_init", "0x0002") )  //Netgear WGR614v9, cfe v1.5, 8MB ram
+                        board_data_size = 0x10000;  // checksum is @ 0x001F9FFF8
         }                                                                                                                               
 
@@ -464 +468 @@
                         }
                         bcm947xx_parts[4].size = bcm947xx_parts[3].offset - 
-                                bcm947xx_parts[4].offset - board_data_size;
+                                bcm947xx_parts[4].offset - board_data_size - jffs_exclude_size;
                 } else {
                         bcm947xx_parts[4].offset = bcm947xx_parts[2].offset + 
@@ -473 +477 @@
                         }
                         bcm947xx_parts[4].size = size - bcm947xx_parts[3].size - 
-                                bcm947xx_parts[4].offset - board_data_size;
+                                bcm947xx_parts[4].offset - board_data_size - jffs_exclude_size;
+                }
+                /* do not make zero size jffs2 partition  */
+                if (bcm947xx_parts[4].size < mtd->erasesize) {
+                        bcm947xx_parts[4].name = NULL;
                 }
         }