diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2009-10-22 12:41:41 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2009-11-16 10:56:21 -0500 |
commit | c4e4ab9f23d26498a01316428d710833fb96f214 (patch) | |
tree | 0b2d6e57b6afdff8d1637eb789a383d59fa1fb3c | |
parent | fdcad71cef68529a1f54331f533763ca53814f96 (diff) |
at91: remove not needed depends on
Those "depends on" are a double check as all machine entries are
surrounded by "if <ARCH_xxx>" conditions.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Andrew Victor <linux@maxim.org.za>
-rw-r--r-- | arch/arm/mach-at91/Kconfig | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 2fd88437348b..4301c6bad80c 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig | |||
@@ -76,89 +76,76 @@ comment "AT91RM9200 Board Type" | |||
76 | 76 | ||
77 | config MACH_ONEARM | 77 | config MACH_ONEARM |
78 | bool "Ajeco 1ARM Single Board Computer" | 78 | bool "Ajeco 1ARM Single Board Computer" |
79 | depends on ARCH_AT91RM9200 | ||
80 | help | 79 | help |
81 | Select this if you are using Ajeco's 1ARM Single Board Computer. | 80 | Select this if you are using Ajeco's 1ARM Single Board Computer. |
82 | <http://www.ajeco.fi/products.htm> | 81 | <http://www.ajeco.fi/products.htm> |
83 | 82 | ||
84 | config ARCH_AT91RM9200DK | 83 | config ARCH_AT91RM9200DK |
85 | bool "Atmel AT91RM9200-DK Development board" | 84 | bool "Atmel AT91RM9200-DK Development board" |
86 | depends on ARCH_AT91RM9200 | ||
87 | help | 85 | help |
88 | Select this if you are using Atmel's AT91RM9200-DK Development board. | 86 | Select this if you are using Atmel's AT91RM9200-DK Development board. |
89 | (Discontinued) | 87 | (Discontinued) |
90 | 88 | ||
91 | config MACH_AT91RM9200EK | 89 | config MACH_AT91RM9200EK |
92 | bool "Atmel AT91RM9200-EK Evaluation Kit" | 90 | bool "Atmel AT91RM9200-EK Evaluation Kit" |
93 | depends on ARCH_AT91RM9200 | ||
94 | help | 91 | help |
95 | Select this if you are using Atmel's AT91RM9200-EK Evaluation Kit. | 92 | Select this if you are using Atmel's AT91RM9200-EK Evaluation Kit. |
96 | <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3507> | 93 | <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3507> |
97 | 94 | ||
98 | config MACH_CSB337 | 95 | config MACH_CSB337 |
99 | bool "Cogent CSB337" | 96 | bool "Cogent CSB337" |
100 | depends on ARCH_AT91RM9200 | ||
101 | help | 97 | help |
102 | Select this if you are using Cogent's CSB337 board. | 98 | Select this if you are using Cogent's CSB337 board. |
103 | <http://www.cogcomp.com/csb_csb337.htm> | 99 | <http://www.cogcomp.com/csb_csb337.htm> |
104 | 100 | ||
105 | config MACH_CSB637 | 101 | config MACH_CSB637 |
106 | bool "Cogent CSB637" | 102 | bool "Cogent CSB637" |
107 | depends on ARCH_AT91RM9200 | ||
108 | help | 103 | help |
109 | Select this if you are using Cogent's CSB637 board. | 104 | Select this if you are using Cogent's CSB637 board. |
110 | <http://www.cogcomp.com/csb_csb637.htm> | 105 | <http://www.cogcomp.com/csb_csb637.htm> |
111 | 106 | ||
112 | config MACH_CARMEVA | 107 | config MACH_CARMEVA |
113 | bool "Conitec ARM&EVA" | 108 | bool "Conitec ARM&EVA" |
114 | depends on ARCH_AT91RM9200 | ||
115 | help | 109 | help |
116 | Select this if you are using Conitec's AT91RM9200-MCU-Module. | 110 | Select this if you are using Conitec's AT91RM9200-MCU-Module. |
117 | <http://www.conitec.net/english/linuxboard.htm> | 111 | <http://www.conitec.net/english/linuxboard.htm> |
118 | 112 | ||
119 | config MACH_ATEB9200 | 113 | config MACH_ATEB9200 |
120 | bool "Embest ATEB9200" | 114 | bool "Embest ATEB9200" |
121 | depends on ARCH_AT91RM9200 | ||
122 | help | 115 | help |
123 | Select this if you are using Embest's ATEB9200 board. | 116 | Select this if you are using Embest's ATEB9200 board. |
124 | <http://www.embedinfo.com/english/product/ATEB9200.asp> | 117 | <http://www.embedinfo.com/english/product/ATEB9200.asp> |
125 | 118 | ||
126 | config MACH_KB9200 | 119 | config MACH_KB9200 |
127 | bool "KwikByte KB920x" | 120 | bool "KwikByte KB920x" |
128 | depends on ARCH_AT91RM9200 | ||
129 | help | 121 | help |
130 | Select this if you are using KwikByte's KB920x board. | 122 | Select this if you are using KwikByte's KB920x board. |
131 | <http://kwikbyte.com/KB9202_description_new.htm> | 123 | <http://kwikbyte.com/KB9202_description_new.htm> |
132 | 124 | ||
133 | config MACH_PICOTUX2XX | 125 | config MACH_PICOTUX2XX |
134 | bool "picotux 200" | 126 | bool "picotux 200" |
135 | depends on ARCH_AT91RM9200 | ||
136 | help | 127 | help |
137 | Select this if you are using a picotux 200. | 128 | Select this if you are using a picotux 200. |
138 | <http://www.picotux.com/> | 129 | <http://www.picotux.com/> |
139 | 130 | ||
140 | config MACH_KAFA | 131 | config MACH_KAFA |
141 | bool "Sperry-Sun KAFA board" | 132 | bool "Sperry-Sun KAFA board" |
142 | depends on ARCH_AT91RM9200 | ||
143 | help | 133 | help |
144 | Select this if you are using Sperry-Sun's KAFA board. | 134 | Select this if you are using Sperry-Sun's KAFA board. |
145 | 135 | ||
146 | config MACH_ECBAT91 | 136 | config MACH_ECBAT91 |
147 | bool "emQbit ECB_AT91 SBC" | 137 | bool "emQbit ECB_AT91 SBC" |
148 | depends on ARCH_AT91RM9200 | ||
149 | help | 138 | help |
150 | Select this if you are using emQbit's ECB_AT91 board. | 139 | Select this if you are using emQbit's ECB_AT91 board. |
151 | <http://wiki.emqbit.com/free-ecb-at91> | 140 | <http://wiki.emqbit.com/free-ecb-at91> |
152 | 141 | ||
153 | config MACH_YL9200 | 142 | config MACH_YL9200 |
154 | bool "ucDragon YL-9200" | 143 | bool "ucDragon YL-9200" |
155 | depends on ARCH_AT91RM9200 | ||
156 | help | 144 | help |
157 | Select this if you are using the ucDragon YL-9200 board. | 145 | Select this if you are using the ucDragon YL-9200 board. |
158 | 146 | ||
159 | config MACH_CPUAT91 | 147 | config MACH_CPUAT91 |
160 | bool "Eukrea CPUAT91" | 148 | bool "Eukrea CPUAT91" |
161 | depends on ARCH_AT91RM9200 | ||
162 | help | 149 | help |
163 | Select this if you are using the Eukrea Electromatique's | 150 | Select this if you are using the Eukrea Electromatique's |
164 | CPUAT91 board <http://www.eukrea.com/>. | 151 | CPUAT91 board <http://www.eukrea.com/>. |
@@ -173,7 +160,6 @@ comment "AT91SAM9260 Variants" | |||
173 | 160 | ||
174 | config ARCH_AT91SAM9260_SAM9XE | 161 | config ARCH_AT91SAM9260_SAM9XE |
175 | bool "AT91SAM9XE" | 162 | bool "AT91SAM9XE" |
176 | depends on ARCH_AT91SAM9260 | ||
177 | help | 163 | help |
178 | Select this if you are using Atmel's AT91SAM9XE System-on-Chip. | 164 | Select this if you are using Atmel's AT91SAM9XE System-on-Chip. |
179 | They are basically AT91SAM9260s with various sizes of embedded Flash. | 165 | They are basically AT91SAM9260s with various sizes of embedded Flash. |
@@ -182,28 +168,24 @@ comment "AT91SAM9260 / AT91SAM9XE Board Type" | |||
182 | 168 | ||
183 | config MACH_AT91SAM9260EK | 169 | config MACH_AT91SAM9260EK |
184 | bool "Atmel AT91SAM9260-EK / AT91SAM9XE Evaluation Kit" | 170 | bool "Atmel AT91SAM9260-EK / AT91SAM9XE Evaluation Kit" |
185 | depends on ARCH_AT91SAM9260 | ||
186 | help | 171 | help |
187 | Select this if you are using Atmel's AT91SAM9260-EK or AT91SAM9XE Evaluation Kit | 172 | Select this if you are using Atmel's AT91SAM9260-EK or AT91SAM9XE Evaluation Kit |
188 | <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3933> | 173 | <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3933> |
189 | 174 | ||
190 | config MACH_CAM60 | 175 | config MACH_CAM60 |
191 | bool "KwikByte KB9260 (CAM60) board" | 176 | bool "KwikByte KB9260 (CAM60) board" |
192 | depends on ARCH_AT91SAM9260 | ||
193 | help | 177 | help |
194 | Select this if you are using KwikByte's KB9260 (CAM60) board based on the Atmel AT91SAM9260. | 178 | Select this if you are using KwikByte's KB9260 (CAM60) board based on the Atmel AT91SAM9260. |
195 | <http://www.kwikbyte.com/KB9260.html> | 179 | <http://www.kwikbyte.com/KB9260.html> |
196 | 180 | ||
197 | config MACH_SAM9_L9260 | 181 | config MACH_SAM9_L9260 |
198 | bool "Olimex SAM9-L9260 board" | 182 | bool "Olimex SAM9-L9260 board" |
199 | depends on ARCH_AT91SAM9260 | ||
200 | help | 183 | help |
201 | Select this if you are using Olimex's SAM9-L9260 board based on the Atmel AT91SAM9260. | 184 | Select this if you are using Olimex's SAM9-L9260 board based on the Atmel AT91SAM9260. |
202 | <http://www.olimex.com/dev/sam9-L9260.html> | 185 | <http://www.olimex.com/dev/sam9-L9260.html> |
203 | 186 | ||
204 | config MACH_AFEB9260 | 187 | config MACH_AFEB9260 |
205 | bool "Custom afeb9260 board v1" | 188 | bool "Custom afeb9260 board v1" |
206 | depends on ARCH_AT91SAM9260 | ||
207 | help | 189 | help |
208 | Select this if you are using custom afeb9260 board based on | 190 | Select this if you are using custom afeb9260 board based on |
209 | open hardware design. Select this for revision 1 of the board. | 191 | open hardware design. Select this for revision 1 of the board. |
@@ -212,21 +194,18 @@ config MACH_AFEB9260 | |||
212 | 194 | ||
213 | config MACH_USB_A9260 | 195 | config MACH_USB_A9260 |
214 | bool "CALAO USB-A9260" | 196 | bool "CALAO USB-A9260" |
215 | depends on ARCH_AT91SAM9260 | ||
216 | help | 197 | help |
217 | Select this if you are using a Calao Systems USB-A9260. | 198 | Select this if you are using a Calao Systems USB-A9260. |
218 | <http://www.calao-systems.com> | 199 | <http://www.calao-systems.com> |
219 | 200 | ||
220 | config MACH_QIL_A9260 | 201 | config MACH_QIL_A9260 |
221 | bool "CALAO QIL-A9260 board" | 202 | bool "CALAO QIL-A9260 board" |
222 | depends on ARCH_AT91SAM9260 | ||
223 | help | 203 | help |
224 | Select this if you are using a Calao Systems QIL-A9260 Board. | 204 | Select this if you are using a Calao Systems QIL-A9260 Board. |
225 | <http://www.calao-systems.com> | 205 | <http://www.calao-systems.com> |
226 | 206 | ||
227 | config MACH_CPU9260 | 207 | config MACH_CPU9260 |
228 | bool "Eukrea CPU9260 board" | 208 | bool "Eukrea CPU9260 board" |
229 | depends on ARCH_AT91SAM9260 | ||
230 | help | 209 | help |
231 | Select this if you are using a Eukrea Electromatique's | 210 | Select this if you are using a Eukrea Electromatique's |
232 | CPU9260 Board <http://www.eukrea.com/> | 211 | CPU9260 Board <http://www.eukrea.com/> |
@@ -241,7 +220,6 @@ comment "AT91SAM9261 Board Type" | |||
241 | 220 | ||
242 | config MACH_AT91SAM9261EK | 221 | config MACH_AT91SAM9261EK |
243 | bool "Atmel AT91SAM9261-EK Evaluation Kit" | 222 | bool "Atmel AT91SAM9261-EK Evaluation Kit" |
244 | depends on ARCH_AT91SAM9261 | ||
245 | help | 223 | help |
246 | Select this if you are using Atmel's AT91SAM9261-EK Evaluation Kit. | 224 | Select this if you are using Atmel's AT91SAM9261-EK Evaluation Kit. |
247 | <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3820> | 225 | <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3820> |
@@ -256,7 +234,6 @@ comment "AT91SAM9G10 Board Type" | |||
256 | 234 | ||
257 | config MACH_AT91SAM9G10EK | 235 | config MACH_AT91SAM9G10EK |
258 | bool "Atmel AT91SAM9G10-EK Evaluation Kit" | 236 | bool "Atmel AT91SAM9G10-EK Evaluation Kit" |
259 | depends on ARCH_AT91SAM9G10 | ||
260 | help | 237 | help |
261 | Select this if you are using Atmel's AT91SAM9G10-EK Evaluation Kit. | 238 | Select this if you are using Atmel's AT91SAM9G10-EK Evaluation Kit. |
262 | <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4588> | 239 | <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4588> |
@@ -271,21 +248,18 @@ comment "AT91SAM9263 Board Type" | |||
271 | 248 | ||
272 | config MACH_AT91SAM9263EK | 249 | config MACH_AT91SAM9263EK |
273 | bool "Atmel AT91SAM9263-EK Evaluation Kit" | 250 | bool "Atmel AT91SAM9263-EK Evaluation Kit" |
274 | depends on ARCH_AT91SAM9263 | ||
275 | help | 251 | help |
276 | Select this if you are using Atmel's AT91SAM9263-EK Evaluation Kit. | 252 | Select this if you are using Atmel's AT91SAM9263-EK Evaluation Kit. |
277 | <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4057> | 253 | <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4057> |
278 | 254 | ||
279 | config MACH_USB_A9263 | 255 | config MACH_USB_A9263 |
280 | bool "CALAO USB-A9263" | 256 | bool "CALAO USB-A9263" |
281 | depends on ARCH_AT91SAM9263 | ||
282 | help | 257 | help |
283 | Select this if you are using a Calao Systems USB-A9263. | 258 | Select this if you are using a Calao Systems USB-A9263. |
284 | <http://www.calao-systems.com> | 259 | <http://www.calao-systems.com> |
285 | 260 | ||
286 | config MACH_NEOCORE926 | 261 | config MACH_NEOCORE926 |
287 | bool "Adeneo NEOCORE926" | 262 | bool "Adeneo NEOCORE926" |
288 | depends on ARCH_AT91SAM9263 | ||
289 | help | 263 | help |
290 | Select this if you are using the Adeneo Neocore 926 board. | 264 | Select this if you are using the Adeneo Neocore 926 board. |
291 | 265 | ||
@@ -299,7 +273,6 @@ comment "AT91SAM9RL Board Type" | |||
299 | 273 | ||
300 | config MACH_AT91SAM9RLEK | 274 | config MACH_AT91SAM9RLEK |
301 | bool "Atmel AT91SAM9RL-EK Evaluation Kit" | 275 | bool "Atmel AT91SAM9RL-EK Evaluation Kit" |
302 | depends on ARCH_AT91SAM9RL | ||
303 | help | 276 | help |
304 | Select this if you are using Atmel's AT91SAM9RL-EK Evaluation Kit. | 277 | Select this if you are using Atmel's AT91SAM9RL-EK Evaluation Kit. |
305 | 278 | ||
@@ -313,14 +286,12 @@ comment "AT91SAM9G20 Board Type" | |||
313 | 286 | ||
314 | config MACH_AT91SAM9G20EK | 287 | config MACH_AT91SAM9G20EK |
315 | bool "Atmel AT91SAM9G20-EK Evaluation Kit" | 288 | bool "Atmel AT91SAM9G20-EK Evaluation Kit" |
316 | depends on ARCH_AT91SAM9G20 | ||
317 | help | 289 | help |
318 | Select this if you are using Atmel's AT91SAM9G20-EK Evaluation Kit | 290 | Select this if you are using Atmel's AT91SAM9G20-EK Evaluation Kit |
319 | that embeds only one SD/MMC slot. | 291 | that embeds only one SD/MMC slot. |
320 | 292 | ||
321 | config MACH_AT91SAM9G20EK_2MMC | 293 | config MACH_AT91SAM9G20EK_2MMC |
322 | bool "Atmel AT91SAM9G20-EK Evaluation Kit with 2 SD/MMC Slots" | 294 | bool "Atmel AT91SAM9G20-EK Evaluation Kit with 2 SD/MMC Slots" |
323 | depends on ARCH_AT91SAM9G20 | ||
324 | help | 295 | help |
325 | Select this if you are using an Atmel AT91SAM9G20-EK Evaluation Kit | 296 | Select this if you are using an Atmel AT91SAM9G20-EK Evaluation Kit |
326 | with 2 SD/MMC Slots. This is the case for AT91SAM9G20-EK rev. C and | 297 | with 2 SD/MMC Slots. This is the case for AT91SAM9G20-EK rev. C and |
@@ -328,7 +299,6 @@ config MACH_AT91SAM9G20EK_2MMC | |||
328 | 299 | ||
329 | config MACH_CPU9G20 | 300 | config MACH_CPU9G20 |
330 | bool "Eukrea CPU9G20 board" | 301 | bool "Eukrea CPU9G20 board" |
331 | depends on ARCH_AT91SAM9G20 | ||
332 | help | 302 | help |
333 | Select this if you are using a Eukrea Electromatique's | 303 | Select this if you are using a Eukrea Electromatique's |
334 | CPU9G20 Board <http://www.eukrea.com/> | 304 | CPU9G20 Board <http://www.eukrea.com/> |
@@ -343,7 +313,6 @@ comment "AT91SAM9G45 Board Type" | |||
343 | 313 | ||
344 | config MACH_AT91SAM9G45EKES | 314 | config MACH_AT91SAM9G45EKES |
345 | bool "Atmel AT91SAM9G45-EKES Evaluation Kit" | 315 | bool "Atmel AT91SAM9G45-EKES Evaluation Kit" |
346 | depends on ARCH_AT91SAM9G45 | ||
347 | help | 316 | help |
348 | Select this if you are using Atmel's AT91SAM9G45-EKES Evaluation Kit. | 317 | Select this if you are using Atmel's AT91SAM9G45-EKES Evaluation Kit. |
349 | "ES" at the end of the name means that this board is an | 318 | "ES" at the end of the name means that this board is an |
@@ -359,7 +328,6 @@ comment "AT91CAP9 Board Type" | |||
359 | 328 | ||
360 | config MACH_AT91CAP9ADK | 329 | config MACH_AT91CAP9ADK |
361 | bool "Atmel AT91CAP9A-DK Evaluation Kit" | 330 | bool "Atmel AT91CAP9A-DK Evaluation Kit" |
362 | depends on ARCH_AT91CAP9 | ||
363 | help | 331 | help |
364 | Select this if you are using Atmel's AT91CAP9A-DK Evaluation Kit. | 332 | Select this if you are using Atmel's AT91CAP9A-DK Evaluation Kit. |
365 | <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4138> | 333 | <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4138> |