Reduce the probing time, should fix #1212

[openwrt.git] / target / linux / ar7-2.4 / patches / 001-flash_map.patch

diff --git a/target/linux/ar7-2.4/patches/001-flash_map.patch b/target/linux/ar7-2.4/patches/001-flash_map.patch
index 83bc103..bd07805 100644 (file)
--- a/target/linux/ar7-2.4/patches/001-flash_map.patch
+++ b/target/linux/ar7-2.4/patches/001-flash_map.patch
@@ -26,7 +26,7 @@ diff -urN linux.old/drivers/mtd/maps/ar7-flash.c linux.dev/drivers/mtd/maps/ar7-
 +extern char *prom_getenv(char *name);
 +
 +static int create_mtd_partitions(void);
 +extern char *prom_getenv(char *name);
 +
 +static int create_mtd_partitions(void);

-+static void __exit ar7_mtd_cleanup(void);
++static void ar7_mtd_cleanup(void);

 +      
 +#define MAX_NUM_PARTITIONS 5
 +static struct mtd_partition ar7_partinfo[MAX_NUM_PARTITIONS];
 +      
 +#define MAX_NUM_PARTITIONS 5
 +static struct mtd_partition ar7_partinfo[MAX_NUM_PARTITIONS];


@@ -217,12 +217,12 @@ diff -urN linux.old/drivers/mtd/maps/ar7-flash.c linux.dev/drivers/mtd/maps/ar7-
 +
 +      ar7_partinfo[p].name = strdup("config");
 +      ar7_partinfo[p].offset = config_offset;
 +
 +      ar7_partinfo[p].name = strdup("config");
 +      ar7_partinfo[p].offset = config_offset;

-+      ar7_partinfo[p].size = WINDOW_SIZE - config_offset;
++      ar7_partinfo[p].size = ar7_mtd_info->size - config_offset;

 +      ar7_partinfo[p++].mask_flags = 0;
 +
 +      if (ar7_read32(&ar7_map, rootfs_start) == SQUASHFS_MAGIC) {
 +              int newsize, newoffset;
 +      ar7_partinfo[p++].mask_flags = 0;
 +
 +      if (ar7_read32(&ar7_map, rootfs_start) == SQUASHFS_MAGIC) {
 +              int newsize, newoffset;

-+              squashfs_super_block sb;
++              struct squashfs_super_block sb;

 +
 +              ar7_copy_from(&ar7_map, &sb, rootfs_start, sizeof(sb));
 +              printk("Squashfs detected (size = 0x%08x)\n", sb.bytes_used);
 +
 +              ar7_copy_from(&ar7_map, &sb, rootfs_start, sizeof(sb));
 +              printk("Squashfs detected (size = 0x%08x)\n", sb.bytes_used);


@@ -234,7 +234,7 @@ diff -urN linux.old/drivers/mtd/maps/ar7-flash.c linux.dev/drivers/mtd/maps/ar7-
 +              
 +              ar7_partinfo[p - 2].size = newoffset - rootfs_start;
 +              
 +              
 +              ar7_partinfo[p - 2].size = newoffset - rootfs_start;
 +              

-+              ar7_partinfo[p].name = strdup("OpenWrt");
++              ar7_partinfo[p].name = strdup("rootfs_data");

 +              ar7_partinfo[p].offset = newoffset;
 +              ar7_partinfo[p].size = config_offset - newoffset;
 +              ar7_partinfo[p++].mask_flags = 0;
 +              ar7_partinfo[p].offset = newoffset;
 +              ar7_partinfo[p].size = config_offset - newoffset;
 +              ar7_partinfo[p++].mask_flags = 0;


@@ -249,7 +249,7 @@ diff -urN linux.old/drivers/mtd/maps/ar7-flash.c linux.dev/drivers/mtd/maps/ar7-
 +      return p;
 +}
 +
 +      return p;
 +}
 +

-+static void __exit ar7_mtd_cleanup(void)
++static void ar7_mtd_cleanup(void)

 +{
 +      if (ar7_mtd_info) {
 +              del_mtd_partitions(ar7_mtd_info);
 +{
 +      if (ar7_mtd_info) {
 +              del_mtd_partitions(ar7_mtd_info);