OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 15... Line 15...
15 arch/mips/bcm63xx/boards/board_common.h | 3 ++- 15 arch/mips/bcm63xx/boards/board_common.h | 3 ++-
16 3 files changed, 14 insertions(+), 8 deletions(-) 16 3 files changed, 14 insertions(+), 8 deletions(-)
Line 17... Line 17...
17   17  
18 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 18 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
19 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 19 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
20 @@ -727,7 +727,8 @@ void __init board_prom_init(void) 20 @@ -743,7 +743,8 @@ void __init board_prom_init(void)
21 if (strncmp(board_name, bcm963xx_boards[i]->name, 16)) 21 if (strncmp(board_name, bcm963xx_boards[i]->name, 16))
22 continue; 22 continue;
23 /* copy, board desc array is marked initdata */ 23 /* copy, board desc array is marked initdata */
24 - board_early_setup(bcm963xx_boards[i]); 24 - board_early_setup(bcm963xx_boards[i]);
Line 35... Line 35...
35 #include <bcm63xx_io.h> 35 #include <bcm63xx_io.h>
36 -#include <bcm63xx_nvram.h> 36 -#include <bcm63xx_nvram.h>
37 #include <bcm63xx_gpio.h> 37 #include <bcm63xx_gpio.h>
38 #include <bcm63xx_dev_pci.h> 38 #include <bcm63xx_dev_pci.h>
39 #include <bcm63xx_dev_enet.h> 39 #include <bcm63xx_dev_enet.h>
40 @@ -81,15 +80,20 @@ const char *board_get_name(void) 40 @@ -82,15 +81,20 @@ const char *board_get_name(void)
41 return board.name; 41 return board.name;
42 } 42 }
Line 43... Line 43...
43 43
44 +static int (*board_get_mac_address)(u8 mac[ETH_ALEN]); 44 +static int (*board_get_mac_address)(u8 mac[ETH_ALEN]);
Line 57... Line 57...
57 + board_get_mac_address = get_mac_address; 57 + board_get_mac_address = get_mac_address;
58 + 58 +
59 /* setup pin multiplexing depending on board enabled device, 59 /* setup pin multiplexing depending on board enabled device,
60 * this has to be done this early since PCI init is done 60 * this has to be done this early since PCI init is done
61 * inside arch_initcall */ 61 * inside arch_initcall */
62 @@ -162,15 +166,15 @@ int __init board_register_devices(void) 62 @@ -163,15 +167,15 @@ int __init board_register_devices(void)
63 bcm63xx_pcmcia_register(); 63 bcm63xx_pcmcia_register();
Line 64... Line 64...
64 64
65 if (board.has_enet0 && 65 if (board.has_enet0 &&
66 - !bcm63xx_nvram_get_mac_address(board.enet0.mac_addr)) 66 - !bcm63xx_nvram_get_mac_address(board.enet0.mac_addr))
Line 76... Line 76...
76 - !bcm63xx_nvram_get_mac_address(board.enetsw.mac_addr)) 76 - !bcm63xx_nvram_get_mac_address(board.enetsw.mac_addr))
77 + !board_get_mac_address(board.enetsw.mac_addr)) 77 + !board_get_mac_address(board.enetsw.mac_addr))
78 bcm63xx_enetsw_register(&board.enetsw); 78 bcm63xx_enetsw_register(&board.enetsw);
Line 79... Line 79...
79 79
80 if (board.has_usbd) 80 if (board.has_usbd)
81 @@ -186,7 +190,7 @@ int __init board_register_devices(void) 81 @@ -190,7 +194,7 @@ int __init board_register_devices(void)
82 * do this after registering enet devices 82 * do this after registering enet devices
83 */ 83 */
84 #ifdef CONFIG_SSB_PCIHOST 84 #ifdef CONFIG_SSB_PCIHOST
85 - if (!bcm63xx_nvram_get_mac_address(bcm63xx_sprom.il0mac)) { 85 - if (!bcm63xx_nvram_get_mac_address(bcm63xx_sprom.il0mac)) {