OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 18... Line 18...
18 create mode 100644 arch/mips/bcm63xx/sprom.c 18 create mode 100644 arch/mips/bcm63xx/sprom.c
19 create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_fallback_sprom.h 19 create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_fallback_sprom.h
Line 20... Line 20...
20   20  
21 --- a/arch/mips/bcm63xx/Makefile 21 --- a/arch/mips/bcm63xx/Makefile
22 +++ b/arch/mips/bcm63xx/Makefile -  
23 @@ -1,7 +1,8 @@ 22 +++ b/arch/mips/bcm63xx/Makefile
24 obj-y += clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.o \ 23 @@ -2,7 +2,7 @@ obj-y += clk.o cpu.o cs.o gpio.o irq.o
25 setup.o timer.o dev-enet.o dev-flash.o dev-pcmcia.o \ 24 setup.o timer.o dev-dsp.o dev-enet.o dev-flash.o \
26 dev-rng.o dev-spi.o dev-hsspi.o dev-uart.o dev-wdt.o \ 25 dev-pcmcia.o dev-rng.o dev-spi.o dev-hsspi.o dev-uart.o \
27 - dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o usb-common.o 26 dev-wdt.o dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o \
28 + dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o usb-common.o \ 27 - usb-common.o
29 + sprom.o 28 + usb-common.o sprom.o
Line 30... Line 29...
30 obj-$(CONFIG_EARLY_PRINTK) += early_printk.o 29 obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
31 30
32 obj-y += boards/ 31 obj-y += boards/
33 --- a/arch/mips/bcm63xx/boards/board_common.c 32 --- a/arch/mips/bcm63xx/boards/board_common.c
34 +++ b/arch/mips/bcm63xx/boards/board_common.c 33 +++ b/arch/mips/bcm63xx/boards/board_common.c
Line 35... Line 34...
35 @@ -39,44 +39,6 @@ 34 @@ -40,44 +40,6 @@
36 static struct board_info board; 35 static struct board_info board;
37 36
Line 75... Line 74...
75 - 74 -
76 -/* 75 -/*
77 * return board name for /proc/cpuinfo 76 * return board name for /proc/cpuinfo
78 */ 77 */
79 const char *board_get_name(void) 78 const char *board_get_name(void)
80 @@ -179,6 +141,7 @@ static struct platform_device bcm63xx_gp 79 @@ -180,6 +142,7 @@ static struct platform_device bcm63xx_gp
81 int __init board_register_devices(void) 80 int __init board_register_devices(void)
82 { 81 {
83 int usbh_ports = 0; 82 int usbh_ports = 0;
84 + u8 mac[ETH_ALEN]; 83 + u8 mac[ETH_ALEN];
Line 85... Line 84...
85 84
86 if (board.has_uart0) 85 if (board.has_uart0)
87 bcm63xx_uart_register(0); 86 bcm63xx_uart_register(0);
88 @@ -220,15 +183,10 @@ int __init board_register_devices(void) 87 @@ -224,15 +187,10 @@ int __init board_register_devices(void)
89 /* Generate MAC address for WLAN and register our SPROM, 88 /* Generate MAC address for WLAN and register our SPROM,
90 * do this after registering enet devices 89 * do this after registering enet devices
91 */ 90 */
92 -#ifdef CONFIG_SSB_PCIHOST 91 -#ifdef CONFIG_SSB_PCIHOST