OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 21... Line 21...
21 21
22 static struct physmap_flash_data flash_data = { 22 static struct physmap_flash_data flash_data = {
23 .width = 2, 23 .width = 2,
24 --- a/drivers/mtd/redboot.c 24 --- a/drivers/mtd/redboot.c
25 +++ b/drivers/mtd/redboot.c 25 +++ b/drivers/mtd/redboot.c
26 @@ -73,6 +73,7 @@ static int parse_redboot_partitions(stru 26 @@ -72,6 +72,7 @@ static int parse_redboot_partitions(stru
27 int nulllen = 0; 27 int nulllen = 0;
28 int numslots; 28 int numslots;
29 unsigned long offset; 29 unsigned long offset;
30 + unsigned long fis_origin = 0; 30 + unsigned long fis_origin = 0;
31 #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED 31 #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
32 static char nullstring[] = "unallocated"; 32 static char nullstring[] = "unallocated";
33 #endif 33 #endif
34 @@ -177,6 +178,16 @@ static int parse_redboot_partitions(stru 34 @@ -176,6 +177,16 @@ static int parse_redboot_partitions(stru
35 goto out; 35 goto out;
Line 36... Line 36...
36 } 36 }
37 37
Line 46... Line 46...
46 + } 46 + }
47 + 47 +
48 for (i = 0; i < numslots; i++) { 48 for (i = 0; i < numslots; i++) {
49 struct fis_list *new_fl, **prev; 49 struct fis_list *new_fl, **prev;
Line 50... Line 50...
50 50
51 @@ -197,10 +208,10 @@ static int parse_redboot_partitions(stru 51 @@ -196,10 +207,10 @@ static int parse_redboot_partitions(stru
52 goto out; 52 goto out;
53 } 53 }
54 new_fl->img = &buf[i]; 54 new_fl->img = &buf[i];
55 - if (data && data->origin) 55 - if (data && data->origin)