Changeset 13821

Timestamp:

02/03/10 01:25:49 (3 years ago)

Author:

BrainSlayer

Message:

guess the bootloader size

File:

• src/linux/pb42/linux-2.6.23/drivers/mtd/devices/ar7100_flash.c (modified) (4 diffs)

src/linux/pb42/linux-2.6.23/drivers/mtd/devices/ar7100_flash.c

@@ -170 +170 @@
         return 0;
 }
-
+int guessbootsize(void *offset,unsigned int maxscan)
+{
+unsigned int i;
+unsigned int *ofs = (unsigned int *)offset;
+maxscan-=65536;
+maxscan/=4;
+for (i=0;i<maxscan;i+=16384)
+    {
+    if (ofs[i] == 0x6d000080)
+        {
+        printk(KERN_EMERG "redboot or compatible detected\n");
+        return i; // redboot, lzma image
+        }
+    if (ofs[i] == 0x27051956)
+        {
+        printk(KERN_EMERG "uboot detected\n");
+        return i; // uboot, lzma image
+        }
+    }
+return -1;
+}
 static struct mtd_partition dir_parts[] = {
 #ifdef CONFIG_MTD_FLASH_16MB
@@ -274 +294 @@
                 int compex = 0;
                 if (!strncmp((char *)(buf + 0x295a), "myloram.bin", 11)) {
-/*        { name: "RedBoot", offset: 0, size: 0x40000, },//, mask_flags: MTD_WRITEABLE, },
-        { name: "linux", offset: 0x40000, size: 0x390000, },
-#endif
-        { name: "rootfs", offset: 0x0, size: 0x2b0000,}, //must be detected
-        { name: "ddwrt", offset: 0x0, size: 0x2b0000,}, //must be detected
-        { name: "nvram", offset: 0x3d0000, size: 0x10000, },
-        { name: "FIS directory", offset: 0x3e0000, size: 0x10000, },
-        { name: "board_config", offset: 0x3f0000, size: 0x10000, },
-        { name: "fullflash", offset: 0x3f0000, size: 0x10000, },
-        { name: NULL, },*/
                         printk(KERN_EMERG "Compex WP543 device detected\n");
                         dir_parts[0].size = 0x30000;
@@ -293 +303 @@
                         dir_parts[6].offset = mtd->size - mtd->erasesize;
                         compex = 1;
+                }else{
+                int guess = guessbootsize(buf,mtd->size);
+                if (guess>0)
+                    {
+                    printk(KERN_EMERG "bootloader size = %X\n",guess);
+                    dir_parts[0].size = guess;
+                    dir_parts[0].offset = 0;
+                    dir_parts[1].offset = guess;
+                    dir_parts[1].size = 0;
+                    }
+                
                 }
 
@@ -339 +360 @@
                                 rootsize = dir_parts[4].offset - offset;        //size of rootfs aligned to nvram offset
 #ifdef CONFIG_AR9100
-                                        dir_parts[1].offset = 0x40000;
+//                                      dir_parts[1].offset = 0x40000;
                                         dir_parts[1].size = (dir_parts[2].offset - dir_parts[1].offset) + rootsize;
                                         break;