OpenWrt – Diff between revs 2 and 3
?pathlinks?
Rev 2 | Rev 3 | |||
---|---|---|---|---|
Line 16... | Line 16... | |||
16 | create mode 100644 arch/mips/include/asm/mach-bcm63xx/pci_rt2x00_fixup.h |
16 | create mode 100644 arch/mips/include/asm/mach-bcm63xx/pci_rt2x00_fixup.h |
|
Line 17... | Line 17... | |||
17 | |
17 | |
|
18 | --- a/arch/mips/bcm63xx/Makefile |
18 | --- a/arch/mips/bcm63xx/Makefile |
|
19 | +++ b/arch/mips/bcm63xx/Makefile |
19 | +++ b/arch/mips/bcm63xx/Makefile |
|
20 | @@ -3,7 +3,7 @@ obj-y += clk.o cpu.o cs.o gpio.o irq.o |
20 | @@ -3,7 +3,7 @@ obj-y += clk.o cpu.o cs.o gpio.o irq.o |
|
21 | setup.o timer.o dev-enet.o dev-flash.o dev-pcmcia.o \ |
21 | setup.o timer.o dev-dsp.o dev-enet.o dev-flash.o \ |
|
22 | dev-rng.o dev-wdt.o \ |
22 | dev-pcmcia.o dev-rng.o \ |
|
23 | dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o usb-common.o \ |
23 | dev-wdt.o dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o \ |
|
24 | - pci-ath9k-fixup.o sprom.o |
24 | - pci-ath9k-fixup.o usb-common.o sprom.o |
|
25 | + pci-ath9k-fixup.o pci-rt2x00-fixup.o sprom.o |
25 | + pci-ath9k-fixup.o pci-rt2x00-fixup.o usb-common.o sprom.o |
|
Line 26... | Line 26... | |||
26 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o |
26 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o |
|
27 | |
27 | |
|
28 | obj-y += boards/ |
28 | obj-y += boards/ |
|
29 | --- a/arch/mips/bcm63xx/boards/board_common.c |
29 | --- a/arch/mips/bcm63xx/boards/board_common.c |
|
30 | +++ b/arch/mips/bcm63xx/boards/board_common.c |
30 | +++ b/arch/mips/bcm63xx/boards/board_common.c |
|
31 | @@ -32,6 +32,7 @@ |
31 | @@ -33,6 +33,7 @@ |
|
32 | #include <bcm63xx_dev_usb_usbd.h> |
32 | #include <bcm63xx_dev_usb_usbd.h> |
|
33 | #include <board_bcm963xx.h> |
33 | #include <board_bcm963xx.h> |
|
Line 34... | Line 34... | |||
34 | #include <pci_ath9k_fixup.h> |
34 | #include <pci_ath9k_fixup.h> |
|
Line 35... | Line 35... | |||
35 | +#include <pci_rt2x00_fixup.h> |
35 | +#include <pci_rt2x00_fixup.h> |
|
36 | |
36 | |
|
Line 37... | Line 37... | |||
37 | #include "board_common.h" |
37 | #include "board_common.h" |
|
38 | |
38 | |
|
39 | @@ -244,9 +245,19 @@ int __init board_register_devices(void) |
39 | @@ -248,9 +249,19 @@ int __init board_register_devices(void) |
|
Line 134... | Line 134... | |||
134 | + rt2x00_num_fixups++; |
134 | + rt2x00_num_fixups++; |
|
135 | +} |
135 | +} |
|
136 | + |
136 | + |
|
137 | --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h |
137 | --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h |
|
138 | +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h |
138 | +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h |
|
139 | @@ -10,6 +10,7 @@ |
139 | @@ -11,6 +11,7 @@ |
|
140 | #include <bcm63xx_dev_usb_usbd.h> |
140 | #include <bcm63xx_dev_dsp.h> |
|
141 | #include <bcm63xx_fallback_sprom.h> |
141 | #include <bcm63xx_fallback_sprom.h> |
|
142 | #include <pci_ath9k_fixup.h> |
142 | #include <pci_ath9k_fixup.h> |
|
143 | +#include <pci_rt2x00_fixup.h> |
143 | +#include <pci_rt2x00_fixup.h> |
|
Line 144... | Line 144... | |||
144 | |
144 | |
|
145 | /* |
145 | /* |
|
146 | * flash mapping |
146 | * flash mapping |
|
147 | @@ -17,12 +18,16 @@ |
147 | @@ -18,12 +19,16 @@ |
|
148 | #define BCM963XX_CFE_VERSION_OFFSET 0x570 |
148 | #define BCM963XX_CFE_VERSION_OFFSET 0x570 |
|
Line 149... | Line 149... | |||
149 | #define BCM963XX_NVRAM_OFFSET 0x580 |
149 | #define BCM963XX_NVRAM_OFFSET 0x580 |
|
150 | |
150 | |
|
Line 160... | Line 160... | |||
160 | + /* Ralink */ |
160 | + /* Ralink */ |
|
161 | + char* eeprom; |
161 | + char* eeprom; |
|
162 | }; |
162 | }; |
|
Line 163... | Line 163... | |||
163 | |
163 | |
|
164 | /* |
164 | /* |
|
165 | @@ -45,7 +50,7 @@ struct board_info { |
165 | @@ -47,7 +52,7 @@ struct board_info { |
|
Line 166... | Line 166... | |||
166 | unsigned int has_caldata:2; |
166 | unsigned int has_caldata:2; |
|
167 | |
167 | |
|
168 | /* wifi calibration data config */ |
168 | /* wifi calibration data config */ |