projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
b43: Remove unnecessary MMIO accesses in the interrupt hotpath.
[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
787f17e
..
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.4/drivers/mtd/redboot.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/mtd/redboot.c
-+++ linux-2.6.25.4/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.4/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;
This page took
0.027331 seconds
and
4
git commands to generate.