upgrade ppc44x to 2.6.28.2, add basic support for the AMCC Canyonlands

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

diff --git a/target/linux/generic-2.6/patches-2.6.23/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.23/070-redboot_space.patch
index 272a51f..b4d57cb 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.23/070-redboot_space.patch
+++ b/target/linux/generic-2.6/patches-2.6.23/070-redboot_space.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.23.1/drivers/mtd/redboot.c
-===================================================================
---- linux-2.6.23.1.orig/drivers/mtd/redboot.c  2008-01-26 01:43:10.742362738 +0100
-+++ linux-2.6.23.1/drivers/mtd/redboot.c       2008-01-26 01:47:24.432819736 +0100
+--- a/drivers/mtd/redboot.c
++++ b/drivers/mtd/redboot.c
 @@ -236,14 +236,21 @@
  #endif
                names += strlen(names)+1;
@@ -17,15 +15,15 @@ Index: linux-2.6.23.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;
-+                      }
 +#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;
-+                      }
  #endif
++                      }
 +              }
                tmp_fl = fl;
                fl = fl->next;