OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 40... Line 40...
40 .has_pci = 1, 40 .has_pci = 1,
41 + .use_fallback_sprom = 1, 41 + .use_fallback_sprom = 1,
Line 42... Line 42...
42 42
43 .enet0 = { 43 .enet0 = {
44 .has_phy = 1, 44 .has_phy = 1,
45 @@ -316,6 +319,7 @@ static struct board_info __initdata boar 45 @@ -324,6 +327,7 @@ static struct board_info __initdata boar
46 .has_enet0 = 1, 46 .has_enet0 = 1,
47 .has_enet1 = 1, 47 .has_enet1 = 1,
48 .has_pci = 1, 48 .has_pci = 1,
Line 49... Line 49...
49 + .use_fallback_sprom = 1, 49 + .use_fallback_sprom = 1,
50 50
51 .enet0 = { 51 .enet0 = {
52 .has_phy = 1, 52 .has_phy = 1,
53 @@ -370,6 +374,7 @@ static struct board_info __initdata boar 53 @@ -378,6 +382,7 @@ static struct board_info __initdata boar
54 .has_enet0 = 1, 54 .has_enet0 = 1,
55 .has_enet1 = 1, 55 .has_enet1 = 1,
Line 56... Line 56...
56 .has_pci = 1, 56 .has_pci = 1,
57 + .use_fallback_sprom = 1, 57 + .use_fallback_sprom = 1,
58 58
59 .enet0 = { 59 .enet0 = {
60 .has_phy = 1, 60 .has_phy = 1,
61 @@ -420,6 +425,7 @@ static struct board_info __initdata boar 61 @@ -436,6 +441,7 @@ static struct board_info __initdata boar
62 .has_enet0 = 1, 62 .has_enet0 = 1,
Line 63... Line 63...
63 .has_enet1 = 1, 63 .has_enet1 = 1,
64 .has_pci = 1, 64 .has_pci = 1,
65 + .use_fallback_sprom = 1, 65 + .use_fallback_sprom = 1,
66 66
67 .enet0 = { 67 .enet0 = {
68 .has_phy = 1, 68 .has_phy = 1,
69 @@ -443,6 +449,7 @@ static struct board_info __initdata boar 69 @@ -459,6 +465,7 @@ static struct board_info __initdata boar
Line 70... Line 70...
70 .has_enet0 = 1, 70 .has_enet0 = 1,
71 .has_enet1 = 1, 71 .has_enet1 = 1,
72 .has_pci = 1, 72 .has_pci = 1,
Line 73... Line 73...
73 + .use_fallback_sprom = 1, 73 + .use_fallback_sprom = 1,
74 74
75 .enet0 = { 75 .enet0 = {
76 .has_phy = 1, 76 .has_phy = 1,
Line 77... Line 77...
77 @@ -461,6 +468,7 @@ static struct board_info __initdata boar 77 @@ -477,6 +484,7 @@ static struct board_info __initdata boar
78 78
79 .has_uart0 = 1, 79 .has_uart0 = 1,
80 .has_pci = 1, 80 .has_pci = 1,
81 + .use_fallback_sprom = 1, 81 + .use_fallback_sprom = 1,
82 .has_ohci0 = 1, 82 .has_ohci0 = 1,
Line 83... Line 83...
83 83
84 .has_enet0 = 1, 84 .has_enet0 = 1,
85 @@ -483,6 +491,7 @@ static struct board_info __initdata boar 85 @@ -499,6 +507,7 @@ static struct board_info __initdata boar
86 .has_enet0 = 1, 86 .has_enet0 = 1,
87 .has_enet1 = 1, 87 .has_enet1 = 1,
88 .has_pci = 1, 88 .has_pci = 1,
89 + .use_fallback_sprom = 1, 89 + .use_fallback_sprom = 1,
Line 90... Line 90...
90 90
91 .enet0 = { 91 .enet0 = {
92 .has_phy = 1, 92 .has_phy = 1,
93 @@ -509,6 +518,7 @@ static struct board_info __initdata boar 93 @@ -525,6 +534,7 @@ static struct board_info __initdata boar
94 .has_enet0 = 1, 94 .has_enet0 = 1,
95 .has_enet1 = 1, 95 .has_enet1 = 1,
96 .has_pci = 1, 96 .has_pci = 1,
Line 97... Line 97...
97 + .use_fallback_sprom = 1, 97 + .use_fallback_sprom = 1,
98 98
99 .enet0 = { 99 .enet0 = {
100 .has_phy = 1, 100 .has_phy = 1,
101 @@ -561,6 +571,7 @@ static struct board_info __initdata boar 101 @@ -577,6 +587,7 @@ static struct board_info __initdata boar
102 .has_enet0 = 1, 102 .has_enet0 = 1,
103 .has_enet1 = 1, 103 .has_enet1 = 1,
Line 104... Line 104...
104 .has_pci = 1, 104 .has_pci = 1,
105 + .use_fallback_sprom = 1, 105 + .use_fallback_sprom = 1,
106 106
107 .enet0 = { 107 .enet0 = {
108 .has_phy = 1, 108 .has_phy = 1,
109 @@ -632,6 +643,7 @@ static struct board_info __initdata boar 109 @@ -648,6 +659,7 @@ static struct board_info __initdata boar
110 .has_enet0 = 1, 110 .has_enet0 = 1,
Line 111... Line 111...
111 .has_enet1 = 1, 111 .has_enet1 = 1,
112 .has_pci = 1, 112 .has_pci = 1,
Line 128... Line 128...
128 pr_err(PFX "failed to register fallback SPROM\n"); 128 pr_err(PFX "failed to register fallback SPROM\n");
Line 129... Line 129...
129 129
130 bcm63xx_spi_register(); 130 bcm63xx_spi_register();
131 --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 131 --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
132 +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 132 +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
133 @@ -32,6 +32,7 @@ struct board_info { 133 @@ -34,6 +34,7 @@ struct board_info {
134 unsigned int has_usbd:1; 134 unsigned int has_dsp:1;
135 unsigned int has_uart0:1; 135 unsigned int has_uart0:1;
136 unsigned int has_uart1:1; 136 unsigned int has_uart1:1;
Line 137... Line 137...
137 + unsigned int use_fallback_sprom:1; 137 + unsigned int use_fallback_sprom:1;