OpenWrt – Diff between revs 2 and 3
?pathlinks?
Rev 2 | Rev 3 | |||
---|---|---|---|---|
Line 1... | Line 1... | |||
1 | --- a/arch/mips/bcm63xx/Makefile |
1 | --- a/arch/mips/bcm63xx/Makefile |
|
2 | +++ b/arch/mips/bcm63xx/Makefile |
2 | +++ b/arch/mips/bcm63xx/Makefile |
|
3 | @@ -1,6 +1,6 @@ |
3 | @@ -1,6 +1,6 @@ |
|
4 | obj-y += clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.o \ |
4 | obj-y += clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.o \ |
|
5 | setup.o timer.o dev-enet.o dev-flash.o dev-pcmcia.o \ |
5 | setup.o timer.o dev-dsp.o dev-enet.o dev-flash.o \ |
|
6 | - dev-rng.o dev-uart.o dev-wdt.o \ |
6 | - dev-pcmcia.o dev-rng.o dev-uart.o \ |
|
7 | + dev-rng.o dev-wdt.o \ |
7 | + dev-pcmcia.o dev-rng.o \ |
|
8 | dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o usb-common.o \ |
8 | dev-wdt.o dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o \ |
|
9 | sprom.o |
9 | usb-common.o sprom.o |
|
10 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o |
10 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o |
|
11 | --- a/arch/mips/bcm63xx/dev-uart.c |
11 | --- a/arch/mips/bcm63xx/dev-uart.c |
|
12 | +++ /dev/null |
12 | +++ /dev/null |
|
13 | @@ -1,76 +0,0 @@ |
13 | @@ -1,76 +0,0 @@ |
|
14 | -/* |
14 | -/* |
|
Line 96... | Line 96... | |||
96 | -int bcm63xx_uart_register(unsigned int id); |
96 | -int bcm63xx_uart_register(unsigned int id); |
|
97 | - |
97 | - |
|
98 | -#endif /* BCM63XX_DEV_UART_H_ */ |
98 | -#endif /* BCM63XX_DEV_UART_H_ */ |
|
99 | --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h |
99 | --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h |
|
100 | +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h |
100 | +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h |
|
101 | @@ -31,8 +31,6 @@ struct board_info { |
101 | @@ -33,8 +33,6 @@ struct board_info { |
|
102 | unsigned int has_ohci0:1; |
- | ||
103 | unsigned int has_ehci0:1; |
102 | unsigned int has_ehci0:1; |
|
104 | unsigned int has_usbd:1; |
103 | unsigned int has_usbd:1; |
|
- | 104 | unsigned int has_dsp:1; |
||
105 | - unsigned int has_uart0:1; |
105 | - unsigned int has_uart0:1; |
|
106 | - unsigned int has_uart1:1; |
106 | - unsigned int has_uart1:1; |
|
107 | unsigned int use_fallback_sprom:1; |
107 | unsigned int use_fallback_sprom:1; |
|
Line 108... | Line 108... | |||
108 | |
108 | |
|
Line 115... | Line 115... | |||
115 | #include <bcm63xx_cpu.h> |
115 | #include <bcm63xx_cpu.h> |
|
116 | -#include <bcm63xx_dev_uart.h> |
116 | -#include <bcm63xx_dev_uart.h> |
|
117 | #include <bcm63xx_regs.h> |
117 | #include <bcm63xx_regs.h> |
|
118 | #include <bcm63xx_io.h> |
118 | #include <bcm63xx_io.h> |
|
119 | #include <bcm63xx_gpio.h> |
119 | #include <bcm63xx_gpio.h> |
|
120 | @@ -188,12 +187,6 @@ int __init board_register_devices(void) |
120 | @@ -189,12 +188,6 @@ int __init board_register_devices(void) |
|
Line 121... | Line 121... | |||
121 | |
121 | |
|
Line 122... | Line 122... | |||
122 | bcm63xx_gpio_init(); |
122 | bcm63xx_gpio_init(); |
|
123 | |
123 | |
|
Line 189... | Line 189... | |||
189 | |
189 | |
|
190 | - .has_uart0 = 1, |
190 | - .has_uart0 = 1, |
|
191 | .has_enet0 = 1, |
191 | .has_enet0 = 1, |
|
192 | .has_enet1 = 1, |
192 | .has_enet1 = 1, |
|
193 | .has_pci = 1, |
193 | .has_pci = 1, |
|
194 | @@ -315,7 +305,6 @@ static struct board_info __initdata boar |
194 | @@ -323,7 +313,6 @@ static struct board_info __initdata boar |
|
195 | .name = "96348GW-11", |
195 | .name = "96348GW-11", |
|
Line 196... | Line 196... | |||
196 | .expected_cpu_id = 0x6348, |
196 | .expected_cpu_id = 0x6348, |
|
197 | |
197 | |
|
198 | - .has_uart0 = 1, |
198 | - .has_uart0 = 1, |
|
199 | .has_enet0 = 1, |
199 | .has_enet0 = 1, |
|
200 | .has_enet1 = 1, |
200 | .has_enet1 = 1, |
|
201 | .has_pci = 1, |
201 | .has_pci = 1, |
|
202 | @@ -370,7 +359,6 @@ static struct board_info __initdata boar |
202 | @@ -378,7 +367,6 @@ static struct board_info __initdata boar |
|
Line 203... | Line 203... | |||
203 | .name = "96348GW", |
203 | .name = "96348GW", |
|
204 | .expected_cpu_id = 0x6348, |
204 | .expected_cpu_id = 0x6348, |
|
205 | |
205 | |
|
206 | - .has_uart0 = 1, |
206 | - .has_uart0 = 1, |
|
207 | .has_enet0 = 1, |
207 | .has_enet0 = 1, |
|
208 | .has_enet1 = 1, |
208 | .has_enet1 = 1, |
|
209 | .has_pci = 1, |
209 | .has_pci = 1, |
|
Line 210... | Line 210... | |||
210 | @@ -421,7 +409,6 @@ static struct board_info __initdata boar |
210 | @@ -437,7 +425,6 @@ static struct board_info __initdata boar |
|
211 | .name = "F@ST2404", |
211 | .name = "F@ST2404", |
|
212 | .expected_cpu_id = 0x6348, |
212 | .expected_cpu_id = 0x6348, |
|
213 | |
213 | |
|
214 | - .has_uart0 = 1, |
214 | - .has_uart0 = 1, |
|
215 | .has_enet0 = 1, |
215 | .has_enet0 = 1, |
|
216 | .has_enet1 = 1, |
216 | .has_enet1 = 1, |
|
Line 217... | Line 217... | |||
217 | .has_pci = 1, |
217 | .has_pci = 1, |
|
218 | @@ -466,7 +453,6 @@ static struct board_info __initdata boar |
218 | @@ -482,7 +469,6 @@ static struct board_info __initdata boar |
|
219 | .name = "DV201AMR", |
219 | .name = "DV201AMR", |
|
220 | .expected_cpu_id = 0x6348, |
220 | .expected_cpu_id = 0x6348, |
|
221 | |
221 | |
|
222 | - .has_uart0 = 1, |
222 | - .has_uart0 = 1, |
|
223 | .has_pci = 1, |
223 | .has_pci = 1, |
|
Line 224... | Line 224... | |||
224 | .use_fallback_sprom = 1, |
224 | .use_fallback_sprom = 1, |
|
225 | .has_ohci0 = 1, |
225 | .has_ohci0 = 1, |
|
226 | @@ -487,7 +473,6 @@ static struct board_info __initdata boar |
226 | @@ -503,7 +489,6 @@ static struct board_info __initdata boar |
|
227 | .name = "96348GW-A", |
227 | .name = "96348GW-A", |
|
228 | .expected_cpu_id = 0x6348, |
228 | .expected_cpu_id = 0x6348, |
|
229 | |
229 | |
|
230 | - .has_uart0 = 1, |
230 | - .has_uart0 = 1, |
|
Line 231... | Line 231... | |||
231 | .has_enet0 = 1, |
231 | .has_enet0 = 1, |
|
232 | .has_enet1 = 1, |
232 | .has_enet1 = 1, |
|
233 | .has_pci = 1, |
233 | .has_pci = 1, |
|
234 | @@ -514,7 +499,6 @@ static struct board_info __initdata boar |
234 | @@ -530,7 +515,6 @@ static struct board_info __initdata boar |
|
235 | .name = "96358VW", |
235 | .name = "96358VW", |
|
236 | .expected_cpu_id = 0x6358, |
236 | .expected_cpu_id = 0x6358, |
|
237 | |
237 | |
|
Line 238... | Line 238... | |||
238 | - .has_uart0 = 1, |
238 | - .has_uart0 = 1, |
|
239 | .has_enet0 = 1, |
239 | .has_enet0 = 1, |
|
240 | .has_enet1 = 1, |
240 | .has_enet1 = 1, |
|
241 | .has_pci = 1, |
241 | .has_pci = 1, |
|
242 | @@ -567,7 +551,6 @@ static struct board_info __initdata boar |
242 | @@ -583,7 +567,6 @@ static struct board_info __initdata boar |
|
243 | .name = "96358VW2", |
243 | .name = "96358VW2", |
|
244 | .expected_cpu_id = 0x6358, |
244 | .expected_cpu_id = 0x6358, |
|
Line 245... | Line 245... | |||
245 | |
245 | |
|
246 | - .has_uart0 = 1, |
246 | - .has_uart0 = 1, |