[cavium-octeon] update to 2.6.30-rc5

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.25 / 070-redboot_space.patch

diff --git a/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch
index 434b9ab..784fba1 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.25.1/drivers/mtd/redboot.c
-===================================================================
---- linux-2.6.25.1.orig/drivers/mtd/redboot.c
-+++ linux-2.6.25.1/drivers/mtd/redboot.c
+--- a/drivers/mtd/redboot.c
++++ b/drivers/mtd/redboot.c

 @@ -251,14 +251,21 @@ static int parse_redboot_partitions(stru
  #endif
                names += strlen(names)+1;
 @@ -251,14 +251,21 @@ static int parse_redboot_partitions(stru
  #endif
                names += strlen(names)+1;


@@ -17,15 +15,15 @@ Index: linux-2.6.25.1/drivers/mtd/redboot.c
 +                              parts[i].size = fl->next->img->flash_base;
 +                              parts[i].size &= ~(master->erasesize - 1);
 +                              parts[i].size -= parts[i].offset;
 +                              parts[i].size = fl->next->img->flash_base;
 +                              parts[i].size &= ~(master->erasesize - 1);
 +                              parts[i].size -= parts[i].offset;

-+                      }

 +#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
 +#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED

-+                      else {
++                              nrparts--;
++                      } else {

 +                              i++;
 +                              parts[i].offset = parts[i-1].size + parts[i-1].offset;
 +                              parts[i].size = fl->next->img->flash_base - parts[i].offset;
 +                              parts[i].name = nullname;
 +                              i++;
 +                              parts[i].offset = parts[i-1].size + parts[i-1].offset;
 +                              parts[i].size = fl->next->img->flash_base - parts[i].offset;
 +                              parts[i].name = nullname;

-+                      }

  #endif
  #endif

++                      }

 +              }
                tmp_fl = fl;
                fl = fl->next;
 +              }
                tmp_fl = fl;
                fl = fl->next;