aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-10-26 06:55:14 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-11-27 07:38:00 -0500
commitc750815e2d436f4379c7af8a8770ef2ae71c5607 (patch)
treea63ddc8af77e0cd86aa837bc77f98a1c18fbc685
parent59f0cb0fddc14ffc6676ae62e911f8115ebc8ccf (diff)
[ARM] Arrange for platforms to select appropriate CPU support
Rather than: config CPU_BLAH bool depends on ARCH_FOO || MACH_BAR default y if ARCH_FOO || MACH_BAR arrange for ARCH_FOO and MACH_BAR to select CPU_BLAH directly. Acked-by: Nicolas Pitre <nico@marvell.com> Acked-by: Andrew Victor <linux@maxim.org.za> Acked-by: Brian Swetland <swetland@google.com> Acked-by: Eric Miao <eric.miao@marvell.com> Acked-by: Nicolas Bellido <ml@acolin.be> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat
-rw-r--r--arch/arm/Kconfig28
-rw-r--r--arch/arm/mach-at91/Kconfig7
-rw-r--r--arch/arm/mach-omap1/Kconfig3
-rw-r--r--arch/arm/mach-pxa/Kconfig3
-rw-r--r--arch/arm/mach-realview/Kconfig2
-rw-r--r--arch/arm/mach-s3c2410/Kconfig1
-rw-r--r--arch/arm/mach-s3c2412/Kconfig1
-rw-r--r--arch/arm/mach-s3c2440/Kconfig1
-rw-r--r--arch/arm/mach-s3c2442/Kconfig1
-rw-r--r--arch/arm/mach-versatile/Kconfig2
-rw-r--r--arch/arm/mm/Kconfig65
-rw-r--r--arch/arm/plat-mxc/Kconfig2
-rw-r--r--arch/arm/plat-omap/Kconfig2
13 files changed, 65 insertions, 53 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 9722f8bb506c..60a09fcc4af8 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -201,6 +201,7 @@ choice
201 201
202config ARCH_AAEC2000 202config ARCH_AAEC2000
203 bool "Agilent AAEC-2000 based" 203 bool "Agilent AAEC-2000 based"
204 select CPU_ARM920T
204 select ARM_AMBA 205 select ARM_AMBA
205 select HAVE_CLK 206 select HAVE_CLK
206 help 207 help
@@ -245,6 +246,7 @@ config ARCH_AT91
245 246
246config ARCH_CLPS7500 247config ARCH_CLPS7500
247 bool "Cirrus CL-PS7500FE" 248 bool "Cirrus CL-PS7500FE"
249 select CPU_ARM710
248 select TIMER_ACORN 250 select TIMER_ACORN
249 select ISA 251 select ISA
250 select NO_IOPORT 252 select NO_IOPORT
@@ -254,11 +256,13 @@ config ARCH_CLPS7500
254 256
255config ARCH_CLPS711X 257config ARCH_CLPS711X
256 bool "Cirrus Logic CLPS711x/EP721x-based" 258 bool "Cirrus Logic CLPS711x/EP721x-based"
259 select CPU_ARM720T
257 help 260 help
258 Support for Cirrus Logic 711x/721x based boards. 261 Support for Cirrus Logic 711x/721x based boards.
259 262
260config ARCH_EBSA110 263config ARCH_EBSA110
261 bool "EBSA-110" 264 bool "EBSA-110"
265 select CPU_SA110
262 select ISA 266 select ISA
263 select NO_IOPORT 267 select NO_IOPORT
264 help 268 help
@@ -269,6 +273,7 @@ config ARCH_EBSA110
269 273
270config ARCH_EP93XX 274config ARCH_EP93XX
271 bool "EP93xx-based" 275 bool "EP93xx-based"
276 select CPU_ARM920T
272 select ARM_AMBA 277 select ARM_AMBA
273 select ARM_VIC 278 select ARM_VIC
274 select GENERIC_GPIO 279 select GENERIC_GPIO
@@ -279,6 +284,7 @@ config ARCH_EP93XX
279 284
280config ARCH_FOOTBRIDGE 285config ARCH_FOOTBRIDGE
281 bool "FootBridge" 286 bool "FootBridge"
287 select CPU_SA110
282 select FOOTBRIDGE 288 select FOOTBRIDGE
283 help 289 help
284 Support for systems based on the DC21285 companion chip 290 Support for systems based on the DC21285 companion chip
@@ -286,18 +292,21 @@ config ARCH_FOOTBRIDGE
286 292
287config ARCH_NETX 293config ARCH_NETX
288 bool "Hilscher NetX based" 294 bool "Hilscher NetX based"
295 select CPU_ARM926T
289 select ARM_VIC 296 select ARM_VIC
290 help 297 help
291 This enables support for systems based on the Hilscher NetX Soc 298 This enables support for systems based on the Hilscher NetX Soc
292 299
293config ARCH_H720X 300config ARCH_H720X
294 bool "Hynix HMS720x-based" 301 bool "Hynix HMS720x-based"
302 select CPU_ARM720T
295 select ISA_DMA_API 303 select ISA_DMA_API
296 help 304 help
297 This enables support for systems based on the Hynix HMS720x 305 This enables support for systems based on the Hynix HMS720x
298 306
299config ARCH_IMX 307config ARCH_IMX
300 bool "IMX" 308 bool "IMX"
309 select CPU_ARM920T
301 select GENERIC_GPIO 310 select GENERIC_GPIO
302 select GENERIC_TIME 311 select GENERIC_TIME
303 select GENERIC_CLOCKEVENTS 312 select GENERIC_CLOCKEVENTS
@@ -307,6 +316,7 @@ config ARCH_IMX
307config ARCH_IOP13XX 316config ARCH_IOP13XX
308 bool "IOP13xx-based" 317 bool "IOP13xx-based"
309 depends on MMU 318 depends on MMU
319 select CPU_XSC3
310 select PLAT_IOP 320 select PLAT_IOP
311 select PCI 321 select PCI
312 select ARCH_SUPPORTS_MSI 322 select ARCH_SUPPORTS_MSI
@@ -317,6 +327,7 @@ config ARCH_IOP13XX
317config ARCH_IOP32X 327config ARCH_IOP32X
318 bool "IOP32x-based" 328 bool "IOP32x-based"
319 depends on MMU 329 depends on MMU
330 select CPU_XSCALE
320 select PLAT_IOP 331 select PLAT_IOP
321 select PCI 332 select PCI
322 select GENERIC_GPIO 333 select GENERIC_GPIO
@@ -328,6 +339,7 @@ config ARCH_IOP32X
328config ARCH_IOP33X 339config ARCH_IOP33X
329 bool "IOP33x-based" 340 bool "IOP33x-based"
330 depends on MMU 341 depends on MMU
342 select CPU_XSCALE
331 select PLAT_IOP 343 select PLAT_IOP
332 select PCI 344 select PCI
333 select GENERIC_GPIO 345 select GENERIC_GPIO
@@ -338,6 +350,7 @@ config ARCH_IOP33X
338config ARCH_IXP23XX 350config ARCH_IXP23XX
339 bool "IXP23XX-based" 351 bool "IXP23XX-based"
340 depends on MMU 352 depends on MMU
353 select CPU_XSC3
341 select PCI 354 select PCI
342 help 355 help
343 Support for Intel's IXP23xx (XScale) family of processors. 356 Support for Intel's IXP23xx (XScale) family of processors.
@@ -345,6 +358,7 @@ config ARCH_IXP23XX
345config ARCH_IXP2000 358config ARCH_IXP2000
346 bool "IXP2400/2800-based" 359 bool "IXP2400/2800-based"
347 depends on MMU 360 depends on MMU
361 select CPU_XSCALE
348 select PCI 362 select PCI
349 help 363 help
350 Support for Intel's IXP2400/2800 (XScale) family of processors. 364 Support for Intel's IXP2400/2800 (XScale) family of processors.
@@ -352,6 +366,7 @@ config ARCH_IXP2000
352config ARCH_IXP4XX 366config ARCH_IXP4XX
353 bool "IXP4xx-based" 367 bool "IXP4xx-based"
354 depends on MMU 368 depends on MMU
369 select CPU_XSCALE
355 select GENERIC_GPIO 370 select GENERIC_GPIO
356 select GENERIC_TIME 371 select GENERIC_TIME
357 select GENERIC_CLOCKEVENTS 372 select GENERIC_CLOCKEVENTS
@@ -361,6 +376,7 @@ config ARCH_IXP4XX
361 376
362config ARCH_L7200 377config ARCH_L7200
363 bool "LinkUp-L7200" 378 bool "LinkUp-L7200"
379 select CPU_ARM720T
364 select FIQ 380 select FIQ
365 help 381 help
366 Say Y here if you intend to run this kernel on a LinkUp Systems 382 Say Y here if you intend to run this kernel on a LinkUp Systems
@@ -374,6 +390,7 @@ config ARCH_L7200
374 390
375config ARCH_KIRKWOOD 391config ARCH_KIRKWOOD
376 bool "Marvell Kirkwood" 392 bool "Marvell Kirkwood"
393 select CPU_FEROCEON
377 select PCI 394 select PCI
378 select GENERIC_TIME 395 select GENERIC_TIME
379 select GENERIC_CLOCKEVENTS 396 select GENERIC_CLOCKEVENTS
@@ -384,6 +401,7 @@ config ARCH_KIRKWOOD
384 401
385config ARCH_KS8695 402config ARCH_KS8695
386 bool "Micrel/Kendin KS8695" 403 bool "Micrel/Kendin KS8695"
404 select CPU_ARM922T
387 select GENERIC_GPIO 405 select GENERIC_GPIO
388 help 406 help
389 Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based 407 Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
@@ -391,6 +409,7 @@ config ARCH_KS8695
391 409
392config ARCH_NS9XXX 410config ARCH_NS9XXX
393 bool "NetSilicon NS9xxx" 411 bool "NetSilicon NS9xxx"
412 select CPU_ARM926T
394 select GENERIC_GPIO 413 select GENERIC_GPIO
395 select GENERIC_TIME 414 select GENERIC_TIME
396 select GENERIC_CLOCKEVENTS 415 select GENERIC_CLOCKEVENTS
@@ -403,6 +422,7 @@ config ARCH_NS9XXX
403 422
404config ARCH_LOKI 423config ARCH_LOKI
405 bool "Marvell Loki (88RC8480)" 424 bool "Marvell Loki (88RC8480)"
425 select CPU_FEROCEON
406 select GENERIC_TIME 426 select GENERIC_TIME
407 select GENERIC_CLOCKEVENTS 427 select GENERIC_CLOCKEVENTS
408 select PLAT_ORION 428 select PLAT_ORION
@@ -411,6 +431,7 @@ config ARCH_LOKI
411 431
412config ARCH_MV78XX0 432config ARCH_MV78XX0
413 bool "Marvell MV78xx0" 433 bool "Marvell MV78xx0"
434 select CPU_FEROCEON
414 select PCI 435 select PCI
415 select GENERIC_TIME 436 select GENERIC_TIME
416 select GENERIC_CLOCKEVENTS 437 select GENERIC_CLOCKEVENTS
@@ -432,6 +453,7 @@ config ARCH_MXC
432config ARCH_ORION5X 453config ARCH_ORION5X
433 bool "Marvell Orion" 454 bool "Marvell Orion"
434 depends on MMU 455 depends on MMU
456 select CPU_FEROCEON
435 select PCI 457 select PCI
436 select GENERIC_GPIO 458 select GENERIC_GPIO
437 select GENERIC_TIME 459 select GENERIC_TIME
@@ -444,6 +466,7 @@ config ARCH_ORION5X
444 466
445config ARCH_PNX4008 467config ARCH_PNX4008
446 bool "Philips Nexperia PNX4008 Mobile" 468 bool "Philips Nexperia PNX4008 Mobile"
469 select CPU_ARM926T
447 select HAVE_CLK 470 select HAVE_CLK
448 help 471 help
449 This enables support for Philips PNX4008 mobile platform. 472 This enables support for Philips PNX4008 mobile platform.
@@ -477,6 +500,7 @@ config ARCH_RPC
477 500
478config ARCH_SA1100 501config ARCH_SA1100
479 bool "SA1100-based" 502 bool "SA1100-based"
503 select CPU_SA1100
480 select ISA 504 select ISA
481 select ARCH_SPARSEMEM_ENABLE 505 select ARCH_SPARSEMEM_ENABLE
482 select ARCH_MTD_XIP 506 select ARCH_MTD_XIP
@@ -500,6 +524,7 @@ config ARCH_S3C2410
500 524
501config ARCH_SHARK 525config ARCH_SHARK
502 bool "Shark" 526 bool "Shark"
527 select CPU_SA110
503 select ISA 528 select ISA
504 select ISA_DMA 529 select ISA_DMA
505 select ZONE_DMA 530 select ZONE_DMA
@@ -510,6 +535,7 @@ config ARCH_SHARK
510 535
511config ARCH_LH7A40X 536config ARCH_LH7A40X
512 bool "Sharp LH7A40X" 537 bool "Sharp LH7A40X"
538 select CPU_ARM922T
513 select ARCH_DISCONTIGMEM_ENABLE if !LH7A40X_CONTIGMEM 539 select ARCH_DISCONTIGMEM_ENABLE if !LH7A40X_CONTIGMEM
514 select ARCH_SPARSEMEM_ENABLE if !LH7A40X_CONTIGMEM 540 select ARCH_SPARSEMEM_ENABLE if !LH7A40X_CONTIGMEM
515 help 541 help
@@ -520,6 +546,7 @@ config ARCH_LH7A40X
520 546
521config ARCH_DAVINCI 547config ARCH_DAVINCI
522 bool "TI DaVinci" 548 bool "TI DaVinci"
549 select CPU_ARM926T
523 select GENERIC_TIME 550 select GENERIC_TIME
524 select GENERIC_CLOCKEVENTS 551 select GENERIC_CLOCKEVENTS
525 select GENERIC_GPIO 552 select GENERIC_GPIO
@@ -541,6 +568,7 @@ config ARCH_OMAP
541 568
542config ARCH_MSM 569config ARCH_MSM
543 bool "Qualcomm MSM" 570 bool "Qualcomm MSM"
571 select CPU_V6
544 select GENERIC_TIME 572 select GENERIC_TIME
545 select GENERIC_CLOCKEVENTS 573 select GENERIC_CLOCKEVENTS
546 help 574 help
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 5aafb2e2ca7a..95dc71aaa668 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -7,36 +7,43 @@ choice
7 7
8config ARCH_AT91RM9200 8config ARCH_AT91RM9200
9 bool "AT91RM9200" 9 bool "AT91RM9200"
10 select CPU_ARM920T
10 select GENERIC_TIME 11 select GENERIC_TIME
11 select GENERIC_CLOCKEVENTS 12 select GENERIC_CLOCKEVENTS
12 13
13config ARCH_AT91SAM9260 14config ARCH_AT91SAM9260
14 bool "AT91SAM9260 or AT91SAM9XE" 15 bool "AT91SAM9260 or AT91SAM9XE"
16 select CPU_ARM926T
15 select GENERIC_TIME 17 select GENERIC_TIME
16 select GENERIC_CLOCKEVENTS 18 select GENERIC_CLOCKEVENTS
17 19
18config ARCH_AT91SAM9261 20config ARCH_AT91SAM9261
19 bool "AT91SAM9261" 21 bool "AT91SAM9261"
22 select CPU_ARM926T
20 select GENERIC_TIME 23 select GENERIC_TIME
21 select GENERIC_CLOCKEVENTS 24 select GENERIC_CLOCKEVENTS
22 25
23config ARCH_AT91SAM9263 26config ARCH_AT91SAM9263
24 bool "AT91SAM9263" 27 bool "AT91SAM9263"
28 select CPU_ARM926T
25 select GENERIC_TIME 29 select GENERIC_TIME
26 select GENERIC_CLOCKEVENTS 30 select GENERIC_CLOCKEVENTS
27 31
28config ARCH_AT91SAM9RL 32config ARCH_AT91SAM9RL
29 bool "AT91SAM9RL" 33 bool "AT91SAM9RL"
34 select CPU_ARM926T
30 select GENERIC_TIME 35 select GENERIC_TIME
31 select GENERIC_CLOCKEVENTS 36 select GENERIC_CLOCKEVENTS
32 37
33config ARCH_AT91SAM9G20 38config ARCH_AT91SAM9G20
34 bool "AT91SAM9G20" 39 bool "AT91SAM9G20"
40 select CPU_ARM926T
35 select GENERIC_TIME 41 select GENERIC_TIME
36 select GENERIC_CLOCKEVENTS 42 select GENERIC_CLOCKEVENTS
37 43
38config ARCH_AT91CAP9 44config ARCH_AT91CAP9
39 bool "AT91CAP9" 45 bool "AT91CAP9"
46 select CPU_ARM926T
40 select GENERIC_TIME 47 select GENERIC_TIME
41 select GENERIC_CLOCKEVENTS 48 select GENERIC_CLOCKEVENTS
42 49
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index 79f0b1f8497b..10a301e32434 100644
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -4,16 +4,19 @@ comment "OMAP Core Type"
4config ARCH_OMAP730 4config ARCH_OMAP730
5 depends on ARCH_OMAP1 5 depends on ARCH_OMAP1
6 bool "OMAP730 Based System" 6 bool "OMAP730 Based System"
7 select CPU_ARM926T
7 select ARCH_OMAP_OTG 8 select ARCH_OMAP_OTG
8 9
9config ARCH_OMAP15XX 10config ARCH_OMAP15XX
10 depends on ARCH_OMAP1 11 depends on ARCH_OMAP1
11 default y 12 default y
12 bool "OMAP15xx Based System" 13 bool "OMAP15xx Based System"
14 select CPU_ARM925T
13 15
14config ARCH_OMAP16XX 16config ARCH_OMAP16XX
15 depends on ARCH_OMAP1 17 depends on ARCH_OMAP1
16 bool "OMAP16xx Based System" 18 bool "OMAP16xx Based System"
19 select CPU_ARM926T
17 select ARCH_OMAP_OTG 20 select ARCH_OMAP_OTG
18 21
19comment "OMAP Board Type" 22comment "OMAP Board Type"
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index a062235e83a8..740f0a382bac 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -386,16 +386,19 @@ endmenu
386 386
387config PXA25x 387config PXA25x
388 bool 388 bool
389 select CPU_XSCALE
389 help 390 help
390 Select code specific to PXA21x/25x/26x variants 391 Select code specific to PXA21x/25x/26x variants
391 392
392config PXA27x 393config PXA27x
393 bool 394 bool
395 select CPU_XSCALE
394 help 396 help
395 Select code specific to PXA27x variants 397 Select code specific to PXA27x variants
396 398
397config PXA3xx 399config PXA3xx
398 bool 400 bool
401 select CPU_XSC3
399 help 402 help
400 Select code specific to PXA3xx variants 403 Select code specific to PXA3xx variants
401 404
diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig
index 5ccde7cf39e8..603d1db9baf0 100644
--- a/arch/arm/mach-realview/Kconfig
+++ b/arch/arm/mach-realview/Kconfig
@@ -10,6 +10,7 @@ config MACH_REALVIEW_EB
10config REALVIEW_EB_ARM11MP 10config REALVIEW_EB_ARM11MP
11 bool "Support ARM11MPCore tile" 11 bool "Support ARM11MPCore tile"
12 depends on MACH_REALVIEW_EB 12 depends on MACH_REALVIEW_EB
13 select CPU_V6
13 help 14 help
14 Enable support for the ARM11MPCore tile on the Realview platform. 15 Enable support for the ARM11MPCore tile on the Realview platform.
15 16
@@ -33,6 +34,7 @@ config MACH_REALVIEW_PB11MP
33 34
34config MACH_REALVIEW_PB1176 35config MACH_REALVIEW_PB1176
35 bool "Support RealView/PB1176 platform" 36 bool "Support RealView/PB1176 platform"
37 select CPU_V6
36 select ARM_GIC 38 select ARM_GIC
37 help 39 help
38 Include support for the ARM(R) RealView ARM1176 Platform Baseboard. 40 Include support for the ARM(R) RealView ARM1176 Platform Baseboard.
diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index 99fdc736698c..7315569fbfd7 100644
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -7,6 +7,7 @@
7config CPU_S3C2410 7config CPU_S3C2410
8 bool 8 bool
9 depends on ARCH_S3C2410 9 depends on ARCH_S3C2410
10 select CPU_ARM920T
10 select S3C2410_CLOCK 11 select S3C2410_CLOCK
11 select S3C2410_GPIO 12 select S3C2410_GPIO
12 select CPU_LLSERIAL_S3C2410 13 select CPU_LLSERIAL_S3C2410
diff --git a/arch/arm/mach-s3c2412/Kconfig b/arch/arm/mach-s3c2412/Kconfig
index c59a9d2ee9a6..ca99564ae4b5 100644
--- a/arch/arm/mach-s3c2412/Kconfig
+++ b/arch/arm/mach-s3c2412/Kconfig
@@ -7,6 +7,7 @@
7config CPU_S3C2412 7config CPU_S3C2412
8 bool 8 bool
9 depends on ARCH_S3C2410 9 depends on ARCH_S3C2410
10 select CPU_ARM926T
10 select CPU_LLSERIAL_S3C2440 11 select CPU_LLSERIAL_S3C2440
11 select S3C2412_PM if PM 12 select S3C2412_PM if PM
12 select S3C2412_DMA if S3C2410_DMA 13 select S3C2412_DMA if S3C2410_DMA
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
index 25de042ab996..0429d255b0d8 100644
--- a/arch/arm/mach-s3c2440/Kconfig
+++ b/arch/arm/mach-s3c2440/Kconfig
@@ -7,6 +7,7 @@
7config CPU_S3C2440 7config CPU_S3C2440
8 bool 8 bool
9 depends on ARCH_S3C2410 9 depends on ARCH_S3C2410
10 select CPU_ARM920T
10 select S3C2410_CLOCK 11 select S3C2410_CLOCK
11 select S3C2410_PM if PM 12 select S3C2410_PM if PM
12 select S3C2410_GPIO 13 select S3C2410_GPIO
diff --git a/arch/arm/mach-s3c2442/Kconfig b/arch/arm/mach-s3c2442/Kconfig
index 26d131a77074..b289d198020e 100644
--- a/arch/arm/mach-s3c2442/Kconfig
+++ b/arch/arm/mach-s3c2442/Kconfig
@@ -7,6 +7,7 @@
7config CPU_S3C2442 7config CPU_S3C2442
8 bool 8 bool
9 depends on ARCH_S3C2410 9 depends on ARCH_S3C2410
10 select CPU_ARM920T
10 select S3C2410_CLOCK 11 select S3C2410_CLOCK
11 select S3C2410_GPIO 12 select S3C2410_GPIO
12 select S3C2410_PM if PM 13 select S3C2410_PM if PM
diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig
index 95096afd5271..c781f30c8368 100644
--- a/arch/arm/mach-versatile/Kconfig
+++ b/arch/arm/mach-versatile/Kconfig
@@ -3,12 +3,14 @@ menu "Versatile platform type"
3 3
4config ARCH_VERSATILE_PB 4config ARCH_VERSATILE_PB
5 bool "Support Versatile/PB platform" 5 bool "Support Versatile/PB platform"
6 select CPU_ARM926T
6 default y 7 default y
7 help 8 help
8 Include support for the ARM(R) Versatile/PB platform. 9 Include support for the ARM(R) Versatile/PB platform.
9 10
10config MACH_VERSATILE_AB 11config MACH_VERSATILE_AB
11 bool "Support Versatile/AB platform" 12 bool "Support Versatile/AB platform"
13 select CPU_ARM926T
12 help 14 help
13 Include support for the ARM(R) Versatile/AP platform. 15 Include support for the ARM(R) Versatile/AP platform.
14 16
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index ab5f7a21350b..cf44de512830 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -10,8 +10,7 @@ config CPU_32
10 10
11# ARM610 11# ARM610
12config CPU_ARM610 12config CPU_ARM610
13 bool "Support ARM610 processor" 13 bool "Support ARM610 processor" if ARCH_RPC
14 depends on ARCH_RPC
15 select CPU_32v3 14 select CPU_32v3
16 select CPU_CACHE_V3 15 select CPU_CACHE_V3
17 select CPU_CACHE_VIVT 16 select CPU_CACHE_VIVT
@@ -43,8 +42,7 @@ config CPU_ARM7TDMI
43 42
44# ARM710 43# ARM710
45config CPU_ARM710 44config CPU_ARM710
46 bool "Support ARM710 processor" if !ARCH_CLPS7500 && ARCH_RPC 45 bool "Support ARM710 processor" if ARCH_RPC
47 default y if ARCH_CLPS7500
48 select CPU_32v3 46 select CPU_32v3
49 select CPU_CACHE_V3 47 select CPU_CACHE_V3
50 select CPU_CACHE_VIVT 48 select CPU_CACHE_VIVT
@@ -63,8 +61,7 @@ config CPU_ARM710
63 61
64# ARM720T 62# ARM720T
65config CPU_ARM720T 63config CPU_ARM720T
66 bool "Support ARM720T processor" if !ARCH_CLPS711X && !ARCH_L7200 && !ARCH_CDB89712 && ARCH_INTEGRATOR 64 bool "Support ARM720T processor" if ARCH_INTEGRATOR
67 default y if ARCH_CLPS711X || ARCH_L7200 || ARCH_CDB89712 || ARCH_H720X
68 select CPU_32v4T 65 select CPU_32v4T
69 select CPU_ABRT_LV4T 66 select CPU_ABRT_LV4T
70 select CPU_PABRT_NOIFAR 67 select CPU_PABRT_NOIFAR
@@ -114,9 +111,7 @@ config CPU_ARM9TDMI
114 111
115# ARM920T 112# ARM920T
116config CPU_ARM920T 113config CPU_ARM920T
117 bool "Support ARM920T processor" 114 bool "Support ARM920T processor" if ARCH_INTEGRATOR
118 depends on ARCH_EP93XX || ARCH_INTEGRATOR || CPU_S3C2410 || CPU_S3C2440 || CPU_S3C2442 || ARCH_IMX || ARCH_AAEC2000 || ARCH_AT91RM9200
119 default y if CPU_S3C2410 || CPU_S3C2440 || CPU_S3C2442 || ARCH_AT91RM9200
120 select CPU_32v4T 115 select CPU_32v4T
121 select CPU_ABRT_EV4T 116 select CPU_ABRT_EV4T
122 select CPU_PABRT_NOIFAR 117 select CPU_PABRT_NOIFAR
@@ -138,8 +133,6 @@ config CPU_ARM920T
138# ARM922T 133# ARM922T
139config CPU_ARM922T 134config CPU_ARM922T
140 bool "Support ARM922T processor" if ARCH_INTEGRATOR 135 bool "Support ARM922T processor" if ARCH_INTEGRATOR
141 depends on ARCH_LH7A40X || ARCH_INTEGRATOR || ARCH_KS8695
142 default y if ARCH_LH7A40X || ARCH_KS8695
143 select CPU_32v4T 136 select CPU_32v4T
144 select CPU_ABRT_EV4T 137 select CPU_ABRT_EV4T
145 select CPU_PABRT_NOIFAR 138 select CPU_PABRT_NOIFAR
@@ -159,8 +152,6 @@ config CPU_ARM922T
159# ARM925T 152# ARM925T
160config CPU_ARM925T 153config CPU_ARM925T
161 bool "Support ARM925T processor" if ARCH_OMAP1 154 bool "Support ARM925T processor" if ARCH_OMAP1
162 depends on ARCH_OMAP15XX
163 default y if ARCH_OMAP15XX
164 select CPU_32v4T 155 select CPU_32v4T
165 select CPU_ABRT_EV4T 156 select CPU_ABRT_EV4T
166 select CPU_PABRT_NOIFAR 157 select CPU_PABRT_NOIFAR
@@ -179,22 +170,7 @@ config CPU_ARM925T
179 170
180# ARM926T 171# ARM926T
181config CPU_ARM926T 172config CPU_ARM926T
182 bool "Support ARM926T processor" 173 bool "Support ARM926T processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB
183 depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || \
184 MACH_VERSATILE_AB || ARCH_OMAP730 || \
185 ARCH_OMAP16XX || MACH_REALVIEW_EB || \
186 ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || \
187 ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || \
188 ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || \
189 ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || \
190 ARCH_NS9XXX || ARCH_DAVINCI || ARCH_MX2
191 default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || \
192 ARCH_OMAP730 || ARCH_OMAP16XX || \
193 ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || \
194 ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || \
195 ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || \
196 ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || \
197 ARCH_NS9XXX || ARCH_DAVINCI || ARCH_MX2
198 select CPU_32v5 174 select CPU_32v5
199 select CPU_ABRT_EV5TJ 175 select CPU_ABRT_EV5TJ
200 select CPU_PABRT_NOIFAR 176 select CPU_PABRT_NOIFAR
@@ -247,8 +223,7 @@ config CPU_ARM946E
247 223
248# ARM1020 - needs validating 224# ARM1020 - needs validating
249config CPU_ARM1020 225config CPU_ARM1020
250 bool "Support ARM1020T (rev 0) processor" 226 bool "Support ARM1020T (rev 0) processor" if ARCH_INTEGRATOR
251 depends on ARCH_INTEGRATOR
252 select CPU_32v5 227 select CPU_32v5
253 select CPU_ABRT_EV4T 228 select CPU_ABRT_EV4T
254 select CPU_PABRT_NOIFAR 229 select CPU_PABRT_NOIFAR
@@ -266,8 +241,7 @@ config CPU_ARM1020
266 241
267# ARM1020E - needs validating 242# ARM1020E - needs validating
268config CPU_ARM1020E 243config CPU_ARM1020E
269 bool "Support ARM1020E processor" 244 bool "Support ARM1020E processor" if ARCH_INTEGRATOR
270 depends on ARCH_INTEGRATOR
271 select CPU_32v5 245 select CPU_32v5
272 select CPU_ABRT_EV4T 246 select CPU_ABRT_EV4T
273 select CPU_PABRT_NOIFAR 247 select CPU_PABRT_NOIFAR
@@ -280,8 +254,7 @@ config CPU_ARM1020E
280 254
281# ARM1022E 255# ARM1022E
282config CPU_ARM1022 256config CPU_ARM1022
283 bool "Support ARM1022E processor" 257 bool "Support ARM1022E processor" if ARCH_INTEGRATOR
284 depends on ARCH_INTEGRATOR
285 select CPU_32v5 258 select CPU_32v5
286 select CPU_ABRT_EV4T 259 select CPU_ABRT_EV4T
287 select CPU_PABRT_NOIFAR 260 select CPU_PABRT_NOIFAR
@@ -299,8 +272,7 @@ config CPU_ARM1022
299 272
300# ARM1026EJ-S 273# ARM1026EJ-S
301config CPU_ARM1026 274config CPU_ARM1026
302 bool "Support ARM1026EJ-S processor" 275 bool "Support ARM1026EJ-S processor" if ARCH_INTEGRATOR
303 depends on ARCH_INTEGRATOR
304 select CPU_32v5 276 select CPU_32v5
305 select CPU_ABRT_EV5T # But need Jazelle, but EV5TJ ignores bit 10 277 select CPU_ABRT_EV5T # But need Jazelle, but EV5TJ ignores bit 10
306 select CPU_PABRT_NOIFAR 278 select CPU_PABRT_NOIFAR
@@ -317,8 +289,7 @@ config CPU_ARM1026
317 289
318# SA110 290# SA110
319config CPU_SA110 291config CPU_SA110
320 bool "Support StrongARM(R) SA-110 processor" if !ARCH_EBSA110 && !FOOTBRIDGE && !ARCH_TBOX && !ARCH_SHARK && !ARCH_NEXUSPCI && ARCH_RPC 292 bool "Support StrongARM(R) SA-110 processor" if ARCH_RPC
321 default y if ARCH_EBSA110 || FOOTBRIDGE || ARCH_TBOX || ARCH_SHARK || ARCH_NEXUSPCI
322 select CPU_32v3 if ARCH_RPC 293 select CPU_32v3 if ARCH_RPC
323 select CPU_32v4 if !ARCH_RPC 294 select CPU_32v4 if !ARCH_RPC
324 select CPU_ABRT_EV4 295 select CPU_ABRT_EV4
@@ -340,8 +311,6 @@ config CPU_SA110
340# SA1100 311# SA1100
341config CPU_SA1100 312config CPU_SA1100
342 bool 313 bool
343 depends on ARCH_SA1100
344 default y
345 select CPU_32v4 314 select CPU_32v4
346 select CPU_ABRT_EV4 315 select CPU_ABRT_EV4
347 select CPU_PABRT_NOIFAR 316 select CPU_PABRT_NOIFAR
@@ -353,8 +322,6 @@ config CPU_SA1100
353# XScale 322# XScale
354config CPU_XSCALE 323config CPU_XSCALE
355 bool 324 bool
356 depends on ARCH_IOP32X || ARCH_IOP33X || PXA25x || PXA27x || ARCH_IXP4XX || ARCH_IXP2000
357 default y
358 select CPU_32v5 325 select CPU_32v5
359 select CPU_ABRT_EV5T 326 select CPU_ABRT_EV5T
360 select CPU_PABRT_NOIFAR 327 select CPU_PABRT_NOIFAR
@@ -365,8 +332,6 @@ config CPU_XSCALE
365# XScale Core Version 3 332# XScale Core Version 3
366config CPU_XSC3 333config CPU_XSC3
367 bool 334 bool
368 depends on ARCH_IXP23XX || ARCH_IOP13XX || PXA3xx
369 default y
370 select CPU_32v5 335 select CPU_32v5
371 select CPU_ABRT_EV5T 336 select CPU_ABRT_EV5T
372 select CPU_PABRT_NOIFAR 337 select CPU_PABRT_NOIFAR
@@ -378,8 +343,6 @@ config CPU_XSC3
378# Feroceon 343# Feroceon
379config CPU_FEROCEON 344config CPU_FEROCEON
380 bool 345 bool
381 depends on ARCH_ORION5X || ARCH_LOKI || ARCH_KIRKWOOD || ARCH_MV78XX0
382 default y
383 select CPU_32v5 346 select CPU_32v5
384 select CPU_ABRT_EV5T 347 select CPU_ABRT_EV5T
385 select CPU_PABRT_NOIFAR 348 select CPU_PABRT_NOIFAR
@@ -399,10 +362,7 @@ config CPU_FEROCEON_OLD_ID
399 362
400# ARMv6 363# ARMv6
401config CPU_V6 364config CPU_V6
402 bool "Support ARM V6 processor" 365 bool "Support ARM V6 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB
403 depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP2 || ARCH_MX3 || ARCH_MSM || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176
404 default y if ARCH_MX3
405 default y if ARCH_MSM
406 select CPU_32v6 366 select CPU_32v6
407 select CPU_ABRT_EV6 367 select CPU_ABRT_EV6
408 select CPU_PABRT_NOIFAR 368 select CPU_PABRT_NOIFAR
@@ -427,8 +387,7 @@ config CPU_32v6K
427 387
428# ARMv7 388# ARMv7
429config CPU_V7 389config CPU_V7
430 bool "Support ARM V7 processor" 390 bool "Support ARM V7 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB
431 depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP3
432 select CPU_32v6K 391 select CPU_32v6K
433 select CPU_32v7 392 select CPU_32v7
434 select CPU_ABRT_EV7 393 select CPU_ABRT_EV7
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index b2a7e3fad117..a1612958a59e 100644
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -8,11 +8,13 @@ choice
8 8
9config ARCH_MX2 9config ARCH_MX2
10 bool "MX2-based" 10 bool "MX2-based"
11 select CPU_ARM926T
11 help 12 help
12 This enables support for systems based on the Freescale i.MX2 family 13 This enables support for systems based on the Freescale i.MX2 family
13 14
14config ARCH_MX3 15config ARCH_MX3
15 bool "MX3-based" 16 bool "MX3-based"
17 select CPU_V6
16 help 18 help
17 This enables support for systems based on the Freescale i.MX3 family 19 This enables support for systems based on the Freescale i.MX3 family
18 20
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index a94f0c44ebc8..46d3b0b9ce69 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -14,9 +14,11 @@ config ARCH_OMAP1
14 14
15config ARCH_OMAP2 15config ARCH_OMAP2
16 bool "TI OMAP2" 16 bool "TI OMAP2"
17 select CPU_V6
17 18
18config ARCH_OMAP3 19config ARCH_OMAP3
19 bool "TI OMAP3" 20 bool "TI OMAP3"
21 select CPU_V7
20 22
21endchoice 23endchoice
22 24
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-04 16:48:31 -0400