OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 1... Line 1...
1 --- a/drivers/mtd/redboot.c 1 --- a/drivers/mtd/redboot.c
2 +++ b/drivers/mtd/redboot.c 2 +++ b/drivers/mtd/redboot.c
3 @@ -31,6 +31,8 @@ 3 @@ -30,6 +30,8 @@
-   4 #include <linux/mtd/partitions.h>
4 #include <linux/module.h> 5 #include <linux/module.h>
5 #include <linux/mod_devicetable.h> -  
Line 6... Line 6...
6 6
7 +#include <asm/mach-types.h> 7 +#include <asm/mach-types.h>
8 + 8 +
9 struct fis_image_desc { 9 struct fis_image_desc {
10 unsigned char name[16]; // Null terminated name 10 unsigned char name[16]; // Null terminated name
11 uint32_t flash_base; // Address within FLASH of image 11 uint32_t flash_base; // Address within FLASH of image
12 @@ -48,7 +50,8 @@ struct fis_list { 12 @@ -47,7 +49,8 @@ struct fis_list {
13 struct fis_list *next; 13 struct fis_list *next;
Line 14... Line 14...
14 }; 14 };
15 15
16 -static int directory = CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK; 16 -static int directory = CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK;
17 +int directory = CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK; 17 +int directory = CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK;
Line 18... Line 18...
18 + 18 +
19 module_param(directory, int, 0); 19 module_param(directory, int, 0);
20 20
21 static inline int redboot_checksum(struct fis_image_desc *img) 21 static inline int redboot_checksum(struct fis_image_desc *img)
22 @@ -76,6 +79,8 @@ static int parse_redboot_partitions(stru 22 @@ -75,6 +78,8 @@ static int parse_redboot_partitions(stru
23 #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED 23 #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
24 static char nullstring[] = "unallocated"; 24 static char nullstring[] = "unallocated";