OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 14... Line 14...
14 arch/mips/bcm63xx/boards/board_common.h | 3 +++ 14 arch/mips/bcm63xx/boards/board_common.h | 3 +++
15 3 files changed, 36 insertions(+) 15 3 files changed, 36 insertions(+)
Line 16... Line 16...
16   16  
17 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 17 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
18 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 18 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
19 @@ -695,6 +695,10 @@ static const struct board_info __initcon 19 @@ -711,6 +711,10 @@ static const struct board_info __initcon
20 #endif 20 #endif
Line 21... Line 21...
21 }; 21 };
22 22
23 +static struct of_device_id const bcm963xx_boards_dt[] = { 23 +static struct of_device_id const bcm963xx_boards_dt[] = {
24 + { }, 24 + { },
25 +}; 25 +};
26 + 26 +
27 /* 27 /*
28 * early init callback, read nvram data from flash and checksum it 28 * early init callback, read nvram data from flash and checksum it
29 */ 29 */
30 @@ -706,6 +710,7 @@ void __init board_bcm963xx_init(void) 30 @@ -722,6 +726,7 @@ void __init board_bcm963xx_init(void)
31 char *board_name = NULL; 31 char *board_name = NULL;
32 u32 val; 32 u32 val;
Line 33... Line 33...
33 struct bcm_hcs *hcs; 33 struct bcm_hcs *hcs;
34 + const struct of_device_id *board_match; 34 + const struct of_device_id *board_match;
35 35
36 /* read base address of boot chip select (0) 36 /* read base address of boot chip select (0)
37 * 6328/6362 do not have MPI but boot from a fixed address 37 * 6328/6362 do not have MPI but boot from a fixed address
38 @@ -745,6 +750,16 @@ void __init board_bcm963xx_init(void) 38 @@ -761,6 +766,16 @@ void __init board_bcm963xx_init(void)
39 } else { 39 } else {
40 board_name = bcm63xx_nvram_get_name(); 40 board_name = bcm63xx_nvram_get_name();
Line 52... Line 52...
52 /* find board by name */ 52 /* find board by name */
53 for (i = 0; i < ARRAY_SIZE(bcm963xx_boards); i++) { 53 for (i = 0; i < ARRAY_SIZE(bcm963xx_boards); i++) {
54 if (strncmp(board_name, bcm963xx_boards[i]->name, 16)) 54 if (strncmp(board_name, bcm963xx_boards[i]->name, 16))
55 --- a/arch/mips/bcm63xx/boards/board_common.c 55 --- a/arch/mips/bcm63xx/boards/board_common.c
56 +++ b/arch/mips/bcm63xx/boards/board_common.c 56 +++ b/arch/mips/bcm63xx/boards/board_common.c
57 @@ -239,3 +239,21 @@ int __init board_register_devices(void) 57 @@ -243,3 +243,21 @@ int __init board_register_devices(void)
Line 58... Line 58...
58 58
59 return 0; 59 return 0;
60 } 60 }
61 + 61 +