OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 2 Rev 3
Line 33... Line 33...
33 33
34 -endchoice 34 -endchoice
35 +endmenu 35 +endmenu
36 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 36 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
37 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 37 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
38 @@ -686,7 +686,7 @@ static const struct board_info __initcon 38 @@ -702,7 +702,7 @@ static const struct board_info __initcon
39 /* 39 /*
40 * early init callback, read nvram data from flash and checksum it 40 * early init callback, read nvram data from flash and checksum it
41 */ 41 */
42 -void __init board_prom_init(void) 42 -void __init board_prom_init(void)
Line 53... Line 53...
53 +#include <asm/bootinfo.h> 53 +#include <asm/bootinfo.h>
54 +#include <asm/fw/cfe/cfe_api.h> 54 +#include <asm/fw/cfe/cfe_api.h>
55 #include <bcm63xx_board.h> 55 #include <bcm63xx_board.h>
56 #include <bcm63xx_cpu.h> 56 #include <bcm63xx_cpu.h>
57 #include <bcm63xx_dev_uart.h> 57 #include <bcm63xx_dev_uart.h>
58 @@ -30,6 +32,8 @@ 58 @@ -31,6 +33,8 @@
59 #include <bcm63xx_dev_usb_usbd.h> 59 #include <bcm63xx_dev_usb_usbd.h>
60 #include <board_bcm963xx.h> 60 #include <board_bcm963xx.h>
Line 61... Line 61...
61 61
62 +#include "board_common.h" 62 +#include "board_common.h"
63 + 63 +
Line 64... Line 64...
64 #define PFX "board: " 64 #define PFX "board: "
65 65
66 static struct board_info board; 66 static struct board_info board;
67 @@ -80,6 +84,15 @@ const char *board_get_name(void) 67 @@ -81,6 +85,15 @@ const char *board_get_name(void)
Line 68... Line 68...
68 return board.name; 68 return board.name;
69 } 69 }