diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-13 12:14:17 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-13 12:14:17 -0400 |
commit | 244acb1ba3777c2eb4d33ddc246cab5419656442 (patch) | |
tree | d2fa55c9f789afb9b1aff57067be1f9190ffc9e7 /arch | |
parent | cb8db5d4578ac9d996200ab59aa655344d305f5b (diff) | |
parent | 93e22567a138783202143c3af70d701a3ad20629 (diff) |
Merge branch 'config' into late-for-linus
Diffstat (limited to 'arch')
39 files changed, 793 insertions, 795 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 767aae8277fa..1bc092eb42e6 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -1,58 +1,57 @@ | |||
1 | config ARM | 1 | config ARM |
2 | bool | 2 | bool |
3 | default y | 3 | default y |
4 | select ARCH_BINFMT_ELF_RANDOMIZE_PIE | ||
5 | select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE | ||
4 | select ARCH_HAVE_CUSTOM_GPIO_H | 6 | select ARCH_HAVE_CUSTOM_GPIO_H |
5 | select HAVE_AOUT | 7 | select ARCH_WANT_IPC_PARSE_VERSION |
6 | select HAVE_DMA_API_DEBUG | 8 | select CPU_PM if (SUSPEND || CPU_IDLE) |
7 | select HAVE_IDE if PCI || ISA || PCMCIA | 9 | select DCACHE_WORD_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && !CPU_BIG_ENDIAN |
8 | select HAVE_DMA_ATTRS | ||
9 | select HAVE_DMA_CONTIGUOUS if MMU | ||
10 | select HAVE_MEMBLOCK | ||
11 | select RTC_LIB | ||
12 | select SYS_SUPPORTS_APM_EMULATION | ||
13 | select GENERIC_ATOMIC64 if (CPU_V6 || !CPU_32v6K || !AEABI) | 10 | select GENERIC_ATOMIC64 if (CPU_V6 || !CPU_32v6K || !AEABI) |
14 | select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE | 11 | select GENERIC_CLOCKEVENTS_BROADCAST if SMP |
15 | select HAVE_OPROFILE if (HAVE_PERF_EVENTS) | 12 | select GENERIC_IRQ_PROBE |
13 | select GENERIC_IRQ_SHOW | ||
14 | select GENERIC_KERNEL_THREAD | ||
15 | select GENERIC_PCI_IOMAP | ||
16 | select GENERIC_SMP_IDLE_THREAD | ||
17 | select GENERIC_STRNCPY_FROM_USER | ||
18 | select GENERIC_STRNLEN_USER | ||
19 | select HARDIRQS_SW_RESEND | ||
20 | select HAVE_AOUT | ||
16 | select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL | 21 | select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL |
17 | select HAVE_ARCH_KGDB | 22 | select HAVE_ARCH_KGDB |
18 | select HAVE_ARCH_TRACEHOOK | 23 | select HAVE_ARCH_TRACEHOOK |
19 | select HAVE_SYSCALL_TRACEPOINTS | 24 | select HAVE_BPF_JIT |
20 | select HAVE_KPROBES if !XIP_KERNEL | 25 | select HAVE_C_RECORDMCOUNT |
21 | select HAVE_KRETPROBES if (HAVE_KPROBES) | 26 | select HAVE_DEBUG_KMEMLEAK |
22 | select HAVE_FUNCTION_TRACER if (!XIP_KERNEL) | 27 | select HAVE_DMA_API_DEBUG |
23 | select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL) | 28 | select HAVE_DMA_ATTRS |
29 | select HAVE_DMA_CONTIGUOUS if MMU | ||
24 | select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL) | 30 | select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL) |
31 | select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL) | ||
25 | select HAVE_FUNCTION_GRAPH_TRACER if (!THUMB2_KERNEL) | 32 | select HAVE_FUNCTION_GRAPH_TRACER if (!THUMB2_KERNEL) |
26 | select ARCH_BINFMT_ELF_RANDOMIZE_PIE | 33 | select HAVE_FUNCTION_TRACER if (!XIP_KERNEL) |
27 | select HAVE_GENERIC_DMA_COHERENT | 34 | select HAVE_GENERIC_DMA_COHERENT |
28 | select HAVE_DEBUG_KMEMLEAK | 35 | select HAVE_GENERIC_HARDIRQS |
36 | select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7)) | ||
37 | select HAVE_IDE if PCI || ISA || PCMCIA | ||
38 | select HAVE_IRQ_WORK | ||
29 | select HAVE_KERNEL_GZIP | 39 | select HAVE_KERNEL_GZIP |
30 | select HAVE_KERNEL_LZO | ||
31 | select HAVE_KERNEL_LZMA | 40 | select HAVE_KERNEL_LZMA |
41 | select HAVE_KERNEL_LZO | ||
32 | select HAVE_KERNEL_XZ | 42 | select HAVE_KERNEL_XZ |
33 | select HAVE_IRQ_WORK | 43 | select HAVE_KPROBES if !XIP_KERNEL |
44 | select HAVE_KRETPROBES if (HAVE_KPROBES) | ||
45 | select HAVE_MEMBLOCK | ||
46 | select HAVE_OPROFILE if (HAVE_PERF_EVENTS) | ||
34 | select HAVE_PERF_EVENTS | 47 | select HAVE_PERF_EVENTS |
35 | select PERF_USE_VMALLOC | ||
36 | select HAVE_REGS_AND_STACK_ACCESS_API | 48 | select HAVE_REGS_AND_STACK_ACCESS_API |
37 | select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7)) | 49 | select HAVE_SYSCALL_TRACEPOINTS |
38 | select HAVE_C_RECORDMCOUNT | ||
39 | select HAVE_GENERIC_HARDIRQS | ||
40 | select HARDIRQS_SW_RESEND | ||
41 | select GENERIC_IRQ_PROBE | ||
42 | select GENERIC_IRQ_SHOW | ||
43 | select HAVE_UID16 | 50 | select HAVE_UID16 |
44 | select ARCH_WANT_IPC_PARSE_VERSION | ||
45 | select HARDIRQS_SW_RESEND | ||
46 | select CPU_PM if (SUSPEND || CPU_IDLE) | ||
47 | select GENERIC_PCI_IOMAP | ||
48 | select HAVE_BPF_JIT | ||
49 | select GENERIC_SMP_IDLE_THREAD | ||
50 | select KTIME_SCALAR | 51 | select KTIME_SCALAR |
51 | select GENERIC_CLOCKEVENTS_BROADCAST if SMP | 52 | select PERF_USE_VMALLOC |
52 | select GENERIC_STRNCPY_FROM_USER | 53 | select RTC_LIB |
53 | select GENERIC_STRNLEN_USER | 54 | select SYS_SUPPORTS_APM_EMULATION |
54 | select DCACHE_WORD_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && !CPU_BIG_ENDIAN | ||
55 | select GENERIC_KERNEL_THREAD | ||
56 | help | 55 | help |
57 | The ARM series is a line of low-power-consumption RISC chip designs | 56 | The ARM series is a line of low-power-consumption RISC chip designs |
58 | licensed by ARM Ltd and targeted at embedded applications and | 57 | licensed by ARM Ltd and targeted at embedded applications and |
@@ -68,9 +67,9 @@ config NEED_SG_DMA_LENGTH | |||
68 | bool | 67 | bool |
69 | 68 | ||
70 | config ARM_DMA_USE_IOMMU | 69 | config ARM_DMA_USE_IOMMU |
71 | select NEED_SG_DMA_LENGTH | ||
72 | select ARM_HAS_SG_CHAIN | ||
73 | bool | 70 | bool |
71 | select ARM_HAS_SG_CHAIN | ||
72 | select NEED_SG_DMA_LENGTH | ||
74 | 73 | ||
75 | config HAVE_PWM | 74 | config HAVE_PWM |
76 | bool | 75 | bool |
@@ -262,69 +261,69 @@ choice | |||
262 | 261 | ||
263 | config ARCH_MULTIPLATFORM | 262 | config ARCH_MULTIPLATFORM |
264 | bool "Allow multiple platforms to be selected" | 263 | bool "Allow multiple platforms to be selected" |
264 | depends on MMU | ||
265 | select ARM_PATCH_PHYS_VIRT | 265 | select ARM_PATCH_PHYS_VIRT |
266 | select AUTO_ZRELADDR | 266 | select AUTO_ZRELADDR |
267 | select COMMON_CLK | 267 | select COMMON_CLK |
268 | select MULTI_IRQ_HANDLER | 268 | select MULTI_IRQ_HANDLER |
269 | select SPARSE_IRQ | 269 | select SPARSE_IRQ |
270 | select USE_OF | 270 | select USE_OF |
271 | depends on MMU | ||
272 | 271 | ||
273 | config ARCH_INTEGRATOR | 272 | config ARCH_INTEGRATOR |
274 | bool "ARM Ltd. Integrator family" | 273 | bool "ARM Ltd. Integrator family" |
275 | select ARM_AMBA | ||
276 | select ARCH_HAS_CPUFREQ | 274 | select ARCH_HAS_CPUFREQ |
275 | select ARM_AMBA | ||
277 | select COMMON_CLK | 276 | select COMMON_CLK |
278 | select COMMON_CLK_VERSATILE | 277 | select COMMON_CLK_VERSATILE |
278 | select GENERIC_CLOCKEVENTS | ||
279 | select HAVE_TCM | 279 | select HAVE_TCM |
280 | select ICST | 280 | select ICST |
281 | select GENERIC_CLOCKEVENTS | 281 | select MULTI_IRQ_HANDLER |
282 | select NEED_MACH_MEMORY_H | ||
282 | select PLAT_VERSATILE | 283 | select PLAT_VERSATILE |
283 | select PLAT_VERSATILE_FPGA_IRQ | 284 | select PLAT_VERSATILE_FPGA_IRQ |
284 | select NEED_MACH_MEMORY_H | ||
285 | select SPARSE_IRQ | 285 | select SPARSE_IRQ |
286 | select MULTI_IRQ_HANDLER | ||
287 | help | 286 | help |
288 | Support for ARM's Integrator platform. | 287 | Support for ARM's Integrator platform. |
289 | 288 | ||
290 | config ARCH_REALVIEW | 289 | config ARCH_REALVIEW |
291 | bool "ARM Ltd. RealView family" | 290 | bool "ARM Ltd. RealView family" |
291 | select ARCH_WANT_OPTIONAL_GPIOLIB | ||
292 | select ARM_AMBA | 292 | select ARM_AMBA |
293 | select ARM_TIMER_SP804 | ||
293 | select COMMON_CLK | 294 | select COMMON_CLK |
294 | select COMMON_CLK_VERSATILE | 295 | select COMMON_CLK_VERSATILE |
295 | select ICST | ||
296 | select GENERIC_CLOCKEVENTS | 296 | select GENERIC_CLOCKEVENTS |
297 | select ARCH_WANT_OPTIONAL_GPIOLIB | ||
298 | select PLAT_VERSATILE | ||
299 | select PLAT_VERSATILE_CLCD | ||
300 | select ARM_TIMER_SP804 | ||
301 | select GPIO_PL061 if GPIOLIB | 297 | select GPIO_PL061 if GPIOLIB |
298 | select ICST | ||
302 | select NEED_MACH_MEMORY_H | 299 | select NEED_MACH_MEMORY_H |
300 | select PLAT_VERSATILE | ||
301 | select PLAT_VERSATILE_CLCD | ||
303 | help | 302 | help |
304 | This enables support for ARM Ltd RealView boards. | 303 | This enables support for ARM Ltd RealView boards. |
305 | 304 | ||
306 | config ARCH_VERSATILE | 305 | config ARCH_VERSATILE |
307 | bool "ARM Ltd. Versatile family" | 306 | bool "ARM Ltd. Versatile family" |
307 | select ARCH_WANT_OPTIONAL_GPIOLIB | ||
308 | select ARM_AMBA | 308 | select ARM_AMBA |
309 | select ARM_TIMER_SP804 | ||
309 | select ARM_VIC | 310 | select ARM_VIC |
310 | select CLKDEV_LOOKUP | 311 | select CLKDEV_LOOKUP |
312 | select GENERIC_CLOCKEVENTS | ||
311 | select HAVE_MACH_CLKDEV | 313 | select HAVE_MACH_CLKDEV |
312 | select ICST | 314 | select ICST |
313 | select GENERIC_CLOCKEVENTS | ||
314 | select ARCH_WANT_OPTIONAL_GPIOLIB | ||
315 | select PLAT_VERSATILE | 315 | select PLAT_VERSATILE |
316 | select PLAT_VERSATILE_CLOCK | ||
317 | select PLAT_VERSATILE_CLCD | 316 | select PLAT_VERSATILE_CLCD |
317 | select PLAT_VERSATILE_CLOCK | ||
318 | select PLAT_VERSATILE_FPGA_IRQ | 318 | select PLAT_VERSATILE_FPGA_IRQ |
319 | select ARM_TIMER_SP804 | ||
320 | help | 319 | help |
321 | This enables support for ARM Ltd Versatile board. | 320 | This enables support for ARM Ltd Versatile board. |
322 | 321 | ||
323 | config ARCH_AT91 | 322 | config ARCH_AT91 |
324 | bool "Atmel AT91" | 323 | bool "Atmel AT91" |
325 | select ARCH_REQUIRE_GPIOLIB | 324 | select ARCH_REQUIRE_GPIOLIB |
326 | select HAVE_CLK | ||
327 | select CLKDEV_LOOKUP | 325 | select CLKDEV_LOOKUP |
326 | select HAVE_CLK | ||
328 | select IRQ_DOMAIN | 327 | select IRQ_DOMAIN |
329 | select NEED_MACH_GPIO_H | 328 | select NEED_MACH_GPIO_H |
330 | select NEED_MACH_IO_H if PCCARD | 329 | select NEED_MACH_IO_H if PCCARD |
@@ -349,43 +348,43 @@ config ARCH_BCM2835 | |||
349 | This enables support for the Broadcom BCM2835 SoC. This SoC is | 348 | This enables support for the Broadcom BCM2835 SoC. This SoC is |
350 | use in the Raspberry Pi, and Roku 2 devices. | 349 | use in the Raspberry Pi, and Roku 2 devices. |
351 | 350 | ||
352 | config ARCH_CLPS711X | ||
353 | bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" | ||
354 | select CPU_ARM720T | ||
355 | select ARCH_USES_GETTIMEOFFSET | ||
356 | select COMMON_CLK | ||
357 | select CLKDEV_LOOKUP | ||
358 | select NEED_MACH_MEMORY_H | ||
359 | help | ||
360 | Support for Cirrus Logic 711x/721x/731x based boards. | ||
361 | |||
362 | config ARCH_CNS3XXX | 351 | config ARCH_CNS3XXX |
363 | bool "Cavium Networks CNS3XXX family" | 352 | bool "Cavium Networks CNS3XXX family" |
353 | select ARM_GIC | ||
364 | select CPU_V6K | 354 | select CPU_V6K |
365 | select GENERIC_CLOCKEVENTS | 355 | select GENERIC_CLOCKEVENTS |
366 | select ARM_GIC | ||
367 | select MIGHT_HAVE_CACHE_L2X0 | 356 | select MIGHT_HAVE_CACHE_L2X0 |
368 | select MIGHT_HAVE_PCI | 357 | select MIGHT_HAVE_PCI |
369 | select PCI_DOMAINS if PCI | 358 | select PCI_DOMAINS if PCI |
370 | help | 359 | help |
371 | Support for Cavium Networks CNS3XXX platform. | 360 | Support for Cavium Networks CNS3XXX platform. |
372 | 361 | ||
362 | config ARCH_CLPS711X | ||
363 | bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" | ||
364 | select ARCH_USES_GETTIMEOFFSET | ||
365 | select CLKDEV_LOOKUP | ||
366 | select COMMON_CLK | ||
367 | select CPU_ARM720T | ||
368 | select NEED_MACH_MEMORY_H | ||
369 | help | ||
370 | Support for Cirrus Logic 711x/721x/731x based boards. | ||
371 | |||
373 | config ARCH_GEMINI | 372 | config ARCH_GEMINI |
374 | bool "Cortina Systems Gemini" | 373 | bool "Cortina Systems Gemini" |
375 | select CPU_FA526 | ||
376 | select ARCH_REQUIRE_GPIOLIB | 374 | select ARCH_REQUIRE_GPIOLIB |
377 | select ARCH_USES_GETTIMEOFFSET | 375 | select ARCH_USES_GETTIMEOFFSET |
376 | select CPU_FA526 | ||
378 | help | 377 | help |
379 | Support for the Cortina Systems Gemini family SoCs | 378 | Support for the Cortina Systems Gemini family SoCs |
380 | 379 | ||
381 | config ARCH_SIRF | 380 | config ARCH_SIRF |
382 | bool "CSR SiRF" | 381 | bool "CSR SiRF" |
383 | select NO_IOPORT | ||
384 | select ARCH_REQUIRE_GPIOLIB | 382 | select ARCH_REQUIRE_GPIOLIB |
385 | select GENERIC_CLOCKEVENTS | ||
386 | select COMMON_CLK | 383 | select COMMON_CLK |
384 | select GENERIC_CLOCKEVENTS | ||
387 | select GENERIC_IRQ_CHIP | 385 | select GENERIC_IRQ_CHIP |
388 | select MIGHT_HAVE_CACHE_L2X0 | 386 | select MIGHT_HAVE_CACHE_L2X0 |
387 | select NO_IOPORT | ||
389 | select PINCTRL | 388 | select PINCTRL |
390 | select PINCTRL_SIRF | 389 | select PINCTRL_SIRF |
391 | select USE_OF | 390 | select USE_OF |
@@ -394,12 +393,12 @@ config ARCH_SIRF | |||
394 | 393 | ||
395 | config ARCH_EBSA110 | 394 | config ARCH_EBSA110 |
396 | bool "EBSA-110" | 395 | bool "EBSA-110" |
396 | select ARCH_USES_GETTIMEOFFSET | ||
397 | select CPU_SA110 | 397 | select CPU_SA110 |
398 | select ISA | 398 | select ISA |
399 | select NO_IOPORT | ||
400 | select ARCH_USES_GETTIMEOFFSET | ||
401 | select NEED_MACH_IO_H | 399 | select NEED_MACH_IO_H |
402 | select NEED_MACH_MEMORY_H | 400 | select NEED_MACH_MEMORY_H |
401 | select NO_IOPORT | ||
403 | help | 402 | help |
404 | This is an evaluation board for the StrongARM processor available | 403 | This is an evaluation board for the StrongARM processor available |
405 | from Digital. It has limited hardware on-board, including an | 404 | from Digital. It has limited hardware on-board, including an |
@@ -408,13 +407,13 @@ config ARCH_EBSA110 | |||
408 | 407 | ||
409 | config ARCH_EP93XX | 408 | config ARCH_EP93XX |
410 | bool "EP93xx-based" | 409 | bool "EP93xx-based" |
411 | select CPU_ARM920T | 410 | select ARCH_HAS_HOLES_MEMORYMODEL |
411 | select ARCH_REQUIRE_GPIOLIB | ||
412 | select ARCH_USES_GETTIMEOFFSET | ||
412 | select ARM_AMBA | 413 | select ARM_AMBA |
413 | select ARM_VIC | 414 | select ARM_VIC |
414 | select CLKDEV_LOOKUP | 415 | select CLKDEV_LOOKUP |
415 | select ARCH_REQUIRE_GPIOLIB | 416 | select CPU_ARM920T |
416 | select ARCH_HAS_HOLES_MEMORYMODEL | ||
417 | select ARCH_USES_GETTIMEOFFSET | ||
418 | select NEED_MACH_MEMORY_H | 417 | select NEED_MACH_MEMORY_H |
419 | help | 418 | help |
420 | This enables support for the Cirrus EP93xx series of CPUs. | 419 | This enables support for the Cirrus EP93xx series of CPUs. |
@@ -433,10 +432,10 @@ config ARCH_FOOTBRIDGE | |||
433 | 432 | ||
434 | config ARCH_MXC | 433 | config ARCH_MXC |
435 | bool "Freescale MXC/iMX-based" | 434 | bool "Freescale MXC/iMX-based" |
436 | select GENERIC_CLOCKEVENTS | ||
437 | select ARCH_REQUIRE_GPIOLIB | 435 | select ARCH_REQUIRE_GPIOLIB |
438 | select CLKDEV_LOOKUP | 436 | select CLKDEV_LOOKUP |
439 | select CLKSRC_MMIO | 437 | select CLKSRC_MMIO |
438 | select GENERIC_CLOCKEVENTS | ||
440 | select GENERIC_IRQ_CHIP | 439 | select GENERIC_IRQ_CHIP |
441 | select MULTI_IRQ_HANDLER | 440 | select MULTI_IRQ_HANDLER |
442 | select SPARSE_IRQ | 441 | select SPARSE_IRQ |
@@ -446,11 +445,11 @@ config ARCH_MXC | |||
446 | 445 | ||
447 | config ARCH_MXS | 446 | config ARCH_MXS |
448 | bool "Freescale MXS-based" | 447 | bool "Freescale MXS-based" |
449 | select GENERIC_CLOCKEVENTS | ||
450 | select ARCH_REQUIRE_GPIOLIB | 448 | select ARCH_REQUIRE_GPIOLIB |
451 | select CLKDEV_LOOKUP | 449 | select CLKDEV_LOOKUP |
452 | select CLKSRC_MMIO | 450 | select CLKSRC_MMIO |
453 | select COMMON_CLK | 451 | select COMMON_CLK |
452 | select GENERIC_CLOCKEVENTS | ||
454 | select HAVE_CLK_PREPARE | 453 | select HAVE_CLK_PREPARE |
455 | select MULTI_IRQ_HANDLER | 454 | select MULTI_IRQ_HANDLER |
456 | select PINCTRL | 455 | select PINCTRL |
@@ -461,43 +460,43 @@ config ARCH_MXS | |||
461 | 460 | ||
462 | config ARCH_NETX | 461 | config ARCH_NETX |
463 | bool "Hilscher NetX based" | 462 | bool "Hilscher NetX based" |
463 | select ARM_VIC | ||
464 | select CLKSRC_MMIO | 464 | select CLKSRC_MMIO |
465 | select CPU_ARM926T | 465 | select CPU_ARM926T |
466 | select ARM_VIC | ||
467 | select GENERIC_CLOCKEVENTS | 466 | select GENERIC_CLOCKEVENTS |
468 | help | 467 | help |
469 | This enables support for systems based on the Hilscher NetX Soc | 468 | This enables support for systems based on the Hilscher NetX Soc |
470 | 469 | ||
471 | config ARCH_H720X | 470 | config ARCH_H720X |
472 | bool "Hynix HMS720x-based" | 471 | bool "Hynix HMS720x-based" |
472 | select ARCH_USES_GETTIMEOFFSET | ||
473 | select CPU_ARM720T | 473 | select CPU_ARM720T |
474 | select ISA_DMA_API | 474 | select ISA_DMA_API |
475 | select ARCH_USES_GETTIMEOFFSET | ||
476 | help | 475 | help |
477 | This enables support for systems based on the Hynix HMS720x | 476 | This enables support for systems based on the Hynix HMS720x |
478 | 477 | ||
479 | config ARCH_IOP13XX | 478 | config ARCH_IOP13XX |
480 | bool "IOP13xx-based" | 479 | bool "IOP13xx-based" |
481 | depends on MMU | 480 | depends on MMU |
482 | select CPU_XSC3 | ||
483 | select PLAT_IOP | ||
484 | select PCI | ||
485 | select ARCH_SUPPORTS_MSI | 481 | select ARCH_SUPPORTS_MSI |
486 | select VMSPLIT_1G | 482 | select CPU_XSC3 |
487 | select NEED_MACH_MEMORY_H | 483 | select NEED_MACH_MEMORY_H |
488 | select NEED_RET_TO_USER | 484 | select NEED_RET_TO_USER |
485 | select PCI | ||
486 | select PLAT_IOP | ||
487 | select VMSPLIT_1G | ||
489 | help | 488 | help |
490 | Support for Intel's IOP13XX (XScale) family of processors. | 489 | Support for Intel's IOP13XX (XScale) family of processors. |
491 | 490 | ||
492 | config ARCH_IOP32X | 491 | config ARCH_IOP32X |
493 | bool "IOP32x-based" | 492 | bool "IOP32x-based" |
494 | depends on MMU | 493 | depends on MMU |
494 | select ARCH_REQUIRE_GPIOLIB | ||
495 | select CPU_XSCALE | 495 | select CPU_XSCALE |
496 | select NEED_MACH_GPIO_H | 496 | select NEED_MACH_GPIO_H |
497 | select NEED_RET_TO_USER | 497 | select NEED_RET_TO_USER |
498 | select PLAT_IOP | ||
499 | select PCI | 498 | select PCI |
500 | select ARCH_REQUIRE_GPIOLIB | 499 | select PLAT_IOP |
501 | help | 500 | help |
502 | Support for Intel's 80219 and IOP32X (XScale) family of | 501 | Support for Intel's 80219 and IOP32X (XScale) family of |
503 | processors. | 502 | processors. |
@@ -505,12 +504,12 @@ config ARCH_IOP32X | |||
505 | config ARCH_IOP33X | 504 | config ARCH_IOP33X |
506 | bool "IOP33x-based" | 505 | bool "IOP33x-based" |
507 | depends on MMU | 506 | depends on MMU |
507 | select ARCH_REQUIRE_GPIOLIB | ||
508 | select CPU_XSCALE | 508 | select CPU_XSCALE |
509 | select NEED_MACH_GPIO_H | 509 | select NEED_MACH_GPIO_H |
510 | select NEED_RET_TO_USER | 510 | select NEED_RET_TO_USER |
511 | select PLAT_IOP | ||
512 | select PCI | 511 | select PCI |
513 | select ARCH_REQUIRE_GPIOLIB | 512 | select PLAT_IOP |
514 | help | 513 | help |
515 | Support for Intel's IOP33X (XScale) family of processors. | 514 | Support for Intel's IOP33X (XScale) family of processors. |
516 | 515 | ||
@@ -518,20 +517,20 @@ config ARCH_IXP4XX | |||
518 | bool "IXP4xx-based" | 517 | bool "IXP4xx-based" |
519 | depends on MMU | 518 | depends on MMU |
520 | select ARCH_HAS_DMA_SET_COHERENT_MASK | 519 | select ARCH_HAS_DMA_SET_COHERENT_MASK |
520 | select ARCH_REQUIRE_GPIOLIB | ||
521 | select CLKSRC_MMIO | 521 | select CLKSRC_MMIO |
522 | select CPU_XSCALE | 522 | select CPU_XSCALE |
523 | select ARCH_REQUIRE_GPIOLIB | 523 | select DMABOUNCE if PCI |
524 | select GENERIC_CLOCKEVENTS | 524 | select GENERIC_CLOCKEVENTS |
525 | select MIGHT_HAVE_PCI | 525 | select MIGHT_HAVE_PCI |
526 | select NEED_MACH_IO_H | 526 | select NEED_MACH_IO_H |
527 | select DMABOUNCE if PCI | ||
528 | help | 527 | help |
529 | Support for Intel's IXP4XX (XScale) family of processors. | 528 | Support for Intel's IXP4XX (XScale) family of processors. |
530 | 529 | ||
531 | config ARCH_DOVE | 530 | config ARCH_DOVE |
532 | bool "Marvell Dove" | 531 | bool "Marvell Dove" |
533 | select CPU_V7 | ||
534 | select ARCH_REQUIRE_GPIOLIB | 532 | select ARCH_REQUIRE_GPIOLIB |
533 | select CPU_V7 | ||
535 | select GENERIC_CLOCKEVENTS | 534 | select GENERIC_CLOCKEVENTS |
536 | select MIGHT_HAVE_PCI | 535 | select MIGHT_HAVE_PCI |
537 | select PLAT_ORION_LEGACY | 536 | select PLAT_ORION_LEGACY |
@@ -541,36 +540,21 @@ config ARCH_DOVE | |||
541 | 540 | ||
542 | config ARCH_KIRKWOOD | 541 | config ARCH_KIRKWOOD |
543 | bool "Marvell Kirkwood" | 542 | bool "Marvell Kirkwood" |
544 | select CPU_FEROCEON | ||
545 | select PCI | ||
546 | select ARCH_REQUIRE_GPIOLIB | 543 | select ARCH_REQUIRE_GPIOLIB |
544 | select CPU_FEROCEON | ||
547 | select GENERIC_CLOCKEVENTS | 545 | select GENERIC_CLOCKEVENTS |
546 | select PCI | ||
548 | select PLAT_ORION_LEGACY | 547 | select PLAT_ORION_LEGACY |
549 | help | 548 | help |
550 | Support for the following Marvell Kirkwood series SoCs: | 549 | Support for the following Marvell Kirkwood series SoCs: |
551 | 88F6180, 88F6192 and 88F6281. | 550 | 88F6180, 88F6192 and 88F6281. |
552 | 551 | ||
553 | config ARCH_LPC32XX | ||
554 | bool "NXP LPC32XX" | ||
555 | select CLKSRC_MMIO | ||
556 | select CPU_ARM926T | ||
557 | select ARCH_REQUIRE_GPIOLIB | ||
558 | select HAVE_IDE | ||
559 | select ARM_AMBA | ||
560 | select USB_ARCH_HAS_OHCI | ||
561 | select CLKDEV_LOOKUP | ||
562 | select GENERIC_CLOCKEVENTS | ||
563 | select USE_OF | ||
564 | select HAVE_PWM | ||
565 | help | ||
566 | Support for the NXP LPC32XX family of processors | ||
567 | |||
568 | config ARCH_MV78XX0 | 552 | config ARCH_MV78XX0 |
569 | bool "Marvell MV78xx0" | 553 | bool "Marvell MV78xx0" |
570 | select CPU_FEROCEON | ||
571 | select PCI | ||
572 | select ARCH_REQUIRE_GPIOLIB | 554 | select ARCH_REQUIRE_GPIOLIB |
555 | select CPU_FEROCEON | ||
573 | select GENERIC_CLOCKEVENTS | 556 | select GENERIC_CLOCKEVENTS |
557 | select PCI | ||
574 | select PLAT_ORION_LEGACY | 558 | select PLAT_ORION_LEGACY |
575 | help | 559 | help |
576 | Support for the following Marvell MV78xx0 series SoCs: | 560 | Support for the following Marvell MV78xx0 series SoCs: |
@@ -579,10 +563,10 @@ config ARCH_MV78XX0 | |||
579 | config ARCH_ORION5X | 563 | config ARCH_ORION5X |
580 | bool "Marvell Orion" | 564 | bool "Marvell Orion" |
581 | depends on MMU | 565 | depends on MMU |
582 | select CPU_FEROCEON | ||
583 | select PCI | ||
584 | select ARCH_REQUIRE_GPIOLIB | 566 | select ARCH_REQUIRE_GPIOLIB |
567 | select CPU_FEROCEON | ||
585 | select GENERIC_CLOCKEVENTS | 568 | select GENERIC_CLOCKEVENTS |
569 | select PCI | ||
586 | select PLAT_ORION_LEGACY | 570 | select PLAT_ORION_LEGACY |
587 | help | 571 | help |
588 | Support for the following Marvell Orion 5x series SoCs: | 572 | Support for the following Marvell Orion 5x series SoCs: |
@@ -594,33 +578,33 @@ config ARCH_MMP | |||
594 | depends on MMU | 578 | depends on MMU |
595 | select ARCH_REQUIRE_GPIOLIB | 579 | select ARCH_REQUIRE_GPIOLIB |
596 | select CLKDEV_LOOKUP | 580 | select CLKDEV_LOOKUP |
581 | select GENERIC_ALLOCATOR | ||
597 | select GENERIC_CLOCKEVENTS | 582 | select GENERIC_CLOCKEVENTS |
598 | select GPIO_PXA | 583 | select GPIO_PXA |
599 | select IRQ_DOMAIN | 584 | select IRQ_DOMAIN |
585 | select NEED_MACH_GPIO_H | ||
600 | select PLAT_PXA | 586 | select PLAT_PXA |
601 | select SPARSE_IRQ | 587 | select SPARSE_IRQ |
602 | select GENERIC_ALLOCATOR | ||
603 | select NEED_MACH_GPIO_H | ||
604 | help | 588 | help |
605 | Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line. | 589 | Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line. |
606 | 590 | ||
607 | config ARCH_KS8695 | 591 | config ARCH_KS8695 |
608 | bool "Micrel/Kendin KS8695" | 592 | bool "Micrel/Kendin KS8695" |
609 | select CPU_ARM922T | ||
610 | select ARCH_REQUIRE_GPIOLIB | 593 | select ARCH_REQUIRE_GPIOLIB |
611 | select NEED_MACH_MEMORY_H | ||
612 | select CLKSRC_MMIO | 594 | select CLKSRC_MMIO |
595 | select CPU_ARM922T | ||
613 | select GENERIC_CLOCKEVENTS | 596 | select GENERIC_CLOCKEVENTS |
597 | select NEED_MACH_MEMORY_H | ||
614 | help | 598 | help |
615 | Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based | 599 | Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based |
616 | System-on-Chip devices. | 600 | System-on-Chip devices. |
617 | 601 | ||
618 | config ARCH_W90X900 | 602 | config ARCH_W90X900 |
619 | bool "Nuvoton W90X900 CPU" | 603 | bool "Nuvoton W90X900 CPU" |
620 | select CPU_ARM926T | ||
621 | select ARCH_REQUIRE_GPIOLIB | 604 | select ARCH_REQUIRE_GPIOLIB |
622 | select CLKDEV_LOOKUP | 605 | select CLKDEV_LOOKUP |
623 | select CLKSRC_MMIO | 606 | select CLKSRC_MMIO |
607 | select CPU_ARM926T | ||
624 | select GENERIC_CLOCKEVENTS | 608 | select GENERIC_CLOCKEVENTS |
625 | help | 609 | help |
626 | Support for Nuvoton (Winbond logic dept.) ARM9 processor, | 610 | Support for Nuvoton (Winbond logic dept.) ARM9 processor, |
@@ -631,18 +615,33 @@ config ARCH_W90X900 | |||
631 | <http://www.nuvoton.com/hq/enu/ProductAndSales/ProductLines/ | 615 | <http://www.nuvoton.com/hq/enu/ProductAndSales/ProductLines/ |
632 | ConsumerElectronicsIC/ARMMicrocontroller/ARMMicrocontroller> | 616 | ConsumerElectronicsIC/ARMMicrocontroller/ARMMicrocontroller> |
633 | 617 | ||
618 | config ARCH_LPC32XX | ||
619 | bool "NXP LPC32XX" | ||
620 | select ARCH_REQUIRE_GPIOLIB | ||
621 | select ARM_AMBA | ||
622 | select CLKDEV_LOOKUP | ||
623 | select CLKSRC_MMIO | ||
624 | select CPU_ARM926T | ||
625 | select GENERIC_CLOCKEVENTS | ||
626 | select HAVE_IDE | ||
627 | select HAVE_PWM | ||
628 | select USB_ARCH_HAS_OHCI | ||
629 | select USE_OF | ||
630 | help | ||
631 | Support for the NXP LPC32XX family of processors | ||
632 | |||
634 | config ARCH_TEGRA | 633 | config ARCH_TEGRA |
635 | bool "NVIDIA Tegra" | 634 | bool "NVIDIA Tegra" |
635 | select ARCH_HAS_CPUFREQ | ||
636 | select CLKDEV_LOOKUP | 636 | select CLKDEV_LOOKUP |
637 | select CLKSRC_MMIO | 637 | select CLKSRC_MMIO |
638 | select COMMON_CLK | ||
638 | select GENERIC_CLOCKEVENTS | 639 | select GENERIC_CLOCKEVENTS |
639 | select GENERIC_GPIO | 640 | select GENERIC_GPIO |
640 | select HAVE_CLK | 641 | select HAVE_CLK |
641 | select HAVE_SMP | 642 | select HAVE_SMP |
642 | select MIGHT_HAVE_CACHE_L2X0 | 643 | select MIGHT_HAVE_CACHE_L2X0 |
643 | select ARCH_HAS_CPUFREQ | ||
644 | select USE_OF | 644 | select USE_OF |
645 | select COMMON_CLK | ||
646 | help | 645 | help |
647 | This enables support for NVIDIA Tegra based systems (Tegra APX, | 646 | This enables support for NVIDIA Tegra based systems (Tegra APX, |
648 | Tegra 6xx and Tegra 2 series). | 647 | Tegra 6xx and Tegra 2 series). |
@@ -650,29 +649,29 @@ config ARCH_TEGRA | |||
650 | config ARCH_PXA | 649 | config ARCH_PXA |
651 | bool "PXA2xx/PXA3xx-based" | 650 | bool "PXA2xx/PXA3xx-based" |
652 | depends on MMU | 651 | depends on MMU |
653 | select ARCH_MTD_XIP | ||
654 | select ARCH_HAS_CPUFREQ | 652 | select ARCH_HAS_CPUFREQ |
653 | select ARCH_MTD_XIP | ||
654 | select ARCH_REQUIRE_GPIOLIB | ||
655 | select ARM_CPU_SUSPEND if PM | ||
656 | select AUTO_ZRELADDR | ||
655 | select CLKDEV_LOOKUP | 657 | select CLKDEV_LOOKUP |
656 | select CLKSRC_MMIO | 658 | select CLKSRC_MMIO |
657 | select ARCH_REQUIRE_GPIOLIB | ||
658 | select GENERIC_CLOCKEVENTS | 659 | select GENERIC_CLOCKEVENTS |
659 | select GPIO_PXA | 660 | select GPIO_PXA |
660 | select PLAT_PXA | ||
661 | select SPARSE_IRQ | ||
662 | select AUTO_ZRELADDR | ||
663 | select MULTI_IRQ_HANDLER | ||
664 | select ARM_CPU_SUSPEND if PM | ||
665 | select HAVE_IDE | 661 | select HAVE_IDE |
662 | select MULTI_IRQ_HANDLER | ||
666 | select NEED_MACH_GPIO_H | 663 | select NEED_MACH_GPIO_H |
664 | select PLAT_PXA | ||
665 | select SPARSE_IRQ | ||
667 | help | 666 | help |
668 | Support for Intel/Marvell's PXA2xx/PXA3xx processor line. | 667 | Support for Intel/Marvell's PXA2xx/PXA3xx processor line. |
669 | 668 | ||
670 | config ARCH_MSM | 669 | config ARCH_MSM |
671 | bool "Qualcomm MSM" | 670 | bool "Qualcomm MSM" |
672 | select HAVE_CLK | ||
673 | select GENERIC_CLOCKEVENTS | ||
674 | select ARCH_REQUIRE_GPIOLIB | 671 | select ARCH_REQUIRE_GPIOLIB |
675 | select CLKDEV_LOOKUP | 672 | select CLKDEV_LOOKUP |
673 | select GENERIC_CLOCKEVENTS | ||
674 | select HAVE_CLK | ||
676 | help | 675 | help |
677 | Support for Qualcomm MSM/QSD based systems. This runs on the | 676 | Support for Qualcomm MSM/QSD based systems. This runs on the |
678 | apps processor of the MSM/QSD and depends on a shared memory | 677 | apps processor of the MSM/QSD and depends on a shared memory |
@@ -682,50 +681,50 @@ config ARCH_MSM | |||
682 | 681 | ||
683 | config ARCH_SHMOBILE | 682 | config ARCH_SHMOBILE |
684 | bool "Renesas SH-Mobile / R-Mobile" | 683 | bool "Renesas SH-Mobile / R-Mobile" |
685 | select HAVE_CLK | ||
686 | select CLKDEV_LOOKUP | 684 | select CLKDEV_LOOKUP |
685 | select GENERIC_CLOCKEVENTS | ||
686 | select HAVE_CLK | ||
687 | select HAVE_MACH_CLKDEV | 687 | select HAVE_MACH_CLKDEV |
688 | select HAVE_SMP | 688 | select HAVE_SMP |
689 | select GENERIC_CLOCKEVENTS | ||
690 | select MIGHT_HAVE_CACHE_L2X0 | 689 | select MIGHT_HAVE_CACHE_L2X0 |
691 | select NO_IOPORT | ||
692 | select SPARSE_IRQ | ||
693 | select MULTI_IRQ_HANDLER | 690 | select MULTI_IRQ_HANDLER |
694 | select PM_GENERIC_DOMAINS if PM | ||
695 | select NEED_MACH_MEMORY_H | 691 | select NEED_MACH_MEMORY_H |
692 | select NO_IOPORT | ||
693 | select PM_GENERIC_DOMAINS if PM | ||
694 | select SPARSE_IRQ | ||
696 | help | 695 | help |
697 | Support for Renesas's SH-Mobile and R-Mobile ARM platforms. | 696 | Support for Renesas's SH-Mobile and R-Mobile ARM platforms. |
698 | 697 | ||
699 | config ARCH_RPC | 698 | config ARCH_RPC |
700 | bool "RiscPC" | 699 | bool "RiscPC" |
701 | select ARCH_ACORN | 700 | select ARCH_ACORN |
702 | select FIQ | ||
703 | select ARCH_MAY_HAVE_PC_FDC | 701 | select ARCH_MAY_HAVE_PC_FDC |
704 | select HAVE_PATA_PLATFORM | ||
705 | select ISA_DMA_API | ||
706 | select NO_IOPORT | ||
707 | select ARCH_SPARSEMEM_ENABLE | 702 | select ARCH_SPARSEMEM_ENABLE |
708 | select ARCH_USES_GETTIMEOFFSET | 703 | select ARCH_USES_GETTIMEOFFSET |
704 | select FIQ | ||
709 | select HAVE_IDE | 705 | select HAVE_IDE |
706 | select HAVE_PATA_PLATFORM | ||
707 | select ISA_DMA_API | ||
710 | select NEED_MACH_IO_H | 708 | select NEED_MACH_IO_H |
711 | select NEED_MACH_MEMORY_H | 709 | select NEED_MACH_MEMORY_H |
710 | select NO_IOPORT | ||
712 | help | 711 | help |
713 | On the Acorn Risc-PC, Linux can support the internal IDE disk and | 712 | On the Acorn Risc-PC, Linux can support the internal IDE disk and |
714 | CD-ROM interface, serial and parallel port, and the floppy drive. | 713 | CD-ROM interface, serial and parallel port, and the floppy drive. |
715 | 714 | ||
716 | config ARCH_SA1100 | 715 | config ARCH_SA1100 |
717 | bool "SA1100-based" | 716 | bool "SA1100-based" |
718 | select CLKSRC_MMIO | ||
719 | select CPU_SA1100 | ||
720 | select ISA | ||
721 | select ARCH_SPARSEMEM_ENABLE | ||
722 | select ARCH_MTD_XIP | ||
723 | select ARCH_HAS_CPUFREQ | 717 | select ARCH_HAS_CPUFREQ |
718 | select ARCH_MTD_XIP | ||
719 | select ARCH_REQUIRE_GPIOLIB | ||
720 | select ARCH_SPARSEMEM_ENABLE | ||
721 | select CLKDEV_LOOKUP | ||
722 | select CLKSRC_MMIO | ||
724 | select CPU_FREQ | 723 | select CPU_FREQ |
724 | select CPU_SA1100 | ||
725 | select GENERIC_CLOCKEVENTS | 725 | select GENERIC_CLOCKEVENTS |
726 | select CLKDEV_LOOKUP | ||
727 | select ARCH_REQUIRE_GPIOLIB | ||
728 | select HAVE_IDE | 726 | select HAVE_IDE |
727 | select ISA | ||
729 | select NEED_MACH_GPIO_H | 728 | select NEED_MACH_GPIO_H |
730 | select NEED_MACH_MEMORY_H | 729 | select NEED_MACH_MEMORY_H |
731 | select SPARSE_IRQ | 730 | select SPARSE_IRQ |
@@ -734,14 +733,14 @@ config ARCH_SA1100 | |||
734 | 733 | ||
735 | config ARCH_S3C24XX | 734 | config ARCH_S3C24XX |
736 | bool "Samsung S3C24XX SoCs" | 735 | bool "Samsung S3C24XX SoCs" |
737 | select GENERIC_GPIO | ||
738 | select ARCH_HAS_CPUFREQ | 736 | select ARCH_HAS_CPUFREQ |
739 | select HAVE_CLK | ||
740 | select CLKDEV_LOOKUP | ||
741 | select ARCH_USES_GETTIMEOFFSET | 737 | select ARCH_USES_GETTIMEOFFSET |
738 | select CLKDEV_LOOKUP | ||
739 | select GENERIC_GPIO | ||
740 | select HAVE_CLK | ||
742 | select HAVE_S3C2410_I2C if I2C | 741 | select HAVE_S3C2410_I2C if I2C |
743 | select HAVE_S3C_RTC if RTC_CLASS | ||
744 | select HAVE_S3C2410_WATCHDOG if WATCHDOG | 742 | select HAVE_S3C2410_WATCHDOG if WATCHDOG |
743 | select HAVE_S3C_RTC if RTC_CLASS | ||
745 | select NEED_MACH_GPIO_H | 744 | select NEED_MACH_GPIO_H |
746 | select NEED_MACH_IO_H | 745 | select NEED_MACH_IO_H |
747 | help | 746 | help |
@@ -752,38 +751,38 @@ config ARCH_S3C24XX | |||
752 | 751 | ||
753 | config ARCH_S3C64XX | 752 | config ARCH_S3C64XX |
754 | bool "Samsung S3C64XX" | 753 | bool "Samsung S3C64XX" |
755 | select PLAT_SAMSUNG | 754 | select ARCH_HAS_CPUFREQ |
756 | select CPU_V6 | 755 | select ARCH_REQUIRE_GPIOLIB |
756 | select ARCH_USES_GETTIMEOFFSET | ||
757 | select ARM_VIC | 757 | select ARM_VIC |
758 | select CLKDEV_LOOKUP | ||
759 | select CPU_V6 | ||
758 | select HAVE_CLK | 760 | select HAVE_CLK |
761 | select HAVE_S3C2410_I2C if I2C | ||
762 | select HAVE_S3C2410_WATCHDOG if WATCHDOG | ||
759 | select HAVE_TCM | 763 | select HAVE_TCM |
760 | select CLKDEV_LOOKUP | 764 | select NEED_MACH_GPIO_H |
761 | select NO_IOPORT | 765 | select NO_IOPORT |
762 | select ARCH_USES_GETTIMEOFFSET | 766 | select PLAT_SAMSUNG |
763 | select ARCH_HAS_CPUFREQ | 767 | select S3C_DEV_NAND |
764 | select ARCH_REQUIRE_GPIOLIB | 768 | select S3C_GPIO_TRACK |
765 | select SAMSUNG_CLKSRC | 769 | select SAMSUNG_CLKSRC |
770 | select SAMSUNG_GPIOLIB_4BIT | ||
766 | select SAMSUNG_IRQ_VIC_TIMER | 771 | select SAMSUNG_IRQ_VIC_TIMER |
767 | select S3C_GPIO_TRACK | ||
768 | select S3C_DEV_NAND | ||
769 | select USB_ARCH_HAS_OHCI | 772 | select USB_ARCH_HAS_OHCI |
770 | select SAMSUNG_GPIOLIB_4BIT | ||
771 | select HAVE_S3C2410_I2C if I2C | ||
772 | select HAVE_S3C2410_WATCHDOG if WATCHDOG | ||
773 | select NEED_MACH_GPIO_H | ||
774 | help | 773 | help |
775 | Samsung S3C64XX series based systems | 774 | Samsung S3C64XX series based systems |
776 | 775 | ||
777 | config ARCH_S5P64X0 | 776 | config ARCH_S5P64X0 |
778 | bool "Samsung S5P6440 S5P6450" | 777 | bool "Samsung S5P6440 S5P6450" |
779 | select CPU_V6 | ||
780 | select GENERIC_GPIO | ||
781 | select HAVE_CLK | ||
782 | select CLKDEV_LOOKUP | 778 | select CLKDEV_LOOKUP |
783 | select CLKSRC_MMIO | 779 | select CLKSRC_MMIO |
784 | select HAVE_S3C2410_WATCHDOG if WATCHDOG | 780 | select CPU_V6 |
785 | select GENERIC_CLOCKEVENTS | 781 | select GENERIC_CLOCKEVENTS |
782 | select GENERIC_GPIO | ||
783 | select HAVE_CLK | ||
786 | select HAVE_S3C2410_I2C if I2C | 784 | select HAVE_S3C2410_I2C if I2C |
785 | select HAVE_S3C2410_WATCHDOG if WATCHDOG | ||
787 | select HAVE_S3C_RTC if RTC_CLASS | 786 | select HAVE_S3C_RTC if RTC_CLASS |
788 | select NEED_MACH_GPIO_H | 787 | select NEED_MACH_GPIO_H |
789 | help | 788 | help |
@@ -792,50 +791,50 @@ config ARCH_S5P64X0 | |||
792 | 791 | ||
793 | config ARCH_S5PC100 | 792 | config ARCH_S5PC100 |
794 | bool "Samsung S5PC100" | 793 | bool "Samsung S5PC100" |
795 | select GENERIC_GPIO | 794 | select ARCH_USES_GETTIMEOFFSET |
796 | select HAVE_CLK | ||
797 | select CLKDEV_LOOKUP | 795 | select CLKDEV_LOOKUP |
798 | select CPU_V7 | 796 | select CPU_V7 |
799 | select ARCH_USES_GETTIMEOFFSET | 797 | select GENERIC_GPIO |
798 | select HAVE_CLK | ||
800 | select HAVE_S3C2410_I2C if I2C | 799 | select HAVE_S3C2410_I2C if I2C |
801 | select HAVE_S3C_RTC if RTC_CLASS | ||
802 | select HAVE_S3C2410_WATCHDOG if WATCHDOG | 800 | select HAVE_S3C2410_WATCHDOG if WATCHDOG |
801 | select HAVE_S3C_RTC if RTC_CLASS | ||
803 | select NEED_MACH_GPIO_H | 802 | select NEED_MACH_GPIO_H |
804 | help | 803 | help |
805 | Samsung S5PC100 series based systems | 804 | Samsung S5PC100 series based systems |
806 | 805 | ||
807 | config ARCH_S5PV210 | 806 | config ARCH_S5PV210 |
808 | bool "Samsung S5PV210/S5PC110" | 807 | bool "Samsung S5PV210/S5PC110" |
809 | select CPU_V7 | 808 | select ARCH_HAS_CPUFREQ |
810 | select ARCH_SPARSEMEM_ENABLE | ||
811 | select ARCH_HAS_HOLES_MEMORYMODEL | 809 | select ARCH_HAS_HOLES_MEMORYMODEL |
812 | select GENERIC_GPIO | 810 | select ARCH_SPARSEMEM_ENABLE |
813 | select HAVE_CLK | ||
814 | select CLKDEV_LOOKUP | 811 | select CLKDEV_LOOKUP |
815 | select CLKSRC_MMIO | 812 | select CLKSRC_MMIO |
816 | select ARCH_HAS_CPUFREQ | 813 | select CPU_V7 |
817 | select GENERIC_CLOCKEVENTS | 814 | select GENERIC_CLOCKEVENTS |
815 | select GENERIC_GPIO | ||
816 | select HAVE_CLK | ||
818 | select HAVE_S3C2410_I2C if I2C | 817 | select HAVE_S3C2410_I2C if I2C |
819 | select HAVE_S3C_RTC if RTC_CLASS | ||
820 | select HAVE_S3C2410_WATCHDOG if WATCHDOG | 818 | select HAVE_S3C2410_WATCHDOG if WATCHDOG |
819 | select HAVE_S3C_RTC if RTC_CLASS | ||
821 | select NEED_MACH_GPIO_H | 820 | select NEED_MACH_GPIO_H |
822 | select NEED_MACH_MEMORY_H | 821 | select NEED_MACH_MEMORY_H |
823 | help | 822 | help |
824 | Samsung S5PV210/S5PC110 series based systems | 823 | Samsung S5PV210/S5PC110 series based systems |
825 | 824 | ||
826 | config ARCH_EXYNOS | 825 | config ARCH_EXYNOS |
827 | bool "SAMSUNG EXYNOS" | 826 | bool "Samsung EXYNOS" |
828 | select CPU_V7 | 827 | select ARCH_HAS_CPUFREQ |
829 | select ARCH_SPARSEMEM_ENABLE | ||
830 | select ARCH_HAS_HOLES_MEMORYMODEL | 828 | select ARCH_HAS_HOLES_MEMORYMODEL |
831 | select GENERIC_GPIO | 829 | select ARCH_SPARSEMEM_ENABLE |
832 | select HAVE_CLK | ||
833 | select CLKDEV_LOOKUP | 830 | select CLKDEV_LOOKUP |
834 | select ARCH_HAS_CPUFREQ | 831 | select CPU_V7 |
835 | select GENERIC_CLOCKEVENTS | 832 | select GENERIC_CLOCKEVENTS |
836 | select HAVE_S3C_RTC if RTC_CLASS | 833 | select GENERIC_GPIO |
834 | select HAVE_CLK | ||
837 | select HAVE_S3C2410_I2C if I2C | 835 | select HAVE_S3C2410_I2C if I2C |
838 | select HAVE_S3C2410_WATCHDOG if WATCHDOG | 836 | select HAVE_S3C2410_WATCHDOG if WATCHDOG |
837 | select HAVE_S3C_RTC if RTC_CLASS | ||
839 | select NEED_MACH_GPIO_H | 838 | select NEED_MACH_GPIO_H |
840 | select NEED_MACH_MEMORY_H | 839 | select NEED_MACH_MEMORY_H |
841 | help | 840 | help |
@@ -843,13 +842,13 @@ config ARCH_EXYNOS | |||
843 | 842 | ||
844 | config ARCH_SHARK | 843 | config ARCH_SHARK |
845 | bool "Shark" | 844 | bool "Shark" |
845 | select ARCH_USES_GETTIMEOFFSET | ||
846 | select CPU_SA110 | 846 | select CPU_SA110 |
847 | select ISA | 847 | select ISA |
848 | select ISA_DMA | 848 | select ISA_DMA |
849 | select ZONE_DMA | ||
850 | select PCI | ||
851 | select ARCH_USES_GETTIMEOFFSET | ||
852 | select NEED_MACH_MEMORY_H | 849 | select NEED_MACH_MEMORY_H |
850 | select PCI | ||
851 | select ZONE_DMA | ||
853 | help | 852 | help |
854 | Support for the StrongARM based Digital DNARD machine, also known | 853 | Support for the StrongARM based Digital DNARD machine, also known |
855 | as "Shark" (<http://www.shark-linux.de/shark.html>). | 854 | as "Shark" (<http://www.shark-linux.de/shark.html>). |
@@ -857,17 +856,17 @@ config ARCH_SHARK | |||
857 | config ARCH_U300 | 856 | config ARCH_U300 |
858 | bool "ST-Ericsson U300 Series" | 857 | bool "ST-Ericsson U300 Series" |
859 | depends on MMU | 858 | depends on MMU |
860 | select CLKSRC_MMIO | 859 | select ARCH_REQUIRE_GPIOLIB |
861 | select CPU_ARM926T | ||
862 | select HAVE_TCM | ||
863 | select ARM_AMBA | 860 | select ARM_AMBA |
864 | select ARM_PATCH_PHYS_VIRT | 861 | select ARM_PATCH_PHYS_VIRT |
865 | select ARM_VIC | 862 | select ARM_VIC |
866 | select GENERIC_CLOCKEVENTS | ||
867 | select CLKDEV_LOOKUP | 863 | select CLKDEV_LOOKUP |
864 | select CLKSRC_MMIO | ||
868 | select COMMON_CLK | 865 | select COMMON_CLK |
866 | select CPU_ARM926T | ||
867 | select GENERIC_CLOCKEVENTS | ||
869 | select GENERIC_GPIO | 868 | select GENERIC_GPIO |
870 | select ARCH_REQUIRE_GPIOLIB | 869 | select HAVE_TCM |
871 | select SPARSE_IRQ | 870 | select SPARSE_IRQ |
872 | help | 871 | help |
873 | Support for ST-Ericsson U300 series mobile platforms. | 872 | Support for ST-Ericsson U300 series mobile platforms. |
@@ -875,12 +874,12 @@ config ARCH_U300 | |||
875 | config ARCH_U8500 | 874 | config ARCH_U8500 |
876 | bool "ST-Ericsson U8500 Series" | 875 | bool "ST-Ericsson U8500 Series" |
877 | depends on MMU | 876 | depends on MMU |
878 | select CPU_V7 | 877 | select ARCH_HAS_CPUFREQ |
878 | select ARCH_REQUIRE_GPIOLIB | ||
879 | select ARM_AMBA | 879 | select ARM_AMBA |
880 | select GENERIC_CLOCKEVENTS | ||
881 | select CLKDEV_LOOKUP | 880 | select CLKDEV_LOOKUP |
882 | select ARCH_REQUIRE_GPIOLIB | 881 | select CPU_V7 |
883 | select ARCH_HAS_CPUFREQ | 882 | select GENERIC_CLOCKEVENTS |
884 | select HAVE_SMP | 883 | select HAVE_SMP |
885 | select MIGHT_HAVE_CACHE_L2X0 | 884 | select MIGHT_HAVE_CACHE_L2X0 |
886 | help | 885 | help |
@@ -888,78 +887,78 @@ config ARCH_U8500 | |||
888 | 887 | ||
889 | config ARCH_NOMADIK | 888 | config ARCH_NOMADIK |
890 | bool "STMicroelectronics Nomadik" | 889 | bool "STMicroelectronics Nomadik" |
890 | select ARCH_REQUIRE_GPIOLIB | ||
891 | select ARM_AMBA | 891 | select ARM_AMBA |
892 | select ARM_VIC | 892 | select ARM_VIC |
893 | select CPU_ARM926T | ||
894 | select COMMON_CLK | 893 | select COMMON_CLK |
894 | select CPU_ARM926T | ||
895 | select GENERIC_CLOCKEVENTS | 895 | select GENERIC_CLOCKEVENTS |
896 | select MIGHT_HAVE_CACHE_L2X0 | ||
896 | select PINCTRL | 897 | select PINCTRL |
897 | select PINCTRL_STN8815 | 898 | select PINCTRL_STN8815 |
898 | select MIGHT_HAVE_CACHE_L2X0 | ||
899 | select ARCH_REQUIRE_GPIOLIB | ||
900 | help | 899 | help |
901 | Support for the Nomadik platform by ST-Ericsson | 900 | Support for the Nomadik platform by ST-Ericsson |
902 | 901 | ||
902 | config PLAT_SPEAR | ||
903 | bool "ST SPEAr" | ||
904 | select ARCH_REQUIRE_GPIOLIB | ||
905 | select ARM_AMBA | ||
906 | select CLKDEV_LOOKUP | ||
907 | select CLKSRC_MMIO | ||
908 | select COMMON_CLK | ||
909 | select GENERIC_CLOCKEVENTS | ||
910 | select HAVE_CLK | ||
911 | help | ||
912 | Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx). | ||
913 | |||
903 | config ARCH_DAVINCI | 914 | config ARCH_DAVINCI |
904 | bool "TI DaVinci" | 915 | bool "TI DaVinci" |
905 | select GENERIC_CLOCKEVENTS | 916 | select ARCH_HAS_HOLES_MEMORYMODEL |
906 | select ARCH_REQUIRE_GPIOLIB | 917 | select ARCH_REQUIRE_GPIOLIB |
907 | select ZONE_DMA | ||
908 | select HAVE_IDE | ||
909 | select CLKDEV_LOOKUP | 918 | select CLKDEV_LOOKUP |
910 | select GENERIC_ALLOCATOR | 919 | select GENERIC_ALLOCATOR |
920 | select GENERIC_CLOCKEVENTS | ||
911 | select GENERIC_IRQ_CHIP | 921 | select GENERIC_IRQ_CHIP |
912 | select ARCH_HAS_HOLES_MEMORYMODEL | 922 | select HAVE_IDE |
913 | select NEED_MACH_GPIO_H | 923 | select NEED_MACH_GPIO_H |
924 | select ZONE_DMA | ||
914 | help | 925 | help |
915 | Support for TI's DaVinci platform. | 926 | Support for TI's DaVinci platform. |
916 | 927 | ||
917 | config ARCH_OMAP | 928 | config ARCH_OMAP |
918 | bool "TI OMAP" | 929 | bool "TI OMAP" |
919 | depends on MMU | 930 | depends on MMU |
920 | select HAVE_CLK | ||
921 | select ARCH_REQUIRE_GPIOLIB | ||
922 | select ARCH_HAS_CPUFREQ | 931 | select ARCH_HAS_CPUFREQ |
923 | select CLKSRC_MMIO | ||
924 | select GENERIC_CLOCKEVENTS | ||
925 | select ARCH_HAS_HOLES_MEMORYMODEL | 932 | select ARCH_HAS_HOLES_MEMORYMODEL |
926 | select NEED_MACH_GPIO_H | ||
927 | help | ||
928 | Support for TI's OMAP platform (OMAP1/2/3/4). | ||
929 | |||
930 | config PLAT_SPEAR | ||
931 | bool "ST SPEAr" | ||
932 | select ARM_AMBA | ||
933 | select ARCH_REQUIRE_GPIOLIB | 933 | select ARCH_REQUIRE_GPIOLIB |
934 | select CLKDEV_LOOKUP | ||
935 | select COMMON_CLK | ||
936 | select CLKSRC_MMIO | 934 | select CLKSRC_MMIO |
937 | select GENERIC_CLOCKEVENTS | 935 | select GENERIC_CLOCKEVENTS |
938 | select HAVE_CLK | 936 | select HAVE_CLK |
937 | select NEED_MACH_GPIO_H | ||
939 | help | 938 | help |
940 | Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx). | 939 | Support for TI's OMAP platform (OMAP1/2/3/4). |
941 | 940 | ||
942 | config ARCH_VT8500 | 941 | config ARCH_VT8500 |
943 | bool "VIA/WonderMedia 85xx" | 942 | bool "VIA/WonderMedia 85xx" |
944 | select CPU_ARM926T | ||
945 | select GENERIC_GPIO | ||
946 | select ARCH_HAS_CPUFREQ | 943 | select ARCH_HAS_CPUFREQ |
947 | select GENERIC_CLOCKEVENTS | ||
948 | select ARCH_REQUIRE_GPIOLIB | 944 | select ARCH_REQUIRE_GPIOLIB |
949 | select USE_OF | 945 | select CLKDEV_LOOKUP |
950 | select COMMON_CLK | 946 | select COMMON_CLK |
947 | select CPU_ARM926T | ||
948 | select GENERIC_CLOCKEVENTS | ||
949 | select GENERIC_GPIO | ||
951 | select HAVE_CLK | 950 | select HAVE_CLK |
952 | select CLKDEV_LOOKUP | 951 | select USE_OF |
953 | help | 952 | help |
954 | Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip. | 953 | Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip. |
955 | 954 | ||
956 | config ARCH_ZYNQ | 955 | config ARCH_ZYNQ |
957 | bool "Xilinx Zynq ARM Cortex A9 Platform" | 956 | bool "Xilinx Zynq ARM Cortex A9 Platform" |
957 | select ARM_AMBA | ||
958 | select ARM_GIC | ||
959 | select CLKDEV_LOOKUP | ||
958 | select CPU_V7 | 960 | select CPU_V7 |
959 | select GENERIC_CLOCKEVENTS | 961 | select GENERIC_CLOCKEVENTS |
960 | select CLKDEV_LOOKUP | ||
961 | select ARM_GIC | ||
962 | select ARM_AMBA | ||
963 | select ICST | 962 | select ICST |
964 | select MIGHT_HAVE_CACHE_L2X0 | 963 | select MIGHT_HAVE_CACHE_L2X0 |
965 | select USE_OF | 964 | select USE_OF |
@@ -974,33 +973,33 @@ comment "CPU Core family selection" | |||
974 | 973 | ||
975 | config ARCH_MULTI_V4 | 974 | config ARCH_MULTI_V4 |
976 | bool "ARMv4 based platforms (FA526, StrongARM)" | 975 | bool "ARMv4 based platforms (FA526, StrongARM)" |
977 | select ARCH_MULTI_V4_V5 | ||
978 | depends on !ARCH_MULTI_V6_V7 | 976 | depends on !ARCH_MULTI_V6_V7 |
977 | select ARCH_MULTI_V4_V5 | ||
979 | 978 | ||
980 | config ARCH_MULTI_V4T | 979 | config ARCH_MULTI_V4T |
981 | bool "ARMv4T based platforms (ARM720T, ARM920T, ...)" | 980 | bool "ARMv4T based platforms (ARM720T, ARM920T, ...)" |
982 | select ARCH_MULTI_V4_V5 | ||
983 | depends on !ARCH_MULTI_V6_V7 | 981 | depends on !ARCH_MULTI_V6_V7 |
982 | select ARCH_MULTI_V4_V5 | ||
984 | 983 | ||
985 | config ARCH_MULTI_V5 | 984 | config ARCH_MULTI_V5 |
986 | bool "ARMv5 based platforms (ARM926T, XSCALE, PJ1, ...)" | 985 | bool "ARMv5 based platforms (ARM926T, XSCALE, PJ1, ...)" |
987 | select ARCH_MULTI_V4_V5 | ||
988 | depends on !ARCH_MULTI_V6_V7 | 986 | depends on !ARCH_MULTI_V6_V7 |
987 | select ARCH_MULTI_V4_V5 | ||
989 | 988 | ||
990 | config ARCH_MULTI_V4_V5 | 989 | config ARCH_MULTI_V4_V5 |
991 | bool | 990 | bool |
992 | 991 | ||
993 | config ARCH_MULTI_V6 | 992 | config ARCH_MULTI_V6 |
994 | bool "ARMv6 based platforms (ARM11, Scorpion, ...)" | 993 | bool "ARMv6 based platforms (ARM11, Scorpion, ...)" |
995 | select CPU_V6 | ||
996 | select ARCH_MULTI_V6_V7 | 994 | select ARCH_MULTI_V6_V7 |
995 | select CPU_V6 | ||
997 | 996 | ||
998 | config ARCH_MULTI_V7 | 997 | config ARCH_MULTI_V7 |
999 | bool "ARMv7 based platforms (Cortex-A, PJ4, Krait)" | 998 | bool "ARMv7 based platforms (Cortex-A, PJ4, Krait)" |
1000 | select CPU_V7 | ||
1001 | select ARCH_VEXPRESS | ||
1002 | default y | 999 | default y |
1003 | select ARCH_MULTI_V6_V7 | 1000 | select ARCH_MULTI_V6_V7 |
1001 | select ARCH_VEXPRESS | ||
1002 | select CPU_V7 | ||
1004 | 1003 | ||
1005 | config ARCH_MULTI_V6_V7 | 1004 | config ARCH_MULTI_V6_V7 |
1006 | bool | 1005 | bool |
@@ -1137,9 +1136,9 @@ config PLAT_IOP | |||
1137 | config PLAT_ORION | 1136 | config PLAT_ORION |
1138 | bool | 1137 | bool |
1139 | select CLKSRC_MMIO | 1138 | select CLKSRC_MMIO |
1139 | select COMMON_CLK | ||
1140 | select GENERIC_IRQ_CHIP | 1140 | select GENERIC_IRQ_CHIP |
1141 | select IRQ_DOMAIN | 1141 | select IRQ_DOMAIN |
1142 | select COMMON_CLK | ||
1143 | 1142 | ||
1144 | config PLAT_ORION_LEGACY | 1143 | config PLAT_ORION_LEGACY |
1145 | bool | 1144 | bool |
@@ -1497,8 +1496,8 @@ config SMP | |||
1497 | depends on GENERIC_CLOCKEVENTS | 1496 | depends on GENERIC_CLOCKEVENTS |
1498 | depends on HAVE_SMP | 1497 | depends on HAVE_SMP |
1499 | depends on MMU | 1498 | depends on MMU |
1500 | select USE_GENERIC_SMP_HELPERS | ||
1501 | select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP | 1499 | select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP |
1500 | select USE_GENERIC_SMP_HELPERS | ||
1502 | help | 1501 | help |
1503 | This enables support for systems with more than one CPU. If you have | 1502 | This enables support for systems with more than one CPU. If you have |
1504 | a system with only one CPU, like most personal computers, say N. If | 1503 | a system with only one CPU, like most personal computers, say N. If |
@@ -1857,9 +1856,9 @@ menu "Boot options" | |||
1857 | 1856 | ||
1858 | config USE_OF | 1857 | config USE_OF |
1859 | bool "Flattened Device Tree support" | 1858 | bool "Flattened Device Tree support" |
1859 | select IRQ_DOMAIN | ||
1860 | select OF | 1860 | select OF |
1861 | select OF_EARLY_FLATTREE | 1861 | select OF_EARLY_FLATTREE |
1862 | select IRQ_DOMAIN | ||
1863 | help | 1862 | help |
1864 | Include support for flattened device tree machine descriptions. | 1863 | Include support for flattened device tree machine descriptions. |
1865 | 1864 | ||
@@ -2141,8 +2140,8 @@ config CPU_FREQ_PXA | |||
2141 | bool | 2140 | bool |
2142 | depends on CPU_FREQ && ARCH_PXA && PXA25x | 2141 | depends on CPU_FREQ && ARCH_PXA && PXA25x |
2143 | default y | 2142 | default y |
2144 | select CPU_FREQ_TABLE | ||
2145 | select CPU_FREQ_DEFAULT_GOV_USERSPACE | 2143 | select CPU_FREQ_DEFAULT_GOV_USERSPACE |
2144 | select CPU_FREQ_TABLE | ||
2146 | 2145 | ||
2147 | config CPU_FREQ_S3C | 2146 | config CPU_FREQ_S3C |
2148 | bool | 2147 | bool |
diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig index 283fa1d804f4..45ceeb0e93e0 100644 --- a/arch/arm/common/Kconfig +++ b/arch/arm/common/Kconfig | |||
@@ -1,15 +1,15 @@ | |||
1 | config ARM_GIC | 1 | config ARM_GIC |
2 | bool | ||
2 | select IRQ_DOMAIN | 3 | select IRQ_DOMAIN |
3 | select MULTI_IRQ_HANDLER | 4 | select MULTI_IRQ_HANDLER |
4 | bool | ||
5 | 5 | ||
6 | config GIC_NON_BANKED | 6 | config GIC_NON_BANKED |
7 | bool | 7 | bool |
8 | 8 | ||
9 | config ARM_VIC | 9 | config ARM_VIC |
10 | bool | ||
10 | select IRQ_DOMAIN | 11 | select IRQ_DOMAIN |
11 | select MULTI_IRQ_HANDLER | 12 | select MULTI_IRQ_HANDLER |
12 | bool | ||
13 | 13 | ||
14 | config ARM_VIC_NR | 14 | config ARM_VIC_NR |
15 | int | 15 | int |
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index c8050b14e615..b14207101938 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig | |||
@@ -19,8 +19,8 @@ config AT91_SAM9G45_RESET | |||
19 | 19 | ||
20 | config SOC_AT91SAM9 | 20 | config SOC_AT91SAM9 |
21 | bool | 21 | bool |
22 | select GENERIC_CLOCKEVENTS | ||
23 | select CPU_ARM926T | 22 | select CPU_ARM926T |
23 | select GENERIC_CLOCKEVENTS | ||
24 | 24 | ||
25 | menu "Atmel AT91 System-on-Chip" | 25 | menu "Atmel AT91 System-on-Chip" |
26 | 26 | ||
@@ -28,66 +28,66 @@ comment "Atmel AT91 Processor" | |||
28 | 28 | ||
29 | config SOC_AT91SAM9 | 29 | config SOC_AT91SAM9 |
30 | bool | 30 | bool |
31 | select AT91_SAM9_SMC | ||
32 | select AT91_SAM9_TIME | ||
31 | select CPU_ARM926T | 33 | select CPU_ARM926T |
32 | select MULTI_IRQ_HANDLER | 34 | select MULTI_IRQ_HANDLER |
33 | select SPARSE_IRQ | 35 | select SPARSE_IRQ |
34 | select AT91_SAM9_TIME | ||
35 | select AT91_SAM9_SMC | ||
36 | 36 | ||
37 | config SOC_AT91RM9200 | 37 | config SOC_AT91RM9200 |
38 | bool "AT91RM9200" | 38 | bool "AT91RM9200" |
39 | select CPU_ARM920T | 39 | select CPU_ARM920T |
40 | select MULTI_IRQ_HANDLER | ||
41 | select SPARSE_IRQ | ||
42 | select GENERIC_CLOCKEVENTS | 40 | select GENERIC_CLOCKEVENTS |
43 | select HAVE_AT91_DBGU0 | 41 | select HAVE_AT91_DBGU0 |
42 | select MULTI_IRQ_HANDLER | ||
43 | select SPARSE_IRQ | ||
44 | 44 | ||
45 | config SOC_AT91SAM9260 | 45 | config SOC_AT91SAM9260 |
46 | bool "AT91SAM9260, AT91SAM9XE or AT91SAM9G20" | 46 | bool "AT91SAM9260, AT91SAM9XE or AT91SAM9G20" |
47 | select SOC_AT91SAM9 | ||
48 | select HAVE_AT91_DBGU0 | 47 | select HAVE_AT91_DBGU0 |
49 | select HAVE_NET_MACB | 48 | select HAVE_NET_MACB |
49 | select SOC_AT91SAM9 | ||
50 | help | 50 | help |
51 | Select this if you are using one of Atmel's AT91SAM9260, AT91SAM9XE | 51 | Select this if you are using one of Atmel's AT91SAM9260, AT91SAM9XE |
52 | or AT91SAM9G20 SoC. | 52 | or AT91SAM9G20 SoC. |
53 | 53 | ||
54 | config SOC_AT91SAM9261 | 54 | config SOC_AT91SAM9261 |
55 | bool "AT91SAM9261 or AT91SAM9G10" | 55 | bool "AT91SAM9261 or AT91SAM9G10" |
56 | select SOC_AT91SAM9 | ||
57 | select HAVE_AT91_DBGU0 | 56 | select HAVE_AT91_DBGU0 |
58 | select HAVE_FB_ATMEL | 57 | select HAVE_FB_ATMEL |
58 | select SOC_AT91SAM9 | ||
59 | help | 59 | help |
60 | Select this if you are using one of Atmel's AT91SAM9261 or AT91SAM9G10 SoC. | 60 | Select this if you are using one of Atmel's AT91SAM9261 or AT91SAM9G10 SoC. |
61 | 61 | ||
62 | config SOC_AT91SAM9263 | 62 | config SOC_AT91SAM9263 |
63 | bool "AT91SAM9263" | 63 | bool "AT91SAM9263" |
64 | select SOC_AT91SAM9 | ||
65 | select HAVE_AT91_DBGU1 | 64 | select HAVE_AT91_DBGU1 |
66 | select HAVE_FB_ATMEL | 65 | select HAVE_FB_ATMEL |
67 | select HAVE_NET_MACB | 66 | select HAVE_NET_MACB |
67 | select SOC_AT91SAM9 | ||
68 | 68 | ||
69 | config SOC_AT91SAM9RL | 69 | config SOC_AT91SAM9RL |
70 | bool "AT91SAM9RL" | 70 | bool "AT91SAM9RL" |
71 | select SOC_AT91SAM9 | ||
72 | select HAVE_AT91_DBGU0 | 71 | select HAVE_AT91_DBGU0 |
73 | select HAVE_FB_ATMEL | 72 | select HAVE_FB_ATMEL |
73 | select SOC_AT91SAM9 | ||
74 | 74 | ||
75 | config SOC_AT91SAM9G45 | 75 | config SOC_AT91SAM9G45 |
76 | bool "AT91SAM9G45 or AT91SAM9M10 families" | 76 | bool "AT91SAM9G45 or AT91SAM9M10 families" |
77 | select SOC_AT91SAM9 | ||
78 | select HAVE_AT91_DBGU1 | 77 | select HAVE_AT91_DBGU1 |
79 | select HAVE_FB_ATMEL | 78 | select HAVE_FB_ATMEL |
80 | select HAVE_NET_MACB | 79 | select HAVE_NET_MACB |
80 | select SOC_AT91SAM9 | ||
81 | help | 81 | help |
82 | Select this if you are using one of Atmel's AT91SAM9G45 family SoC. | 82 | Select this if you are using one of Atmel's AT91SAM9G45 family SoC. |
83 | This support covers AT91SAM9G45, AT91SAM9G46, AT91SAM9M10 and AT91SAM9M11. | 83 | This support covers AT91SAM9G45, AT91SAM9G46, AT91SAM9M10 and AT91SAM9M11. |
84 | 84 | ||
85 | config SOC_AT91SAM9X5 | 85 | config SOC_AT91SAM9X5 |
86 | bool "AT91SAM9x5 family" | 86 | bool "AT91SAM9x5 family" |
87 | select SOC_AT91SAM9 | ||
88 | select HAVE_AT91_DBGU0 | 87 | select HAVE_AT91_DBGU0 |
89 | select HAVE_FB_ATMEL | 88 | select HAVE_FB_ATMEL |
90 | select HAVE_NET_MACB | 89 | select HAVE_NET_MACB |
90 | select SOC_AT91SAM9 | ||
91 | help | 91 | help |
92 | Select this if you are using one of Atmel's AT91SAM9x5 family SoC. | 92 | Select this if you are using one of Atmel's AT91SAM9x5 family SoC. |
93 | This means that your SAM9 name finishes with a '5' (except if it is | 93 | This means that your SAM9 name finishes with a '5' (except if it is |
@@ -97,9 +97,9 @@ config SOC_AT91SAM9X5 | |||
97 | 97 | ||
98 | config SOC_AT91SAM9N12 | 98 | config SOC_AT91SAM9N12 |
99 | bool "AT91SAM9N12 family" | 99 | bool "AT91SAM9N12 family" |
100 | select SOC_AT91SAM9 | ||
101 | select HAVE_AT91_DBGU0 | 100 | select HAVE_AT91_DBGU0 |
102 | select HAVE_FB_ATMEL | 101 | select HAVE_FB_ATMEL |
102 | select SOC_AT91SAM9 | ||
103 | help | 103 | help |
104 | Select this if you are using Atmel's AT91SAM9N12 SoC. | 104 | Select this if you are using Atmel's AT91SAM9N12 SoC. |
105 | 105 | ||
@@ -144,9 +144,9 @@ config ARCH_AT91SAM9G45 | |||
144 | config ARCH_AT91X40 | 144 | config ARCH_AT91X40 |
145 | bool "AT91x40" | 145 | bool "AT91x40" |
146 | depends on !MMU | 146 | depends on !MMU |
147 | select ARCH_USES_GETTIMEOFFSET | ||
147 | select MULTI_IRQ_HANDLER | 148 | select MULTI_IRQ_HANDLER |
148 | select SPARSE_IRQ | 149 | select SPARSE_IRQ |
149 | select ARCH_USES_GETTIMEOFFSET | ||
150 | 150 | ||
151 | endchoice | 151 | endchoice |
152 | 152 | ||
diff --git a/arch/arm/mach-clps711x/Kconfig b/arch/arm/mach-clps711x/Kconfig index e6135363765a..263242da2cb8 100644 --- a/arch/arm/mach-clps711x/Kconfig +++ b/arch/arm/mach-clps711x/Kconfig | |||
@@ -23,9 +23,9 @@ config ARCH_CLEP7312 | |||
23 | 23 | ||
24 | config ARCH_EDB7211 | 24 | config ARCH_EDB7211 |
25 | bool "EDB7211" | 25 | bool "EDB7211" |
26 | select ISA | ||
27 | select ARCH_SPARSEMEM_ENABLE | ||
28 | select ARCH_SELECT_MEMORY_MODEL | 26 | select ARCH_SELECT_MEMORY_MODEL |
27 | select ARCH_SPARSEMEM_ENABLE | ||
28 | select ISA | ||
29 | help | 29 | help |
30 | Say Y here if you intend to run this kernel on a Cirrus Logic EDB-7211 | 30 | Say Y here if you intend to run this kernel on a Cirrus Logic EDB-7211 |
31 | evaluation board. | 31 | evaluation board. |
diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index 026b4b277ae5..f8eecb959413 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig | |||
@@ -4,12 +4,12 @@ config AINTC | |||
4 | bool | 4 | bool |
5 | 5 | ||
6 | config CP_INTC | 6 | config CP_INTC |
7 | select IRQ_DOMAIN | ||
8 | bool | 7 | bool |
8 | select IRQ_DOMAIN | ||
9 | 9 | ||
10 | config ARCH_DAVINCI_DMx | 10 | config ARCH_DAVINCI_DMx |
11 | select CPU_ARM926T | ||
12 | bool | 11 | bool |
12 | select CPU_ARM926T | ||
13 | 13 | ||
14 | menu "TI DaVinci Implementations" | 14 | menu "TI DaVinci Implementations" |
15 | 15 | ||
@@ -32,19 +32,19 @@ config ARCH_DAVINCI_DM646x | |||
32 | 32 | ||
33 | config ARCH_DAVINCI_DA830 | 33 | config ARCH_DAVINCI_DA830 |
34 | bool "DA830/OMAP-L137/AM17x based system" | 34 | bool "DA830/OMAP-L137/AM17x based system" |
35 | select CP_INTC | ||
36 | select ARCH_DAVINCI_DA8XX | 35 | select ARCH_DAVINCI_DA8XX |
37 | select CPU_DCACHE_WRITETHROUGH # needed on silicon revs 1.0, 1.1 | 36 | select CPU_DCACHE_WRITETHROUGH # needed on silicon revs 1.0, 1.1 |
37 | select CP_INTC | ||
38 | 38 | ||
39 | config ARCH_DAVINCI_DA850 | 39 | config ARCH_DAVINCI_DA850 |
40 | bool "DA850/OMAP-L138/AM18x based system" | 40 | bool "DA850/OMAP-L138/AM18x based system" |
41 | select CP_INTC | ||
42 | select ARCH_DAVINCI_DA8XX | 41 | select ARCH_DAVINCI_DA8XX |
43 | select ARCH_HAS_CPUFREQ | 42 | select ARCH_HAS_CPUFREQ |
43 | select CP_INTC | ||
44 | 44 | ||
45 | config ARCH_DAVINCI_DA8XX | 45 | config ARCH_DAVINCI_DA8XX |
46 | select CPU_ARM926T | ||
47 | bool | 46 | bool |
47 | select CPU_ARM926T | ||
48 | 48 | ||
49 | config ARCH_DAVINCI_DM365 | 49 | config ARCH_DAVINCI_DM365 |
50 | bool "DaVinci 365 based system" | 50 | bool "DaVinci 365 based system" |
@@ -52,9 +52,9 @@ config ARCH_DAVINCI_DM365 | |||
52 | select ARCH_DAVINCI_DMx | 52 | select ARCH_DAVINCI_DMx |
53 | 53 | ||
54 | config ARCH_DAVINCI_TNETV107X | 54 | config ARCH_DAVINCI_TNETV107X |
55 | bool "TNETV107X based system" | ||
55 | select CPU_V6 | 56 | select CPU_V6 |
56 | select CP_INTC | 57 | select CP_INTC |
57 | bool "TNETV107X based system" | ||
58 | 58 | ||
59 | comment "DaVinci Board Type" | 59 | comment "DaVinci Board Type" |
60 | 60 | ||
@@ -103,9 +103,9 @@ config MACH_DAVINCI_DM6467_EVM | |||
103 | bool "TI DM6467 EVM" | 103 | bool "TI DM6467 EVM" |
104 | default ARCH_DAVINCI_DM646x | 104 | default ARCH_DAVINCI_DM646x |
105 | depends on ARCH_DAVINCI_DM646x | 105 | depends on ARCH_DAVINCI_DM646x |
106 | select MACH_DAVINCI_DM6467TEVM | ||
107 | select EEPROM_AT24 | 106 | select EEPROM_AT24 |
108 | select I2C | 107 | select I2C |
108 | select MACH_DAVINCI_DM6467TEVM | ||
109 | help | 109 | help |
110 | Configure this option to specify the whether the board used | 110 | Configure this option to specify the whether the board used |
111 | for development is a DM6467 EVM | 111 | for development is a DM6467 EVM |
@@ -127,8 +127,8 @@ config MACH_DAVINCI_DA830_EVM | |||
127 | bool "TI DA830/OMAP-L137/AM17x Reference Platform" | 127 | bool "TI DA830/OMAP-L137/AM17x Reference Platform" |
128 | default ARCH_DAVINCI_DA830 | 128 | default ARCH_DAVINCI_DA830 |
129 | depends on ARCH_DAVINCI_DA830 | 129 | depends on ARCH_DAVINCI_DA830 |
130 | select GPIO_PCF857X | ||
131 | select EEPROM_AT24 | 130 | select EEPROM_AT24 |
131 | select GPIO_PCF857X | ||
132 | select I2C | 132 | select I2C |
133 | help | 133 | help |
134 | Say Y here to select the TI DA830/OMAP-L137/AM17x Evaluation Module. | 134 | Say Y here to select the TI DA830/OMAP-L137/AM17x Evaluation Module. |
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 4372075c551f..da55107033dd 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig | |||
@@ -31,11 +31,11 @@ config CPU_EXYNOS4210 | |||
31 | bool "SAMSUNG EXYNOS4210" | 31 | bool "SAMSUNG EXYNOS4210" |
32 | default y | 32 | default y |
33 | depends on ARCH_EXYNOS4 | 33 | depends on ARCH_EXYNOS4 |
34 | select SAMSUNG_DMADEV | ||
35 | select ARM_CPU_SUSPEND if PM | 34 | select ARM_CPU_SUSPEND if PM |
35 | select PM_GENERIC_DOMAINS | ||
36 | select S5P_PM if PM | 36 | select S5P_PM if PM |
37 | select S5P_SLEEP if PM | 37 | select S5P_SLEEP if PM |
38 | select PM_GENERIC_DOMAINS | 38 | select SAMSUNG_DMADEV |
39 | help | 39 | help |
40 | Enable EXYNOS4210 CPU support | 40 | Enable EXYNOS4210 CPU support |
41 | 41 | ||
@@ -43,9 +43,9 @@ config SOC_EXYNOS4212 | |||
43 | bool "SAMSUNG EXYNOS4212" | 43 | bool "SAMSUNG EXYNOS4212" |
44 | default y | 44 | default y |
45 | depends on ARCH_EXYNOS4 | 45 | depends on ARCH_EXYNOS4 |
46 | select SAMSUNG_DMADEV | ||
47 | select S5P_PM if PM | 46 | select S5P_PM if PM |
48 | select S5P_SLEEP if PM | 47 | select S5P_SLEEP if PM |
48 | select SAMSUNG_DMADEV | ||
49 | help | 49 | help |
50 | Enable EXYNOS4212 SoC support | 50 | Enable EXYNOS4212 SoC support |
51 | 51 | ||
@@ -61,9 +61,9 @@ config SOC_EXYNOS5250 | |||
61 | bool "SAMSUNG EXYNOS5250" | 61 | bool "SAMSUNG EXYNOS5250" |
62 | default y | 62 | default y |
63 | depends on ARCH_EXYNOS5 | 63 | depends on ARCH_EXYNOS5 |
64 | select SAMSUNG_DMADEV | ||
65 | select S5P_PM if PM | 64 | select S5P_PM if PM |
66 | select S5P_SLEEP if PM | 65 | select S5P_SLEEP if PM |
66 | select SAMSUNG_DMADEV | ||
67 | help | 67 | help |
68 | Enable EXYNOS5250 SoC support | 68 | Enable EXYNOS5250 SoC support |
69 | 69 | ||
@@ -189,71 +189,71 @@ config MACH_SMDKC210 | |||
189 | config MACH_SMDKV310 | 189 | config MACH_SMDKV310 |
190 | bool "SMDKV310" | 190 | bool "SMDKV310" |
191 | select CPU_EXYNOS4210 | 191 | select CPU_EXYNOS4210 |
192 | select S5P_DEV_FIMD0 | 192 | select EXYNOS4_DEV_AHCI |
193 | select EXYNOS4_DEV_USB_OHCI | ||
194 | select EXYNOS4_SETUP_FIMD0 | ||
195 | select EXYNOS4_SETUP_I2C1 | ||
196 | select EXYNOS4_SETUP_KEYPAD | ||
197 | select EXYNOS4_SETUP_SDHCI | ||
198 | select EXYNOS4_SETUP_USB_PHY | ||
199 | select EXYNOS_DEV_DMA | ||
200 | select EXYNOS_DEV_DRM | ||
201 | select EXYNOS_DEV_SYSMMU | ||
202 | select S3C24XX_PWM | ||
203 | select S3C_DEV_HSMMC | ||
204 | select S3C_DEV_HSMMC1 | ||
205 | select S3C_DEV_HSMMC2 | ||
206 | select S3C_DEV_HSMMC3 | ||
207 | select S3C_DEV_I2C1 | ||
193 | select S3C_DEV_RTC | 208 | select S3C_DEV_RTC |
209 | select S3C_DEV_USB_HSOTG | ||
194 | select S3C_DEV_WDT | 210 | select S3C_DEV_WDT |
195 | select S3C_DEV_I2C1 | ||
196 | select S5P_DEV_FIMC0 | 211 | select S5P_DEV_FIMC0 |
197 | select S5P_DEV_FIMC1 | 212 | select S5P_DEV_FIMC1 |
198 | select S5P_DEV_FIMC2 | 213 | select S5P_DEV_FIMC2 |
199 | select S5P_DEV_FIMC3 | 214 | select S5P_DEV_FIMC3 |
215 | select S5P_DEV_FIMD0 | ||
200 | select S5P_DEV_G2D | 216 | select S5P_DEV_G2D |
201 | select S5P_DEV_I2C_HDMIPHY | 217 | select S5P_DEV_I2C_HDMIPHY |
202 | select S5P_DEV_JPEG | 218 | select S5P_DEV_JPEG |
203 | select S5P_DEV_MFC | 219 | select S5P_DEV_MFC |
204 | select S5P_DEV_TV | 220 | select S5P_DEV_TV |
205 | select S5P_DEV_USB_EHCI | 221 | select S5P_DEV_USB_EHCI |
206 | select S3C_DEV_HSMMC | ||
207 | select S3C_DEV_HSMMC1 | ||
208 | select S3C_DEV_HSMMC2 | ||
209 | select S3C_DEV_HSMMC3 | ||
210 | select S3C_DEV_USB_HSOTG | ||
211 | select SAMSUNG_DEV_BACKLIGHT | 222 | select SAMSUNG_DEV_BACKLIGHT |
212 | select EXYNOS_DEV_DRM | ||
213 | select EXYNOS_DEV_SYSMMU | ||
214 | select EXYNOS4_DEV_AHCI | ||
215 | select SAMSUNG_DEV_KEYPAD | 223 | select SAMSUNG_DEV_KEYPAD |
216 | select EXYNOS_DEV_DMA | ||
217 | select SAMSUNG_DEV_PWM | 224 | select SAMSUNG_DEV_PWM |
218 | select EXYNOS4_DEV_USB_OHCI | ||
219 | select EXYNOS4_SETUP_FIMD0 | ||
220 | select EXYNOS4_SETUP_I2C1 | ||
221 | select EXYNOS4_SETUP_KEYPAD | ||
222 | select EXYNOS4_SETUP_SDHCI | ||
223 | select EXYNOS4_SETUP_USB_PHY | ||
224 | select S3C24XX_PWM | ||
225 | help | 225 | help |
226 | Machine support for Samsung SMDKV310 | 226 | Machine support for Samsung SMDKV310 |
227 | 227 | ||
228 | config MACH_ARMLEX4210 | 228 | config MACH_ARMLEX4210 |
229 | bool "ARMLEX4210" | 229 | bool "ARMLEX4210" |
230 | select CPU_EXYNOS4210 | 230 | select CPU_EXYNOS4210 |
231 | select S3C_DEV_RTC | 231 | select EXYNOS4_DEV_AHCI |
232 | select S3C_DEV_WDT | 232 | select EXYNOS4_SETUP_SDHCI |
233 | select EXYNOS_DEV_DMA | ||
233 | select S3C_DEV_HSMMC | 234 | select S3C_DEV_HSMMC |
234 | select S3C_DEV_HSMMC2 | 235 | select S3C_DEV_HSMMC2 |
235 | select S3C_DEV_HSMMC3 | 236 | select S3C_DEV_HSMMC3 |
236 | select EXYNOS4_DEV_AHCI | 237 | select S3C_DEV_RTC |
237 | select EXYNOS_DEV_DMA | 238 | select S3C_DEV_WDT |
238 | select EXYNOS4_SETUP_SDHCI | ||
239 | help | 239 | help |
240 | Machine support for Samsung ARMLEX4210 based on EXYNOS4210 | 240 | Machine support for Samsung ARMLEX4210 based on EXYNOS4210 |
241 | 241 | ||
242 | config MACH_UNIVERSAL_C210 | 242 | config MACH_UNIVERSAL_C210 |
243 | bool "Mobile UNIVERSAL_C210 Board" | 243 | bool "Mobile UNIVERSAL_C210 Board" |
244 | select CPU_EXYNOS4210 | ||
245 | select S5P_HRT | ||
246 | select CLKSRC_MMIO | 244 | select CLKSRC_MMIO |
245 | select CPU_EXYNOS4210 | ||
246 | select EXYNOS4_SETUP_FIMC | ||
247 | select EXYNOS4_SETUP_FIMD0 | ||
248 | select EXYNOS4_SETUP_I2C1 | ||
249 | select EXYNOS4_SETUP_I2C3 | ||
250 | select EXYNOS4_SETUP_I2C5 | ||
251 | select EXYNOS4_SETUP_SDHCI | ||
252 | select EXYNOS4_SETUP_USB_PHY | ||
253 | select EXYNOS_DEV_DMA | ||
254 | select EXYNOS_DEV_DRM | ||
255 | select EXYNOS_DEV_SYSMMU | ||
247 | select HAVE_SCHED_CLOCK | 256 | select HAVE_SCHED_CLOCK |
248 | select S5P_GPIO_INT | ||
249 | select S5P_DEV_FIMC0 | ||
250 | select S5P_DEV_FIMC1 | ||
251 | select S5P_DEV_FIMC2 | ||
252 | select S5P_DEV_FIMC3 | ||
253 | select S5P_DEV_G2D | ||
254 | select S5P_DEV_CSIS0 | ||
255 | select S5P_DEV_JPEG | ||
256 | select S5P_DEV_FIMD0 | ||
257 | select S3C_DEV_HSMMC | 257 | select S3C_DEV_HSMMC |
258 | select S3C_DEV_HSMMC2 | 258 | select S3C_DEV_HSMMC2 |
259 | select S3C_DEV_HSMMC3 | 259 | select S3C_DEV_HSMMC3 |
@@ -261,21 +261,21 @@ config MACH_UNIVERSAL_C210 | |||
261 | select S3C_DEV_I2C3 | 261 | select S3C_DEV_I2C3 |
262 | select S3C_DEV_I2C5 | 262 | select S3C_DEV_I2C5 |
263 | select S3C_DEV_USB_HSOTG | 263 | select S3C_DEV_USB_HSOTG |
264 | select S5P_DEV_CSIS0 | ||
265 | select S5P_DEV_FIMC0 | ||
266 | select S5P_DEV_FIMC1 | ||
267 | select S5P_DEV_FIMC2 | ||
268 | select S5P_DEV_FIMC3 | ||
269 | select S5P_DEV_FIMD0 | ||
270 | select S5P_DEV_G2D | ||
264 | select S5P_DEV_I2C_HDMIPHY | 271 | select S5P_DEV_I2C_HDMIPHY |
272 | select S5P_DEV_JPEG | ||
265 | select S5P_DEV_MFC | 273 | select S5P_DEV_MFC |
266 | select S5P_DEV_ONENAND | 274 | select S5P_DEV_ONENAND |
267 | select S5P_DEV_TV | 275 | select S5P_DEV_TV |
268 | select EXYNOS_DEV_SYSMMU | 276 | select S5P_GPIO_INT |
269 | select EXYNOS_DEV_DMA | 277 | select S5P_HRT |
270 | select EXYNOS_DEV_DRM | ||
271 | select EXYNOS4_SETUP_FIMD0 | ||
272 | select EXYNOS4_SETUP_I2C1 | ||
273 | select EXYNOS4_SETUP_I2C3 | ||
274 | select EXYNOS4_SETUP_I2C5 | ||
275 | select EXYNOS4_SETUP_SDHCI | ||
276 | select EXYNOS4_SETUP_FIMC | ||
277 | select S5P_SETUP_MIPIPHY | 278 | select S5P_SETUP_MIPIPHY |
278 | select EXYNOS4_SETUP_USB_PHY | ||
279 | help | 279 | help |
280 | Machine support for Samsung Mobile Universal S5PC210 Reference | 280 | Machine support for Samsung Mobile Universal S5PC210 Reference |
281 | Board. | 281 | Board. |
@@ -283,10 +283,16 @@ config MACH_UNIVERSAL_C210 | |||
283 | config MACH_NURI | 283 | config MACH_NURI |
284 | bool "Mobile NURI Board" | 284 | bool "Mobile NURI Board" |
285 | select CPU_EXYNOS4210 | 285 | select CPU_EXYNOS4210 |
286 | select S5P_GPIO_INT | 286 | select EXYNOS4_SETUP_FIMC |
287 | select S3C_DEV_WDT | 287 | select EXYNOS4_SETUP_FIMD0 |
288 | select S3C_DEV_RTC | 288 | select EXYNOS4_SETUP_I2C1 |
289 | select S5P_DEV_FIMD0 | 289 | select EXYNOS4_SETUP_I2C3 |
290 | select EXYNOS4_SETUP_I2C5 | ||
291 | select EXYNOS4_SETUP_I2C6 | ||
292 | select EXYNOS4_SETUP_SDHCI | ||
293 | select EXYNOS4_SETUP_USB_PHY | ||
294 | select EXYNOS_DEV_DMA | ||
295 | select EXYNOS_DEV_DRM | ||
290 | select S3C_DEV_HSMMC | 296 | select S3C_DEV_HSMMC |
291 | select S3C_DEV_HSMMC2 | 297 | select S3C_DEV_HSMMC2 |
292 | select S3C_DEV_HSMMC3 | 298 | select S3C_DEV_HSMMC3 |
@@ -294,41 +300,42 @@ config MACH_NURI | |||
294 | select S3C_DEV_I2C3 | 300 | select S3C_DEV_I2C3 |
295 | select S3C_DEV_I2C5 | 301 | select S3C_DEV_I2C5 |
296 | select S3C_DEV_I2C6 | 302 | select S3C_DEV_I2C6 |
303 | select S3C_DEV_RTC | ||
297 | select S3C_DEV_USB_HSOTG | 304 | select S3C_DEV_USB_HSOTG |
305 | select S3C_DEV_WDT | ||
298 | select S5P_DEV_CSIS0 | 306 | select S5P_DEV_CSIS0 |
299 | select S5P_DEV_JPEG | ||
300 | select S5P_DEV_FIMC0 | 307 | select S5P_DEV_FIMC0 |
301 | select S5P_DEV_FIMC1 | 308 | select S5P_DEV_FIMC1 |
302 | select S5P_DEV_FIMC2 | 309 | select S5P_DEV_FIMC2 |
303 | select S5P_DEV_FIMC3 | 310 | select S5P_DEV_FIMC3 |
311 | select S5P_DEV_FIMD0 | ||
304 | select S5P_DEV_G2D | 312 | select S5P_DEV_G2D |
313 | select S5P_DEV_JPEG | ||
305 | select S5P_DEV_MFC | 314 | select S5P_DEV_MFC |
306 | select S5P_DEV_USB_EHCI | 315 | select S5P_DEV_USB_EHCI |
316 | select S5P_GPIO_INT | ||
307 | select S5P_SETUP_MIPIPHY | 317 | select S5P_SETUP_MIPIPHY |
308 | select EXYNOS_DEV_DMA | ||
309 | select EXYNOS_DEV_DRM | ||
310 | select EXYNOS4_SETUP_FIMC | ||
311 | select EXYNOS4_SETUP_FIMD0 | ||
312 | select EXYNOS4_SETUP_I2C1 | ||
313 | select EXYNOS4_SETUP_I2C3 | ||
314 | select EXYNOS4_SETUP_I2C5 | ||
315 | select EXYNOS4_SETUP_I2C6 | ||
316 | select EXYNOS4_SETUP_SDHCI | ||
317 | select EXYNOS4_SETUP_USB_PHY | ||
318 | select S5P_SETUP_MIPIPHY | ||
319 | select SAMSUNG_DEV_PWM | ||
320 | select SAMSUNG_DEV_ADC | 318 | select SAMSUNG_DEV_ADC |
319 | select SAMSUNG_DEV_PWM | ||
321 | help | 320 | help |
322 | Machine support for Samsung Mobile NURI Board. | 321 | Machine support for Samsung Mobile NURI Board. |
323 | 322 | ||
324 | config MACH_ORIGEN | 323 | config MACH_ORIGEN |
325 | bool "ORIGEN" | 324 | bool "ORIGEN" |
326 | select CPU_EXYNOS4210 | 325 | select CPU_EXYNOS4210 |
327 | select S3C_DEV_RTC | 326 | select EXYNOS4_DEV_USB_OHCI |
328 | select S3C_DEV_WDT | 327 | select EXYNOS4_SETUP_FIMD0 |
328 | select EXYNOS4_SETUP_SDHCI | ||
329 | select EXYNOS4_SETUP_USB_PHY | ||
330 | select EXYNOS_DEV_DMA | ||
331 | select EXYNOS_DEV_DRM | ||
332 | select EXYNOS_DEV_SYSMMU | ||
333 | select S3C24XX_PWM | ||
329 | select S3C_DEV_HSMMC | 334 | select S3C_DEV_HSMMC |
330 | select S3C_DEV_HSMMC2 | 335 | select S3C_DEV_HSMMC2 |
336 | select S3C_DEV_RTC | ||
331 | select S3C_DEV_USB_HSOTG | 337 | select S3C_DEV_USB_HSOTG |
338 | select S3C_DEV_WDT | ||
332 | select S5P_DEV_FIMC0 | 339 | select S5P_DEV_FIMC0 |
333 | select S5P_DEV_FIMC1 | 340 | select S5P_DEV_FIMC1 |
334 | select S5P_DEV_FIMC2 | 341 | select S5P_DEV_FIMC2 |
@@ -342,14 +349,6 @@ config MACH_ORIGEN | |||
342 | select S5P_DEV_USB_EHCI | 349 | select S5P_DEV_USB_EHCI |
343 | select SAMSUNG_DEV_BACKLIGHT | 350 | select SAMSUNG_DEV_BACKLIGHT |
344 | select SAMSUNG_DEV_PWM | 351 | select SAMSUNG_DEV_PWM |
345 | select EXYNOS_DEV_DRM | ||
346 | select EXYNOS_DEV_SYSMMU | ||
347 | select EXYNOS_DEV_DMA | ||
348 | select EXYNOS4_DEV_USB_OHCI | ||
349 | select EXYNOS4_SETUP_FIMD0 | ||
350 | select EXYNOS4_SETUP_SDHCI | ||
351 | select EXYNOS4_SETUP_USB_PHY | ||
352 | select S3C24XX_PWM | ||
353 | help | 352 | help |
354 | Machine support for ORIGEN based on Samsung EXYNOS4210 | 353 | Machine support for ORIGEN based on Samsung EXYNOS4210 |
355 | 354 | ||
@@ -357,7 +356,17 @@ comment "EXYNOS4212 Boards" | |||
357 | 356 | ||
358 | config MACH_SMDK4212 | 357 | config MACH_SMDK4212 |
359 | bool "SMDK4212" | 358 | bool "SMDK4212" |
360 | select SOC_EXYNOS4212 | 359 | select EXYNOS4_SETUP_FIMD0 |
360 | select EXYNOS4_SETUP_I2C1 | ||
361 | select EXYNOS4_SETUP_I2C3 | ||
362 | select EXYNOS4_SETUP_I2C7 | ||
363 | select EXYNOS4_SETUP_KEYPAD | ||
364 | select EXYNOS4_SETUP_SDHCI | ||
365 | select EXYNOS4_SETUP_USB_PHY | ||
366 | select EXYNOS_DEV_DMA | ||
367 | select EXYNOS_DEV_DRM | ||
368 | select EXYNOS_DEV_SYSMMU | ||
369 | select S3C24XX_PWM | ||
361 | select S3C_DEV_HSMMC2 | 370 | select S3C_DEV_HSMMC2 |
362 | select S3C_DEV_HSMMC3 | 371 | select S3C_DEV_HSMMC3 |
363 | select S3C_DEV_I2C1 | 372 | select S3C_DEV_I2C1 |
@@ -375,17 +384,7 @@ config MACH_SMDK4212 | |||
375 | select SAMSUNG_DEV_BACKLIGHT | 384 | select SAMSUNG_DEV_BACKLIGHT |
376 | select SAMSUNG_DEV_KEYPAD | 385 | select SAMSUNG_DEV_KEYPAD |
377 | select SAMSUNG_DEV_PWM | 386 | select SAMSUNG_DEV_PWM |
378 | select EXYNOS_DEV_SYSMMU | 387 | select SOC_EXYNOS4212 |
379 | select EXYNOS_DEV_DMA | ||
380 | select EXYNOS_DEV_DRM | ||
381 | select EXYNOS4_SETUP_FIMD0 | ||
382 | select EXYNOS4_SETUP_I2C1 | ||
383 | select EXYNOS4_SETUP_I2C3 | ||
384 | select EXYNOS4_SETUP_I2C7 | ||
385 | select EXYNOS4_SETUP_KEYPAD | ||
386 | select EXYNOS4_SETUP_SDHCI | ||
387 | select EXYNOS4_SETUP_USB_PHY | ||
388 | select S3C24XX_PWM | ||
389 | help | 388 | help |
390 | Machine support for Samsung SMDK4212 | 389 | Machine support for Samsung SMDK4212 |
391 | 390 | ||
@@ -393,8 +392,8 @@ comment "EXYNOS4412 Boards" | |||
393 | 392 | ||
394 | config MACH_SMDK4412 | 393 | config MACH_SMDK4412 |
395 | bool "SMDK4412" | 394 | bool "SMDK4412" |
396 | select SOC_EXYNOS4412 | ||
397 | select MACH_SMDK4212 | 395 | select MACH_SMDK4212 |
396 | select SOC_EXYNOS4412 | ||
398 | help | 397 | help |
399 | Machine support for Samsung SMDK4412 | 398 | Machine support for Samsung SMDK4412 |
400 | endif | 399 | endif |
@@ -404,12 +403,12 @@ comment "Flattened Device Tree based board for EXYNOS SoCs" | |||
404 | config MACH_EXYNOS4_DT | 403 | config MACH_EXYNOS4_DT |
405 | bool "Samsung Exynos4 Machine using device tree" | 404 | bool "Samsung Exynos4 Machine using device tree" |
406 | depends on ARCH_EXYNOS4 | 405 | depends on ARCH_EXYNOS4 |
407 | select CPU_EXYNOS4210 | ||
408 | select USE_OF | ||
409 | select ARM_AMBA | 406 | select ARM_AMBA |
407 | select CPU_EXYNOS4210 | ||
410 | select HAVE_SAMSUNG_KEYPAD if INPUT_KEYBOARD | 408 | select HAVE_SAMSUNG_KEYPAD if INPUT_KEYBOARD |
411 | select PINCTRL | 409 | select PINCTRL |
412 | select PINCTRL_EXYNOS4 | 410 | select PINCTRL_EXYNOS4 |
411 | select USE_OF | ||
413 | help | 412 | help |
414 | Machine support for Samsung Exynos4 machine with device tree enabled. | 413 | Machine support for Samsung Exynos4 machine with device tree enabled. |
415 | Select this if a fdt blob is available for the Exynos4 SoC based board. | 414 | Select this if a fdt blob is available for the Exynos4 SoC based board. |
@@ -419,9 +418,9 @@ config MACH_EXYNOS4_DT | |||
419 | config MACH_EXYNOS5_DT | 418 | config MACH_EXYNOS5_DT |
420 | bool "SAMSUNG EXYNOS5 Machine using device tree" | 419 | bool "SAMSUNG EXYNOS5 Machine using device tree" |
421 | depends on ARCH_EXYNOS5 | 420 | depends on ARCH_EXYNOS5 |
421 | select ARM_AMBA | ||
422 | select SOC_EXYNOS5250 | 422 | select SOC_EXYNOS5250 |
423 | select USE_OF | 423 | select USE_OF |
424 | select ARM_AMBA | ||
425 | help | 424 | help |
426 | Machine support for Samsung EXYNOS5 machine with device tree enabled. | 425 | Machine support for Samsung EXYNOS5 machine with device tree enabled. |
427 | Select this if a fdt blob is available for the EXYNOS5 SoC based board. | 426 | Select this if a fdt blob is available for the EXYNOS5 SoC based board. |
diff --git a/arch/arm/mach-footbridge/Kconfig b/arch/arm/mach-footbridge/Kconfig index f643ef819da6..abda5a18a664 100644 --- a/arch/arm/mach-footbridge/Kconfig +++ b/arch/arm/mach-footbridge/Kconfig | |||
@@ -91,7 +91,7 @@ config FOOTBRIDGE_ADDIN | |||
91 | 91 | ||
92 | # EBSA285 board in either host or addin mode | 92 | # EBSA285 board in either host or addin mode |
93 | config ARCH_EBSA285 | 93 | config ARCH_EBSA285 |
94 | select ARCH_MAY_HAVE_PC_FDC | ||
95 | bool | 94 | bool |
95 | select ARCH_MAY_HAVE_PC_FDC | ||
96 | 96 | ||
97 | endif | 97 | endif |
diff --git a/arch/arm/mach-h720x/Kconfig b/arch/arm/mach-h720x/Kconfig index abf356c02343..6bb755bcb6f5 100644 --- a/arch/arm/mach-h720x/Kconfig +++ b/arch/arm/mach-h720x/Kconfig | |||
@@ -12,9 +12,9 @@ config ARCH_H7201 | |||
12 | 12 | ||
13 | config ARCH_H7202 | 13 | config ARCH_H7202 |
14 | bool "hms30c7202" | 14 | bool "hms30c7202" |
15 | depends on ARCH_H720X | ||
15 | select CPU_H7202 | 16 | select CPU_H7202 |
16 | select ZONE_DMA | 17 | select ZONE_DMA |
17 | depends on ARCH_H720X | ||
18 | help | 18 | help |
19 | Say Y here if you are using the Hynix HMS30C7202 Reference Board | 19 | Say Y here if you are using the Hynix HMS30C7202 Reference Board |
20 | 20 | ||
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 32197c117afe..8d276584650e 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig | |||
@@ -41,68 +41,68 @@ config SOC_IMX1 | |||
41 | 41 | ||
42 | config SOC_IMX21 | 42 | config SOC_IMX21 |
43 | bool | 43 | bool |
44 | select MACH_MX21 | ||
45 | select CPU_ARM926T | ||
46 | select COMMON_CLK | 44 | select COMMON_CLK |
45 | select CPU_ARM926T | ||
47 | select IMX_HAVE_IOMUX_V1 | 46 | select IMX_HAVE_IOMUX_V1 |
47 | select MACH_MX21 | ||
48 | select MXC_AVIC | 48 | select MXC_AVIC |
49 | 49 | ||
50 | config SOC_IMX25 | 50 | config SOC_IMX25 |
51 | bool | 51 | bool |
52 | select ARCH_MX25 | 52 | select ARCH_MX25 |
53 | select ARCH_MXC_IOMUX_V3 | ||
53 | select COMMON_CLK | 54 | select COMMON_CLK |
54 | select CPU_ARM926T | 55 | select CPU_ARM926T |
55 | select HAVE_CAN_FLEXCAN if CAN | 56 | select HAVE_CAN_FLEXCAN if CAN |
56 | select ARCH_MXC_IOMUX_V3 | ||
57 | select MXC_AVIC | 57 | select MXC_AVIC |
58 | 58 | ||
59 | config SOC_IMX27 | 59 | config SOC_IMX27 |
60 | bool | 60 | bool |
61 | select MACH_MX27 | ||
62 | select CPU_ARM926T | ||
63 | select COMMON_CLK | 61 | select COMMON_CLK |
62 | select CPU_ARM926T | ||
64 | select IMX_HAVE_IOMUX_V1 | 63 | select IMX_HAVE_IOMUX_V1 |
64 | select MACH_MX27 | ||
65 | select MXC_AVIC | 65 | select MXC_AVIC |
66 | 66 | ||
67 | config SOC_IMX31 | 67 | config SOC_IMX31 |
68 | bool | 68 | bool |
69 | select COMMON_CLK | ||
69 | select CPU_V6 | 70 | select CPU_V6 |
70 | select IMX_HAVE_PLATFORM_MXC_RNGA | 71 | select IMX_HAVE_PLATFORM_MXC_RNGA |
71 | select MXC_AVIC | 72 | select MXC_AVIC |
72 | select COMMON_CLK | ||
73 | select SMP_ON_UP if SMP | 73 | select SMP_ON_UP if SMP |
74 | 74 | ||
75 | config SOC_IMX35 | 75 | config SOC_IMX35 |
76 | bool | 76 | bool |
77 | select CPU_V6K | ||
78 | select ARCH_MXC_IOMUX_V3 | 77 | select ARCH_MXC_IOMUX_V3 |
79 | select COMMON_CLK | 78 | select COMMON_CLK |
79 | select CPU_V6K | ||
80 | select HAVE_CAN_FLEXCAN if CAN | ||
80 | select HAVE_EPIT | 81 | select HAVE_EPIT |
81 | select MXC_AVIC | 82 | select MXC_AVIC |
82 | select SMP_ON_UP if SMP | 83 | select SMP_ON_UP if SMP |
83 | select HAVE_CAN_FLEXCAN if CAN | ||
84 | 84 | ||
85 | config SOC_IMX5 | 85 | config SOC_IMX5 |
86 | select CPU_V7 | 86 | bool |
87 | select MXC_TZIC | ||
88 | select COMMON_CLK | ||
89 | select ARCH_MXC_IOMUX_V3 | ||
90 | select ARCH_HAS_CPUFREQ | 87 | select ARCH_HAS_CPUFREQ |
91 | select ARCH_MX5 | 88 | select ARCH_MX5 |
92 | bool | 89 | select ARCH_MXC_IOMUX_V3 |
90 | select COMMON_CLK | ||
91 | select CPU_V7 | ||
92 | select MXC_TZIC | ||
93 | 93 | ||
94 | config SOC_IMX50 | 94 | config SOC_IMX50 |
95 | bool | 95 | bool |
96 | select SOC_IMX5 | ||
97 | select ARCH_MX50 | 96 | select ARCH_MX50 |
97 | select SOC_IMX5 | ||
98 | 98 | ||
99 | config SOC_IMX51 | 99 | config SOC_IMX51 |
100 | bool | 100 | bool |
101 | select SOC_IMX5 | ||
102 | select ARCH_MX5 | 101 | select ARCH_MX5 |
103 | select ARCH_MX51 | 102 | select ARCH_MX51 |
104 | select PINCTRL | 103 | select PINCTRL |
105 | select PINCTRL_IMX51 | 104 | select PINCTRL_IMX51 |
105 | select SOC_IMX5 | ||
106 | 106 | ||
107 | if ARCH_IMX_V4_V5 | 107 | if ARCH_IMX_V4_V5 |
108 | 108 | ||
@@ -112,10 +112,10 @@ config MACH_MXLADS | |||
112 | 112 | ||
113 | config ARCH_MX1ADS | 113 | config ARCH_MX1ADS |
114 | bool "MX1ADS platform" | 114 | bool "MX1ADS platform" |
115 | select MACH_MXLADS | ||
116 | select SOC_IMX1 | ||
117 | select IMX_HAVE_PLATFORM_IMX_I2C | 115 | select IMX_HAVE_PLATFORM_IMX_I2C |
118 | select IMX_HAVE_PLATFORM_IMX_UART | 116 | select IMX_HAVE_PLATFORM_IMX_UART |
117 | select MACH_MXLADS | ||
118 | select SOC_IMX1 | ||
119 | help | 119 | help |
120 | Say Y here if you are using Motorola MX1ADS/MXLADS boards | 120 | Say Y here if you are using Motorola MX1ADS/MXLADS boards |
121 | 121 | ||
@@ -127,9 +127,9 @@ config MACH_SCB9328 | |||
127 | 127 | ||
128 | config MACH_APF9328 | 128 | config MACH_APF9328 |
129 | bool "APF9328" | 129 | bool "APF9328" |
130 | select SOC_IMX1 | ||
131 | select IMX_HAVE_PLATFORM_IMX_I2C | 130 | select IMX_HAVE_PLATFORM_IMX_I2C |
132 | select IMX_HAVE_PLATFORM_IMX_UART | 131 | select IMX_HAVE_PLATFORM_IMX_UART |
132 | select SOC_IMX1 | ||
133 | help | 133 | help |
134 | Say Yes here if you are using the Armadeus APF9328 development board | 134 | Say Yes here if you are using the Armadeus APF9328 development board |
135 | 135 | ||
@@ -137,11 +137,11 @@ comment "MX21 platforms:" | |||
137 | 137 | ||
138 | config MACH_MX21ADS | 138 | config MACH_MX21ADS |
139 | bool "MX21ADS platform" | 139 | bool "MX21ADS platform" |
140 | select SOC_IMX21 | ||
141 | select IMX_HAVE_PLATFORM_IMX_FB | 140 | select IMX_HAVE_PLATFORM_IMX_FB |
142 | select IMX_HAVE_PLATFORM_IMX_UART | 141 | select IMX_HAVE_PLATFORM_IMX_UART |
143 | select IMX_HAVE_PLATFORM_MXC_MMC | 142 | select IMX_HAVE_PLATFORM_MXC_MMC |
144 | select IMX_HAVE_PLATFORM_MXC_NAND | 143 | select IMX_HAVE_PLATFORM_MXC_NAND |
144 | select SOC_IMX21 | ||
145 | help | 145 | help |
146 | Include support for MX21ADS platform. This includes specific | 146 | Include support for MX21ADS platform. This includes specific |
147 | configurations for the board and its peripherals. | 147 | configurations for the board and its peripherals. |
@@ -150,22 +150,21 @@ comment "MX25 platforms:" | |||
150 | 150 | ||
151 | config MACH_MX25_3DS | 151 | config MACH_MX25_3DS |
152 | bool "Support MX25PDK (3DS) Platform" | 152 | bool "Support MX25PDK (3DS) Platform" |
153 | select SOC_IMX25 | ||
154 | select IMX_HAVE_PLATFORM_FLEXCAN | 153 | select IMX_HAVE_PLATFORM_FLEXCAN |
155 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC | 154 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC |
156 | select IMX_HAVE_PLATFORM_IMX2_WDT | 155 | select IMX_HAVE_PLATFORM_IMX2_WDT |
157 | select IMX_HAVE_PLATFORM_IMXDI_RTC | 156 | select IMX_HAVE_PLATFORM_IMXDI_RTC |
158 | select IMX_HAVE_PLATFORM_IMX_I2C | ||
159 | select IMX_HAVE_PLATFORM_IMX_FB | 157 | select IMX_HAVE_PLATFORM_IMX_FB |
158 | select IMX_HAVE_PLATFORM_IMX_I2C | ||
160 | select IMX_HAVE_PLATFORM_IMX_KEYPAD | 159 | select IMX_HAVE_PLATFORM_IMX_KEYPAD |
161 | select IMX_HAVE_PLATFORM_IMX_UART | 160 | select IMX_HAVE_PLATFORM_IMX_UART |
162 | select IMX_HAVE_PLATFORM_MXC_EHCI | 161 | select IMX_HAVE_PLATFORM_MXC_EHCI |
163 | select IMX_HAVE_PLATFORM_MXC_NAND | 162 | select IMX_HAVE_PLATFORM_MXC_NAND |
164 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX | 163 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX |
164 | select SOC_IMX25 | ||
165 | 165 | ||
166 | config MACH_EUKREA_CPUIMX25SD | 166 | config MACH_EUKREA_CPUIMX25SD |
167 | bool "Support Eukrea CPUIMX25 Platform" | 167 | bool "Support Eukrea CPUIMX25 Platform" |
168 | select SOC_IMX25 | ||
169 | select IMX_HAVE_PLATFORM_FLEXCAN | 168 | select IMX_HAVE_PLATFORM_FLEXCAN |
170 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC | 169 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC |
171 | select IMX_HAVE_PLATFORM_IMX2_WDT | 170 | select IMX_HAVE_PLATFORM_IMX2_WDT |
@@ -177,6 +176,7 @@ config MACH_EUKREA_CPUIMX25SD | |||
177 | select IMX_HAVE_PLATFORM_MXC_NAND | 176 | select IMX_HAVE_PLATFORM_MXC_NAND |
178 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX | 177 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX |
179 | select MXC_ULPI if USB_ULPI | 178 | select MXC_ULPI if USB_ULPI |
179 | select SOC_IMX25 | ||
180 | 180 | ||
181 | choice | 181 | choice |
182 | prompt "Baseboard" | 182 | prompt "Baseboard" |
@@ -199,20 +199,19 @@ comment "MX27 platforms:" | |||
199 | 199 | ||
200 | config MACH_MX27ADS | 200 | config MACH_MX27ADS |
201 | bool "MX27ADS platform" | 201 | bool "MX27ADS platform" |
202 | select SOC_IMX27 | ||
203 | select IMX_HAVE_PLATFORM_IMX_FB | 202 | select IMX_HAVE_PLATFORM_IMX_FB |
204 | select IMX_HAVE_PLATFORM_IMX_I2C | 203 | select IMX_HAVE_PLATFORM_IMX_I2C |
205 | select IMX_HAVE_PLATFORM_IMX_UART | 204 | select IMX_HAVE_PLATFORM_IMX_UART |
206 | select IMX_HAVE_PLATFORM_MXC_MMC | 205 | select IMX_HAVE_PLATFORM_MXC_MMC |
207 | select IMX_HAVE_PLATFORM_MXC_NAND | 206 | select IMX_HAVE_PLATFORM_MXC_NAND |
208 | select IMX_HAVE_PLATFORM_MXC_W1 | 207 | select IMX_HAVE_PLATFORM_MXC_W1 |
208 | select SOC_IMX27 | ||
209 | help | 209 | help |
210 | Include support for MX27ADS platform. This includes specific | 210 | Include support for MX27ADS platform. This includes specific |
211 | configurations for the board and its peripherals. | 211 | configurations for the board and its peripherals. |
212 | 212 | ||
213 | config MACH_PCM038 | 213 | config MACH_PCM038 |
214 | bool "Phytec phyCORE-i.MX27 CPU module (pcm038)" | 214 | bool "Phytec phyCORE-i.MX27 CPU module (pcm038)" |
215 | select SOC_IMX27 | ||
216 | select IMX_HAVE_PLATFORM_IMX2_WDT | 215 | select IMX_HAVE_PLATFORM_IMX2_WDT |
217 | select IMX_HAVE_PLATFORM_IMX_I2C | 216 | select IMX_HAVE_PLATFORM_IMX_I2C |
218 | select IMX_HAVE_PLATFORM_IMX_UART | 217 | select IMX_HAVE_PLATFORM_IMX_UART |
@@ -221,6 +220,7 @@ config MACH_PCM038 | |||
221 | select IMX_HAVE_PLATFORM_MXC_W1 | 220 | select IMX_HAVE_PLATFORM_MXC_W1 |
222 | select IMX_HAVE_PLATFORM_SPI_IMX | 221 | select IMX_HAVE_PLATFORM_SPI_IMX |
223 | select MXC_ULPI if USB_ULPI | 222 | select MXC_ULPI if USB_ULPI |
223 | select SOC_IMX27 | ||
224 | help | 224 | help |
225 | Include support for phyCORE-i.MX27 (aka pcm038) platform. This | 225 | Include support for phyCORE-i.MX27 (aka pcm038) platform. This |
226 | includes specific configurations for the module and its peripherals. | 226 | includes specific configurations for the module and its peripherals. |
@@ -242,7 +242,6 @@ endchoice | |||
242 | 242 | ||
243 | config MACH_CPUIMX27 | 243 | config MACH_CPUIMX27 |
244 | bool "Eukrea CPUIMX27 module" | 244 | bool "Eukrea CPUIMX27 module" |
245 | select SOC_IMX27 | ||
246 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC | 245 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC |
247 | select IMX_HAVE_PLATFORM_IMX2_WDT | 246 | select IMX_HAVE_PLATFORM_IMX2_WDT |
248 | select IMX_HAVE_PLATFORM_IMX_I2C | 247 | select IMX_HAVE_PLATFORM_IMX_I2C |
@@ -251,6 +250,7 @@ config MACH_CPUIMX27 | |||
251 | select IMX_HAVE_PLATFORM_MXC_NAND | 250 | select IMX_HAVE_PLATFORM_MXC_NAND |
252 | select IMX_HAVE_PLATFORM_MXC_W1 | 251 | select IMX_HAVE_PLATFORM_MXC_W1 |
253 | select MXC_ULPI if USB_ULPI | 252 | select MXC_ULPI if USB_ULPI |
253 | select SOC_IMX27 | ||
254 | help | 254 | help |
255 | Include support for Eukrea CPUIMX27 platform. This includes | 255 | Include support for Eukrea CPUIMX27 platform. This includes |
256 | specific configurations for the module and its peripherals. | 256 | specific configurations for the module and its peripherals. |
@@ -292,7 +292,6 @@ endchoice | |||
292 | 292 | ||
293 | config MACH_MX27_3DS | 293 | config MACH_MX27_3DS |
294 | bool "MX27PDK platform" | 294 | bool "MX27PDK platform" |
295 | select SOC_IMX27 | ||
296 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC | 295 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC |
297 | select IMX_HAVE_PLATFORM_IMX2_WDT | 296 | select IMX_HAVE_PLATFORM_IMX2_WDT |
298 | select IMX_HAVE_PLATFORM_IMX_FB | 297 | select IMX_HAVE_PLATFORM_IMX_FB |
@@ -306,13 +305,13 @@ config MACH_MX27_3DS | |||
306 | select IMX_HAVE_PLATFORM_SPI_IMX | 305 | select IMX_HAVE_PLATFORM_SPI_IMX |
307 | select MXC_DEBUG_BOARD | 306 | select MXC_DEBUG_BOARD |
308 | select MXC_ULPI if USB_ULPI | 307 | select MXC_ULPI if USB_ULPI |
308 | select SOC_IMX27 | ||
309 | help | 309 | help |
310 | Include support for MX27PDK platform. This includes specific | 310 | Include support for MX27PDK platform. This includes specific |
311 | configurations for the board and its peripherals. | 311 | configurations for the board and its peripherals. |
312 | 312 | ||
313 | config MACH_IMX27_VISSTRIM_M10 | 313 | config MACH_IMX27_VISSTRIM_M10 |
314 | bool "Vista Silicon i.MX27 Visstrim_m10" | 314 | bool "Vista Silicon i.MX27 Visstrim_m10" |
315 | select SOC_IMX27 | ||
316 | select IMX_HAVE_PLATFORM_GPIO_KEYS | 315 | select IMX_HAVE_PLATFORM_GPIO_KEYS |
317 | select IMX_HAVE_PLATFORM_IMX_I2C | 316 | select IMX_HAVE_PLATFORM_IMX_I2C |
318 | select IMX_HAVE_PLATFORM_IMX_SSI | 317 | select IMX_HAVE_PLATFORM_IMX_SSI |
@@ -321,6 +320,7 @@ config MACH_IMX27_VISSTRIM_M10 | |||
321 | select IMX_HAVE_PLATFORM_MXC_EHCI | 320 | select IMX_HAVE_PLATFORM_MXC_EHCI |
322 | select IMX_HAVE_PLATFORM_MXC_MMC | 321 | select IMX_HAVE_PLATFORM_MXC_MMC |
323 | select LEDS_GPIO_REGISTER | 322 | select LEDS_GPIO_REGISTER |
323 | select SOC_IMX27 | ||
324 | help | 324 | help |
325 | Include support for Visstrim_m10 platform and its different variants. | 325 | Include support for Visstrim_m10 platform and its different variants. |
326 | This includes specific configurations for the board and its | 326 | This includes specific configurations for the board and its |
@@ -328,16 +328,15 @@ config MACH_IMX27_VISSTRIM_M10 | |||
328 | 328 | ||
329 | config MACH_IMX27LITE | 329 | config MACH_IMX27LITE |
330 | bool "LogicPD MX27 LITEKIT platform" | 330 | bool "LogicPD MX27 LITEKIT platform" |
331 | select SOC_IMX27 | ||
332 | select IMX_HAVE_PLATFORM_IMX_UART | ||
333 | select IMX_HAVE_PLATFORM_IMX_SSI | 331 | select IMX_HAVE_PLATFORM_IMX_SSI |
332 | select IMX_HAVE_PLATFORM_IMX_UART | ||
333 | select SOC_IMX27 | ||
334 | help | 334 | help |
335 | Include support for MX27 LITEKIT platform. This includes specific | 335 | Include support for MX27 LITEKIT platform. This includes specific |
336 | configurations for the board and its peripherals. | 336 | configurations for the board and its peripherals. |
337 | 337 | ||
338 | config MACH_PCA100 | 338 | config MACH_PCA100 |
339 | bool "Phytec phyCARD-s (pca100)" | 339 | bool "Phytec phyCARD-s (pca100)" |
340 | select SOC_IMX27 | ||
341 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC | 340 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC |
342 | select IMX_HAVE_PLATFORM_IMX2_WDT | 341 | select IMX_HAVE_PLATFORM_IMX2_WDT |
343 | select IMX_HAVE_PLATFORM_IMX_FB | 342 | select IMX_HAVE_PLATFORM_IMX_FB |
@@ -350,27 +349,28 @@ config MACH_PCA100 | |||
350 | select IMX_HAVE_PLATFORM_MXC_W1 | 349 | select IMX_HAVE_PLATFORM_MXC_W1 |
351 | select IMX_HAVE_PLATFORM_SPI_IMX | 350 | select IMX_HAVE_PLATFORM_SPI_IMX |
352 | select MXC_ULPI if USB_ULPI | 351 | select MXC_ULPI if USB_ULPI |
352 | select SOC_IMX27 | ||
353 | help | 353 | help |
354 | Include support for phyCARD-s (aka pca100) platform. This | 354 | Include support for phyCARD-s (aka pca100) platform. This |
355 | includes specific configurations for the module and its peripherals. | 355 | includes specific configurations for the module and its peripherals. |
356 | 356 | ||
357 | config MACH_MXT_TD60 | 357 | config MACH_MXT_TD60 |
358 | bool "Maxtrack i-MXT TD60" | 358 | bool "Maxtrack i-MXT TD60" |
359 | select SOC_IMX27 | ||
360 | select IMX_HAVE_PLATFORM_IMX_FB | 359 | select IMX_HAVE_PLATFORM_IMX_FB |
361 | select IMX_HAVE_PLATFORM_IMX_I2C | 360 | select IMX_HAVE_PLATFORM_IMX_I2C |
362 | select IMX_HAVE_PLATFORM_IMX_UART | 361 | select IMX_HAVE_PLATFORM_IMX_UART |
363 | select IMX_HAVE_PLATFORM_MXC_MMC | 362 | select IMX_HAVE_PLATFORM_MXC_MMC |
364 | select IMX_HAVE_PLATFORM_MXC_NAND | 363 | select IMX_HAVE_PLATFORM_MXC_NAND |
364 | select SOC_IMX27 | ||
365 | help | 365 | help |
366 | Include support for i-MXT (aka td60) platform. This | 366 | Include support for i-MXT (aka td60) platform. This |
367 | includes specific configurations for the module and its peripherals. | 367 | includes specific configurations for the module and its peripherals. |
368 | 368 | ||
369 | config MACH_IMX27IPCAM | 369 | config MACH_IMX27IPCAM |
370 | bool "IMX27 IPCAM platform" | 370 | bool "IMX27 IPCAM platform" |
371 | select SOC_IMX27 | ||
372 | select IMX_HAVE_PLATFORM_IMX2_WDT | 371 | select IMX_HAVE_PLATFORM_IMX2_WDT |
373 | select IMX_HAVE_PLATFORM_IMX_UART | 372 | select IMX_HAVE_PLATFORM_IMX_UART |
373 | select SOC_IMX27 | ||
374 | help | 374 | help |
375 | Include support for IMX27 IPCAM platform. This includes specific | 375 | Include support for IMX27 IPCAM platform. This includes specific |
376 | configurations for the board and its peripherals. | 376 | configurations for the board and its peripherals. |
@@ -390,11 +390,11 @@ comment "MX31 platforms:" | |||
390 | 390 | ||
391 | config MACH_MX31ADS | 391 | config MACH_MX31ADS |
392 | bool "Support MX31ADS platforms" | 392 | bool "Support MX31ADS platforms" |
393 | select SOC_IMX31 | 393 | default y |
394 | select IMX_HAVE_PLATFORM_IMX_I2C | 394 | select IMX_HAVE_PLATFORM_IMX_I2C |
395 | select IMX_HAVE_PLATFORM_IMX_SSI | 395 | select IMX_HAVE_PLATFORM_IMX_SSI |
396 | select IMX_HAVE_PLATFORM_IMX_UART | 396 | select IMX_HAVE_PLATFORM_IMX_UART |
397 | default y | 397 | select SOC_IMX31 |
398 | help | 398 | help |
399 | Include support for MX31ADS platform. This includes specific | 399 | Include support for MX31ADS platform. This includes specific |
400 | configurations for the board and its peripherals. | 400 | configurations for the board and its peripherals. |
@@ -412,21 +412,19 @@ config MACH_MX31ADS_WM1133_EV1 | |||
412 | 412 | ||
413 | config MACH_MX31LILLY | 413 | config MACH_MX31LILLY |
414 | bool "Support MX31 LILLY-1131 platforms (INCO startec)" | 414 | bool "Support MX31 LILLY-1131 platforms (INCO startec)" |
415 | select SOC_IMX31 | ||
416 | select IMX_HAVE_PLATFORM_IMX_UART | 415 | select IMX_HAVE_PLATFORM_IMX_UART |
417 | select IMX_HAVE_PLATFORM_IPU_CORE | 416 | select IMX_HAVE_PLATFORM_IPU_CORE |
418 | select IMX_HAVE_PLATFORM_MXC_EHCI | 417 | select IMX_HAVE_PLATFORM_MXC_EHCI |
419 | select IMX_HAVE_PLATFORM_MXC_MMC | 418 | select IMX_HAVE_PLATFORM_MXC_MMC |
420 | select IMX_HAVE_PLATFORM_SPI_IMX | 419 | select IMX_HAVE_PLATFORM_SPI_IMX |
421 | select MXC_ULPI if USB_ULPI | 420 | select MXC_ULPI if USB_ULPI |
421 | select SOC_IMX31 | ||
422 | help | 422 | help |
423 | Include support for mx31 based LILLY1131 modules. This includes | 423 | Include support for mx31 based LILLY1131 modules. This includes |
424 | specific configurations for the board and its peripherals. | 424 | specific configurations for the board and its peripherals. |
425 | 425 | ||
426 | config MACH_MX31LITE | 426 | config MACH_MX31LITE |
427 | bool "Support MX31 LITEKIT (LogicPD)" | 427 | bool "Support MX31 LITEKIT (LogicPD)" |
428 | select SOC_IMX31 | ||
429 | select MXC_ULPI if USB_ULPI | ||
430 | select IMX_HAVE_PLATFORM_IMX2_WDT | 428 | select IMX_HAVE_PLATFORM_IMX2_WDT |
431 | select IMX_HAVE_PLATFORM_IMX_UART | 429 | select IMX_HAVE_PLATFORM_IMX_UART |
432 | select IMX_HAVE_PLATFORM_MXC_EHCI | 430 | select IMX_HAVE_PLATFORM_MXC_EHCI |
@@ -435,13 +433,14 @@ config MACH_MX31LITE | |||
435 | select IMX_HAVE_PLATFORM_MXC_RTC | 433 | select IMX_HAVE_PLATFORM_MXC_RTC |
436 | select IMX_HAVE_PLATFORM_SPI_IMX | 434 | select IMX_HAVE_PLATFORM_SPI_IMX |
437 | select LEDS_GPIO_REGISTER | 435 | select LEDS_GPIO_REGISTER |
436 | select MXC_ULPI if USB_ULPI | ||
437 | select SOC_IMX31 | ||
438 | help | 438 | help |
439 | Include support for MX31 LITEKIT platform. This includes specific | 439 | Include support for MX31 LITEKIT platform. This includes specific |
440 | configurations for the board and its peripherals. | 440 | configurations for the board and its peripherals. |
441 | 441 | ||
442 | config MACH_PCM037 | 442 | config MACH_PCM037 |
443 | bool "Support Phytec pcm037 (i.MX31) platforms" | 443 | bool "Support Phytec pcm037 (i.MX31) platforms" |
444 | select SOC_IMX31 | ||
445 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC | 444 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC |
446 | select IMX_HAVE_PLATFORM_IMX2_WDT | 445 | select IMX_HAVE_PLATFORM_IMX2_WDT |
447 | select IMX_HAVE_PLATFORM_IMX_I2C | 446 | select IMX_HAVE_PLATFORM_IMX_I2C |
@@ -452,6 +451,7 @@ config MACH_PCM037 | |||
452 | select IMX_HAVE_PLATFORM_MXC_NAND | 451 | select IMX_HAVE_PLATFORM_MXC_NAND |
453 | select IMX_HAVE_PLATFORM_MXC_W1 | 452 | select IMX_HAVE_PLATFORM_MXC_W1 |
454 | select MXC_ULPI if USB_ULPI | 453 | select MXC_ULPI if USB_ULPI |
454 | select SOC_IMX31 | ||
455 | help | 455 | help |
456 | Include support for Phytec pcm037 platform. This includes | 456 | Include support for Phytec pcm037 platform. This includes |
457 | specific configurations for the board and its peripherals. | 457 | specific configurations for the board and its peripherals. |
@@ -468,8 +468,6 @@ config MACH_PCM037_EET | |||
468 | 468 | ||
469 | config MACH_MX31_3DS | 469 | config MACH_MX31_3DS |
470 | bool "Support MX31PDK (3DS)" | 470 | bool "Support MX31PDK (3DS)" |
471 | select SOC_IMX31 | ||
472 | select MXC_DEBUG_BOARD | ||
473 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC | 471 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC |
474 | select IMX_HAVE_PLATFORM_IMX2_WDT | 472 | select IMX_HAVE_PLATFORM_IMX2_WDT |
475 | select IMX_HAVE_PLATFORM_IMX_I2C | 473 | select IMX_HAVE_PLATFORM_IMX_I2C |
@@ -481,7 +479,9 @@ config MACH_MX31_3DS | |||
481 | select IMX_HAVE_PLATFORM_MXC_MMC | 479 | select IMX_HAVE_PLATFORM_MXC_MMC |
482 | select IMX_HAVE_PLATFORM_MXC_NAND | 480 | select IMX_HAVE_PLATFORM_MXC_NAND |
483 | select IMX_HAVE_PLATFORM_SPI_IMX | 481 | select IMX_HAVE_PLATFORM_SPI_IMX |
482 | select MXC_DEBUG_BOARD | ||
484 | select MXC_ULPI if USB_ULPI | 483 | select MXC_ULPI if USB_ULPI |
484 | select SOC_IMX31 | ||
485 | help | 485 | help |
486 | Include support for MX31PDK (3DS) platform. This includes specific | 486 | Include support for MX31PDK (3DS) platform. This includes specific |
487 | configurations for the board and its peripherals. | 487 | configurations for the board and its peripherals. |
@@ -497,7 +497,6 @@ config MACH_MX31_3DS_MXC_NAND_USE_BBT | |||
497 | 497 | ||
498 | config MACH_MX31MOBOARD | 498 | config MACH_MX31MOBOARD |
499 | bool "Support mx31moboard platforms (EPFL Mobots group)" | 499 | bool "Support mx31moboard platforms (EPFL Mobots group)" |
500 | select SOC_IMX31 | ||
501 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC | 500 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC |
502 | select IMX_HAVE_PLATFORM_IMX2_WDT | 501 | select IMX_HAVE_PLATFORM_IMX2_WDT |
503 | select IMX_HAVE_PLATFORM_IMX_I2C | 502 | select IMX_HAVE_PLATFORM_IMX_I2C |
@@ -509,22 +508,22 @@ config MACH_MX31MOBOARD | |||
509 | select IMX_HAVE_PLATFORM_SPI_IMX | 508 | select IMX_HAVE_PLATFORM_SPI_IMX |
510 | select LEDS_GPIO_REGISTER | 509 | select LEDS_GPIO_REGISTER |
511 | select MXC_ULPI if USB_ULPI | 510 | select MXC_ULPI if USB_ULPI |
511 | select SOC_IMX31 | ||
512 | help | 512 | help |
513 | Include support for mx31moboard platform. This includes specific | 513 | Include support for mx31moboard platform. This includes specific |
514 | configurations for the board and its peripherals. | 514 | configurations for the board and its peripherals. |
515 | 515 | ||
516 | config MACH_QONG | 516 | config MACH_QONG |
517 | bool "Support Dave/DENX QongEVB-LITE platform" | 517 | bool "Support Dave/DENX QongEVB-LITE platform" |
518 | select SOC_IMX31 | ||
519 | select IMX_HAVE_PLATFORM_IMX_UART | ||
520 | select IMX_HAVE_PLATFORM_IMX2_WDT | 518 | select IMX_HAVE_PLATFORM_IMX2_WDT |
519 | select IMX_HAVE_PLATFORM_IMX_UART | ||
520 | select SOC_IMX31 | ||
521 | help | 521 | help |
522 | Include support for Dave/DENX QongEVB-LITE platform. This includes | 522 | Include support for Dave/DENX QongEVB-LITE platform. This includes |
523 | specific configurations for the board and its peripherals. | 523 | specific configurations for the board and its peripherals. |
524 | 524 | ||
525 | config MACH_ARMADILLO5X0 | 525 | config MACH_ARMADILLO5X0 |
526 | bool "Support Atmark Armadillo-500 Development Base Board" | 526 | bool "Support Atmark Armadillo-500 Development Base Board" |
527 | select SOC_IMX31 | ||
528 | select IMX_HAVE_PLATFORM_GPIO_KEYS | 527 | select IMX_HAVE_PLATFORM_GPIO_KEYS |
529 | select IMX_HAVE_PLATFORM_IMX_I2C | 528 | select IMX_HAVE_PLATFORM_IMX_I2C |
530 | select IMX_HAVE_PLATFORM_IMX_UART | 529 | select IMX_HAVE_PLATFORM_IMX_UART |
@@ -533,23 +532,24 @@ config MACH_ARMADILLO5X0 | |||
533 | select IMX_HAVE_PLATFORM_MXC_MMC | 532 | select IMX_HAVE_PLATFORM_MXC_MMC |
534 | select IMX_HAVE_PLATFORM_MXC_NAND | 533 | select IMX_HAVE_PLATFORM_MXC_NAND |
535 | select MXC_ULPI if USB_ULPI | 534 | select MXC_ULPI if USB_ULPI |
535 | select SOC_IMX31 | ||
536 | help | 536 | help |
537 | Include support for Atmark Armadillo-500 platform. This includes | 537 | Include support for Atmark Armadillo-500 platform. This includes |
538 | specific configurations for the board and its peripherals. | 538 | specific configurations for the board and its peripherals. |
539 | 539 | ||
540 | config MACH_KZM_ARM11_01 | 540 | config MACH_KZM_ARM11_01 |
541 | bool "Support KZM-ARM11-01(Kyoto Microcomputer)" | 541 | bool "Support KZM-ARM11-01(Kyoto Microcomputer)" |
542 | select SOC_IMX31 | ||
543 | select IMX_HAVE_PLATFORM_IMX_UART | 542 | select IMX_HAVE_PLATFORM_IMX_UART |
543 | select SOC_IMX31 | ||
544 | help | 544 | help |
545 | Include support for KZM-ARM11-01. This includes specific | 545 | Include support for KZM-ARM11-01. This includes specific |
546 | configurations for the board and its peripherals. | 546 | configurations for the board and its peripherals. |
547 | 547 | ||
548 | config MACH_BUG | 548 | config MACH_BUG |
549 | bool "Support Buglabs BUGBase platform" | 549 | bool "Support Buglabs BUGBase platform" |
550 | select SOC_IMX31 | ||
551 | select IMX_HAVE_PLATFORM_IMX_UART | ||
552 | default y | 550 | default y |
551 | select IMX_HAVE_PLATFORM_IMX_UART | ||
552 | select SOC_IMX31 | ||
553 | help | 553 | help |
554 | Include support for BUGBase 1.3 platform. This includes specific | 554 | Include support for BUGBase 1.3 platform. This includes specific |
555 | configurations for the board and its peripherals. | 555 | configurations for the board and its peripherals. |
@@ -565,7 +565,6 @@ comment "MX35 platforms:" | |||
565 | 565 | ||
566 | config MACH_PCM043 | 566 | config MACH_PCM043 |
567 | bool "Support Phytec pcm043 (i.MX35) platforms" | 567 | bool "Support Phytec pcm043 (i.MX35) platforms" |
568 | select SOC_IMX35 | ||
569 | select IMX_HAVE_PLATFORM_FLEXCAN | 568 | select IMX_HAVE_PLATFORM_FLEXCAN |
570 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC | 569 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC |
571 | select IMX_HAVE_PLATFORM_IMX2_WDT | 570 | select IMX_HAVE_PLATFORM_IMX2_WDT |
@@ -577,14 +576,13 @@ config MACH_PCM043 | |||
577 | select IMX_HAVE_PLATFORM_MXC_NAND | 576 | select IMX_HAVE_PLATFORM_MXC_NAND |
578 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX | 577 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX |
579 | select MXC_ULPI if USB_ULPI | 578 | select MXC_ULPI if USB_ULPI |
579 | select SOC_IMX35 | ||
580 | help | 580 | help |
581 | Include support for Phytec pcm043 platform. This includes | 581 | Include support for Phytec pcm043 platform. This includes |
582 | specific configurations for the board and its peripherals. | 582 | specific configurations for the board and its peripherals. |
583 | 583 | ||
584 | config MACH_MX35_3DS | 584 | config MACH_MX35_3DS |
585 | bool "Support MX35PDK platform" | 585 | bool "Support MX35PDK platform" |
586 | select SOC_IMX35 | ||
587 | select MXC_DEBUG_BOARD | ||
588 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC | 586 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC |
589 | select IMX_HAVE_PLATFORM_IMX2_WDT | 587 | select IMX_HAVE_PLATFORM_IMX2_WDT |
590 | select IMX_HAVE_PLATFORM_IMX_FB | 588 | select IMX_HAVE_PLATFORM_IMX_FB |
@@ -595,13 +593,14 @@ config MACH_MX35_3DS | |||
595 | select IMX_HAVE_PLATFORM_MXC_NAND | 593 | select IMX_HAVE_PLATFORM_MXC_NAND |
596 | select IMX_HAVE_PLATFORM_MXC_RTC | 594 | select IMX_HAVE_PLATFORM_MXC_RTC |
597 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX | 595 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX |
596 | select MXC_DEBUG_BOARD | ||
597 | select SOC_IMX35 | ||
598 | help | 598 | help |
599 | Include support for MX35PDK platform. This includes specific | 599 | Include support for MX35PDK platform. This includes specific |
600 | configurations for the board and its peripherals. | 600 | configurations for the board and its peripherals. |
601 | 601 | ||
602 | config MACH_EUKREA_CPUIMX35SD | 602 | config MACH_EUKREA_CPUIMX35SD |
603 | bool "Support Eukrea CPUIMX35 Platform" | 603 | bool "Support Eukrea CPUIMX35 Platform" |
604 | select SOC_IMX35 | ||
605 | select IMX_HAVE_PLATFORM_FLEXCAN | 604 | select IMX_HAVE_PLATFORM_FLEXCAN |
606 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC | 605 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC |
607 | select IMX_HAVE_PLATFORM_IMX2_WDT | 606 | select IMX_HAVE_PLATFORM_IMX2_WDT |
@@ -611,6 +610,7 @@ config MACH_EUKREA_CPUIMX35SD | |||
611 | select IMX_HAVE_PLATFORM_MXC_NAND | 610 | select IMX_HAVE_PLATFORM_MXC_NAND |
612 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX | 611 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX |
613 | select MXC_ULPI if USB_ULPI | 612 | select MXC_ULPI if USB_ULPI |
613 | select SOC_IMX35 | ||
614 | help | 614 | help |
615 | Include support for Eukrea CPUIMX35 platform. This includes | 615 | Include support for Eukrea CPUIMX35 platform. This includes |
616 | specific configurations for the board and its peripherals. | 616 | specific configurations for the board and its peripherals. |
@@ -635,16 +635,16 @@ endchoice | |||
635 | 635 | ||
636 | config MACH_VPR200 | 636 | config MACH_VPR200 |
637 | bool "Support VPR200 platform" | 637 | bool "Support VPR200 platform" |
638 | select SOC_IMX35 | ||
639 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC | 638 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC |
640 | select IMX_HAVE_PLATFORM_GPIO_KEYS | 639 | select IMX_HAVE_PLATFORM_GPIO_KEYS |
641 | select IMX_HAVE_PLATFORM_IMX2_WDT | 640 | select IMX_HAVE_PLATFORM_IMX2_WDT |
642 | select IMX_HAVE_PLATFORM_IMX_UART | ||
643 | select IMX_HAVE_PLATFORM_IMX_I2C | 641 | select IMX_HAVE_PLATFORM_IMX_I2C |
642 | select IMX_HAVE_PLATFORM_IMX_UART | ||
644 | select IMX_HAVE_PLATFORM_IPU_CORE | 643 | select IMX_HAVE_PLATFORM_IPU_CORE |
645 | select IMX_HAVE_PLATFORM_MXC_EHCI | 644 | select IMX_HAVE_PLATFORM_MXC_EHCI |
646 | select IMX_HAVE_PLATFORM_MXC_NAND | 645 | select IMX_HAVE_PLATFORM_MXC_NAND |
647 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX | 646 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX |
647 | select SOC_IMX35 | ||
648 | help | 648 | help |
649 | Include support for VPR200 platform. This includes specific | 649 | Include support for VPR200 platform. This includes specific |
650 | configurations for the board and its peripherals. | 650 | configurations for the board and its peripherals. |
@@ -654,11 +654,11 @@ comment "i.MX5 platforms:" | |||
654 | config MACH_MX50_RDP | 654 | config MACH_MX50_RDP |
655 | bool "Support MX50 reference design platform" | 655 | bool "Support MX50 reference design platform" |
656 | depends on BROKEN | 656 | depends on BROKEN |
657 | select SOC_IMX50 | ||
658 | select IMX_HAVE_PLATFORM_IMX_I2C | 657 | select IMX_HAVE_PLATFORM_IMX_I2C |
659 | select IMX_HAVE_PLATFORM_IMX_UART | 658 | select IMX_HAVE_PLATFORM_IMX_UART |
660 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX | 659 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX |
661 | select IMX_HAVE_PLATFORM_SPI_IMX | 660 | select IMX_HAVE_PLATFORM_SPI_IMX |
661 | select SOC_IMX50 | ||
662 | help | 662 | help |
663 | Include support for MX50 reference design platform (RDP) board. This | 663 | Include support for MX50 reference design platform (RDP) board. This |
664 | includes specific configurations for the board and its peripherals. | 664 | includes specific configurations for the board and its peripherals. |
@@ -667,15 +667,14 @@ comment "i.MX51 machines:" | |||
667 | 667 | ||
668 | config MACH_IMX51_DT | 668 | config MACH_IMX51_DT |
669 | bool "Support i.MX51 platforms from device tree" | 669 | bool "Support i.MX51 platforms from device tree" |
670 | select SOC_IMX51 | ||
671 | select MACH_MX51_BABBAGE | 670 | select MACH_MX51_BABBAGE |
671 | select SOC_IMX51 | ||
672 | help | 672 | help |
673 | Include support for Freescale i.MX51 based platforms | 673 | Include support for Freescale i.MX51 based platforms |
674 | using the device tree for discovery | 674 | using the device tree for discovery |
675 | 675 | ||
676 | config MACH_MX51_BABBAGE | 676 | config MACH_MX51_BABBAGE |
677 | bool "Support MX51 BABBAGE platforms" | 677 | bool "Support MX51 BABBAGE platforms" |
678 | select SOC_IMX51 | ||
679 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC | 678 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC |
680 | select IMX_HAVE_PLATFORM_IMX2_WDT | 679 | select IMX_HAVE_PLATFORM_IMX2_WDT |
681 | select IMX_HAVE_PLATFORM_IMX_I2C | 680 | select IMX_HAVE_PLATFORM_IMX_I2C |
@@ -683,6 +682,7 @@ config MACH_MX51_BABBAGE | |||
683 | select IMX_HAVE_PLATFORM_MXC_EHCI | 682 | select IMX_HAVE_PLATFORM_MXC_EHCI |
684 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX | 683 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX |
685 | select IMX_HAVE_PLATFORM_SPI_IMX | 684 | select IMX_HAVE_PLATFORM_SPI_IMX |
685 | select SOC_IMX51 | ||
686 | help | 686 | help |
687 | Include support for MX51 Babbage platform, also known as MX51EVK in | 687 | Include support for MX51 Babbage platform, also known as MX51EVK in |
688 | u-boot. This includes specific configurations for the board and its | 688 | u-boot. This includes specific configurations for the board and its |
@@ -690,27 +690,27 @@ config MACH_MX51_BABBAGE | |||
690 | 690 | ||
691 | config MACH_MX51_3DS | 691 | config MACH_MX51_3DS |
692 | bool "Support MX51PDK (3DS)" | 692 | bool "Support MX51PDK (3DS)" |
693 | select SOC_IMX51 | ||
694 | select IMX_HAVE_PLATFORM_IMX2_WDT | 693 | select IMX_HAVE_PLATFORM_IMX2_WDT |
695 | select IMX_HAVE_PLATFORM_IMX_KEYPAD | 694 | select IMX_HAVE_PLATFORM_IMX_KEYPAD |
696 | select IMX_HAVE_PLATFORM_IMX_UART | 695 | select IMX_HAVE_PLATFORM_IMX_UART |
697 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX | 696 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX |
698 | select IMX_HAVE_PLATFORM_SPI_IMX | 697 | select IMX_HAVE_PLATFORM_SPI_IMX |
699 | select MXC_DEBUG_BOARD | 698 | select MXC_DEBUG_BOARD |
699 | select SOC_IMX51 | ||
700 | help | 700 | help |
701 | Include support for MX51PDK (3DS) platform. This includes specific | 701 | Include support for MX51PDK (3DS) platform. This includes specific |
702 | configurations for the board and its peripherals. | 702 | configurations for the board and its peripherals. |
703 | 703 | ||
704 | config MACH_EUKREA_CPUIMX51SD | 704 | config MACH_EUKREA_CPUIMX51SD |
705 | bool "Support Eukrea CPUIMX51SD module" | 705 | bool "Support Eukrea CPUIMX51SD module" |
706 | select SOC_IMX51 | ||
707 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC | 706 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC |
707 | select IMX_HAVE_PLATFORM_IMX2_WDT | ||
708 | select IMX_HAVE_PLATFORM_IMX_I2C | 708 | select IMX_HAVE_PLATFORM_IMX_I2C |
709 | select IMX_HAVE_PLATFORM_IMX_UART | 709 | select IMX_HAVE_PLATFORM_IMX_UART |
710 | select IMX_HAVE_PLATFORM_IMX2_WDT | ||
711 | select IMX_HAVE_PLATFORM_MXC_EHCI | 710 | select IMX_HAVE_PLATFORM_MXC_EHCI |
712 | select IMX_HAVE_PLATFORM_MXC_NAND | 711 | select IMX_HAVE_PLATFORM_MXC_NAND |
713 | select IMX_HAVE_PLATFORM_SPI_IMX | 712 | select IMX_HAVE_PLATFORM_SPI_IMX |
713 | select SOC_IMX51 | ||
714 | help | 714 | help |
715 | Include support for Eukrea CPUIMX51SD platform. This includes | 715 | Include support for Eukrea CPUIMX51SD platform. This includes |
716 | specific configurations for the module and its peripherals. | 716 | specific configurations for the module and its peripherals. |
@@ -736,12 +736,12 @@ comment "Device tree only" | |||
736 | 736 | ||
737 | config SOC_IMX53 | 737 | config SOC_IMX53 |
738 | bool "i.MX53 support" | 738 | bool "i.MX53 support" |
739 | select SOC_IMX5 | ||
740 | select ARCH_MX5 | 739 | select ARCH_MX5 |
741 | select ARCH_MX53 | 740 | select ARCH_MX53 |
742 | select HAVE_CAN_FLEXCAN if CAN | 741 | select HAVE_CAN_FLEXCAN if CAN |
743 | select PINCTRL | 742 | select PINCTRL |
744 | select PINCTRL_IMX53 | 743 | select PINCTRL_IMX53 |
744 | select SOC_IMX5 | ||
745 | 745 | ||
746 | help | 746 | help |
747 | This enables support for Freescale i.MX53 processor. | 747 | This enables support for Freescale i.MX53 processor. |
diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig index fd5e7b6881bf..73a2d905af8a 100644 --- a/arch/arm/mach-ixp4xx/Kconfig +++ b/arch/arm/mach-ixp4xx/Kconfig | |||
@@ -234,8 +234,8 @@ config IXP4XX_QMGR | |||
234 | 234 | ||
235 | config IXP4XX_NPE | 235 | config IXP4XX_NPE |
236 | tristate "IXP4xx Network Processor Engine support" | 236 | tristate "IXP4xx Network Processor Engine support" |
237 | select HOTPLUG | ||
238 | select FW_LOADER | 237 | select FW_LOADER |
238 | select HOTPLUG | ||
239 | help | 239 | help |
240 | This driver supports IXP4xx built-in network coprocessors | 240 | This driver supports IXP4xx built-in network coprocessors |
241 | and is automatically selected by Ethernet and HSS drivers. | 241 | and is automatically selected by Ethernet and HSS drivers. |
diff --git a/arch/arm/mach-mmp/Kconfig b/arch/arm/mach-mmp/Kconfig index d697d07a1bf0..178d4daa5e1d 100644 --- a/arch/arm/mach-mmp/Kconfig +++ b/arch/arm/mach-mmp/Kconfig | |||
@@ -107,22 +107,22 @@ endmenu | |||
107 | 107 | ||
108 | config CPU_PXA168 | 108 | config CPU_PXA168 |
109 | bool | 109 | bool |
110 | select CPU_MOHAWK | ||
111 | select COMMON_CLK | 110 | select COMMON_CLK |
111 | select CPU_MOHAWK | ||
112 | help | 112 | help |
113 | Select code specific to PXA168 | 113 | Select code specific to PXA168 |
114 | 114 | ||
115 | config CPU_PXA910 | 115 | config CPU_PXA910 |
116 | bool | 116 | bool |
117 | select CPU_MOHAWK | ||
118 | select COMMON_CLK | 117 | select COMMON_CLK |
118 | select CPU_MOHAWK | ||
119 | help | 119 | help |
120 | Select code specific to PXA910 | 120 | Select code specific to PXA910 |
121 | 121 | ||
122 | config CPU_MMP2 | 122 | config CPU_MMP2 |
123 | bool | 123 | bool |
124 | select CPU_PJ4 | ||
125 | select COMMON_CLK | 124 | select COMMON_CLK |
125 | select CPU_PJ4 | ||
126 | help | 126 | help |
127 | Select code specific to MMP2. MMP2 is ARMv7 compatible. | 127 | Select code specific to MMP2. MMP2 is ARMv7 compatible. |
128 | 128 | ||
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index 7902de151cc5..b61908594b47 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig | |||
@@ -10,35 +10,35 @@ choice | |||
10 | 10 | ||
11 | config ARCH_MSM7X00A | 11 | config ARCH_MSM7X00A |
12 | bool "MSM7x00A / MSM7x01A" | 12 | bool "MSM7x00A / MSM7x01A" |
13 | select MACH_TROUT if !MACH_HALIBUT | ||
14 | select ARCH_MSM_ARM11 | 13 | select ARCH_MSM_ARM11 |
15 | select MSM_SMD | ||
16 | select MSM_SMD_PKG3 | ||
17 | select CPU_V6 | 14 | select CPU_V6 |
18 | select GPIO_MSM_V1 | 15 | select GPIO_MSM_V1 |
16 | select MACH_TROUT if !MACH_HALIBUT | ||
19 | select MSM_PROC_COMM | 17 | select MSM_PROC_COMM |
18 | select MSM_SMD | ||
19 | select MSM_SMD_PKG3 | ||
20 | 20 | ||
21 | config ARCH_MSM7X30 | 21 | config ARCH_MSM7X30 |
22 | bool "MSM7x30" | 22 | bool "MSM7x30" |
23 | select MACH_MSM7X30_SURF # if ! | ||
24 | select ARCH_MSM_SCORPION | 23 | select ARCH_MSM_SCORPION |
25 | select MSM_SMD | ||
26 | select MSM_VIC | ||
27 | select CPU_V7 | 24 | select CPU_V7 |
28 | select MSM_GPIOMUX | ||
29 | select GPIO_MSM_V1 | 25 | select GPIO_MSM_V1 |
26 | select MACH_MSM7X30_SURF # if ! | ||
27 | select MSM_GPIOMUX | ||
30 | select MSM_PROC_COMM | 28 | select MSM_PROC_COMM |
29 | select MSM_SMD | ||
30 | select MSM_VIC | ||
31 | 31 | ||
32 | config ARCH_QSD8X50 | 32 | config ARCH_QSD8X50 |
33 | bool "QSD8X50" | 33 | bool "QSD8X50" |
34 | select MACH_QSD8X50_SURF if !MACH_QSD8X50A_ST1_5 | ||
35 | select ARCH_MSM_SCORPION | 34 | select ARCH_MSM_SCORPION |
36 | select MSM_SMD | ||
37 | select MSM_VIC | ||
38 | select CPU_V7 | 35 | select CPU_V7 |
39 | select MSM_GPIOMUX | ||
40 | select GPIO_MSM_V1 | 36 | select GPIO_MSM_V1 |
37 | select MACH_QSD8X50_SURF if !MACH_QSD8X50A_ST1_5 | ||
38 | select MSM_GPIOMUX | ||
41 | select MSM_PROC_COMM | 39 | select MSM_PROC_COMM |
40 | select MSM_SMD | ||
41 | select MSM_VIC | ||
42 | 42 | ||
43 | endchoice | 43 | endchoice |
44 | 44 | ||
@@ -47,10 +47,10 @@ config ARCH_MSM8X60 | |||
47 | select ARCH_MSM_SCORPIONMP | 47 | select ARCH_MSM_SCORPIONMP |
48 | select ARM_GIC | 48 | select ARM_GIC |
49 | select CPU_V7 | 49 | select CPU_V7 |
50 | select MSM_V2_TLMM | ||
51 | select GPIO_MSM_V2 | 50 | select GPIO_MSM_V2 |
52 | select MSM_GPIOMUX | 51 | select MSM_GPIOMUX |
53 | select MSM_SCM if SMP | 52 | select MSM_SCM if SMP |
53 | select MSM_V2_TLMM | ||
54 | select USE_OF | 54 | select USE_OF |
55 | 55 | ||
56 | config ARCH_MSM8960 | 56 | config ARCH_MSM8960 |
@@ -58,9 +58,9 @@ config ARCH_MSM8960 | |||
58 | select ARCH_MSM_SCORPIONMP | 58 | select ARCH_MSM_SCORPIONMP |
59 | select ARM_GIC | 59 | select ARM_GIC |
60 | select CPU_V7 | 60 | select CPU_V7 |
61 | select MSM_V2_TLMM | ||
62 | select MSM_GPIOMUX | 61 | select MSM_GPIOMUX |
63 | select MSM_SCM if SMP | 62 | select MSM_SCM if SMP |
63 | select MSM_V2_TLMM | ||
64 | select USE_OF | 64 | select USE_OF |
65 | 65 | ||
66 | config MSM_HAS_DEBUG_UART_HS | 66 | config MSM_HAS_DEBUG_UART_HS |
@@ -110,8 +110,8 @@ config MACH_QSD8X50_SURF | |||
110 | 110 | ||
111 | config MACH_QSD8X50A_ST1_5 | 111 | config MACH_QSD8X50A_ST1_5 |
112 | depends on ARCH_QSD8X50 | 112 | depends on ARCH_QSD8X50 |
113 | select MSM_SOC_REV_A | ||
114 | bool "QSD8x50A ST1.5" | 113 | bool "QSD8x50A ST1.5" |
114 | select MSM_SOC_REV_A | ||
115 | help | 115 | help |
116 | Support for the Qualcomm ST1.5. | 116 | Support for the Qualcomm ST1.5. |
117 | 117 | ||
diff --git a/arch/arm/mach-nomadik/Kconfig b/arch/arm/mach-nomadik/Kconfig index 365879b47c0e..c744946ef022 100644 --- a/arch/arm/mach-nomadik/Kconfig +++ b/arch/arm/mach-nomadik/Kconfig | |||
@@ -4,8 +4,8 @@ menu "Nomadik boards" | |||
4 | 4 | ||
5 | config MACH_NOMADIK_8815NHK | 5 | config MACH_NOMADIK_8815NHK |
6 | bool "ST 8815 Nomadik Hardware Kit (evaluation board)" | 6 | bool "ST 8815 Nomadik Hardware Kit (evaluation board)" |
7 | select NOMADIK_8815 | ||
8 | select HAS_MTU | 7 | select HAS_MTU |
8 | select NOMADIK_8815 | ||
9 | 9 | ||
10 | endmenu | 10 | endmenu |
11 | 11 | ||
@@ -16,7 +16,7 @@ config I2C_BITBANG_8815NHK | |||
16 | tristate "Driver for bit-bang busses found on the 8815 NHK" | 16 | tristate "Driver for bit-bang busses found on the 8815 NHK" |
17 | depends on I2C && MACH_NOMADIK_8815NHK | 17 | depends on I2C && MACH_NOMADIK_8815NHK |
18 | depends on PINCTRL_NOMADIK | 18 | depends on PINCTRL_NOMADIK |
19 | select I2C_ALGOBIT | ||
20 | default y | 19 | default y |
20 | select I2C_ALGOBIT | ||
21 | 21 | ||
22 | endif | 22 | endif |
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig index cba3f7191cfc..903da8eb886c 100644 --- a/arch/arm/mach-omap1/Kconfig +++ b/arch/arm/mach-omap1/Kconfig | |||
@@ -8,15 +8,15 @@ comment "OMAP Core Type" | |||
8 | config ARCH_OMAP730 | 8 | config ARCH_OMAP730 |
9 | depends on ARCH_OMAP1 | 9 | depends on ARCH_OMAP1 |
10 | bool "OMAP730 Based System" | 10 | bool "OMAP730 Based System" |
11 | select ARCH_OMAP_OTG | ||
11 | select CPU_ARM926T | 12 | select CPU_ARM926T |
12 | select OMAP_MPU_TIMER | 13 | select OMAP_MPU_TIMER |
13 | select ARCH_OMAP_OTG | ||
14 | 14 | ||
15 | config ARCH_OMAP850 | 15 | config ARCH_OMAP850 |
16 | depends on ARCH_OMAP1 | 16 | depends on ARCH_OMAP1 |
17 | bool "OMAP850 Based System" | 17 | bool "OMAP850 Based System" |
18 | select CPU_ARM926T | ||
19 | select ARCH_OMAP_OTG | 18 | select ARCH_OMAP_OTG |
19 | select CPU_ARM926T | ||
20 | 20 | ||
21 | config ARCH_OMAP15XX | 21 | config ARCH_OMAP15XX |
22 | depends on ARCH_OMAP1 | 22 | depends on ARCH_OMAP1 |
@@ -28,8 +28,8 @@ config ARCH_OMAP15XX | |||
28 | config ARCH_OMAP16XX | 28 | config ARCH_OMAP16XX |
29 | depends on ARCH_OMAP1 | 29 | depends on ARCH_OMAP1 |
30 | bool "OMAP16xx Based System" | 30 | bool "OMAP16xx Based System" |
31 | select CPU_ARM926T | ||
32 | select ARCH_OMAP_OTG | 31 | select ARCH_OMAP_OTG |
32 | select CPU_ARM926T | ||
33 | 33 | ||
34 | comment "OMAP Board Type" | 34 | comment "OMAP Board Type" |
35 | depends on ARCH_OMAP1 | 35 | depends on ARCH_OMAP1 |
@@ -132,8 +132,8 @@ config MACH_OMAP_PALMTT | |||
132 | 132 | ||
133 | config MACH_SX1 | 133 | config MACH_SX1 |
134 | bool "Siemens SX1" | 134 | bool "Siemens SX1" |
135 | select I2C | ||
136 | depends on ARCH_OMAP1 && ARCH_OMAP15XX | 135 | depends on ARCH_OMAP1 && ARCH_OMAP15XX |
136 | select I2C | ||
137 | help | 137 | help |
138 | Support for the Siemens SX1 phone. To boot the kernel, | 138 | Support for the Siemens SX1 phone. To boot the kernel, |
139 | you'll need a SX1 compatible bootloader; check out | 139 | you'll need a SX1 compatible bootloader; check out |
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index a6219eaf1f68..2a1a898c7f90 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
@@ -6,19 +6,19 @@ config ARCH_OMAP2PLUS_TYPICAL | |||
6 | bool "Typical OMAP configuration" | 6 | bool "Typical OMAP configuration" |
7 | default y | 7 | default y |
8 | select AEABI | 8 | select AEABI |
9 | select REGULATOR | 9 | select HIGHMEM |
10 | select PM_RUNTIME | ||
11 | select VFP | ||
12 | select NEON if ARCH_OMAP3 || ARCH_OMAP4 || SOC_OMAP5 | ||
13 | select SERIAL_OMAP | ||
14 | select SERIAL_OMAP_CONSOLE | ||
15 | select I2C | 10 | select I2C |
16 | select I2C_OMAP | 11 | select I2C_OMAP |
17 | select MENELAUS if ARCH_OMAP2 | 12 | select MENELAUS if ARCH_OMAP2 |
13 | select NEON if ARCH_OMAP3 || ARCH_OMAP4 || SOC_OMAP5 | ||
14 | select PINCTRL | ||
15 | select PM_RUNTIME | ||
16 | select REGULATOR | ||
17 | select SERIAL_OMAP | ||
18 | select SERIAL_OMAP_CONSOLE | ||
18 | select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4 | 19 | select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4 |
19 | select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4 | 20 | select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4 |
20 | select HIGHMEM | 21 | select VFP |
21 | select PINCTRL | ||
22 | help | 22 | help |
23 | Compile a kernel suitable for booting most boards | 23 | Compile a kernel suitable for booting most boards |
24 | 24 | ||
@@ -40,44 +40,44 @@ config ARCH_OMAP3 | |||
40 | bool "TI OMAP3" | 40 | bool "TI OMAP3" |
41 | depends on ARCH_OMAP2PLUS | 41 | depends on ARCH_OMAP2PLUS |
42 | default y | 42 | default y |
43 | select CPU_V7 | ||
44 | select USB_ARCH_HAS_EHCI if USB_SUPPORT | ||
45 | select ARCH_HAS_OPP | 43 | select ARCH_HAS_OPP |
46 | select PM_RUNTIME if CPU_IDLE | ||
47 | select PM_OPP if PM | ||
48 | select ARM_CPU_SUSPEND if PM | 44 | select ARM_CPU_SUSPEND if PM |
45 | select CPU_V7 | ||
49 | select MULTI_IRQ_HANDLER | 46 | select MULTI_IRQ_HANDLER |
50 | select SOC_HAS_OMAP2_SDRC | ||
51 | select OMAP_INTERCONNECT | 47 | select OMAP_INTERCONNECT |
48 | select PM_OPP if PM | ||
49 | select PM_RUNTIME if CPU_IDLE | ||
50 | select SOC_HAS_OMAP2_SDRC | ||
51 | select USB_ARCH_HAS_EHCI if USB_SUPPORT | ||
52 | 52 | ||
53 | config ARCH_OMAP4 | 53 | config ARCH_OMAP4 |
54 | bool "TI OMAP4" | 54 | bool "TI OMAP4" |
55 | default y | 55 | default y |
56 | depends on ARCH_OMAP2PLUS | 56 | depends on ARCH_OMAP2PLUS |
57 | select ARCH_HAS_OPP | ||
58 | select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP | ||
59 | select ARM_CPU_SUSPEND if PM | ||
60 | select ARM_ERRATA_720789 | ||
61 | select ARM_GIC | ||
57 | select CACHE_L2X0 | 62 | select CACHE_L2X0 |
58 | select CPU_V7 | 63 | select CPU_V7 |
59 | select ARM_GIC | ||
60 | select HAVE_SMP | 64 | select HAVE_SMP |
61 | select LOCAL_TIMERS if SMP | 65 | select LOCAL_TIMERS if SMP |
66 | select OMAP_INTERCONNECT | ||
62 | select PL310_ERRATA_588369 | 67 | select PL310_ERRATA_588369 |
63 | select PL310_ERRATA_727915 | 68 | select PL310_ERRATA_727915 |
64 | select ARM_ERRATA_720789 | ||
65 | select ARCH_HAS_OPP | ||
66 | select PM_RUNTIME if CPU_IDLE | ||
67 | select PM_OPP if PM | 69 | select PM_OPP if PM |
70 | select PM_RUNTIME if CPU_IDLE | ||
68 | select USB_ARCH_HAS_EHCI if USB_SUPPORT | 71 | select USB_ARCH_HAS_EHCI if USB_SUPPORT |
69 | select ARM_CPU_SUSPEND if PM | ||
70 | select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP | ||
71 | select OMAP_INTERCONNECT | ||
72 | 72 | ||
73 | config SOC_OMAP5 | 73 | config SOC_OMAP5 |
74 | bool "TI OMAP5" | 74 | bool "TI OMAP5" |
75 | select CPU_V7 | 75 | select ARM_ARCH_TIMER |
76 | select ARM_CPU_SUSPEND if PM | ||
76 | select ARM_GIC | 77 | select ARM_GIC |
78 | select CPU_V7 | ||
77 | select HAVE_SMP | 79 | select HAVE_SMP |
78 | select ARM_CPU_SUSPEND if PM | ||
79 | select SOC_HAS_REALTIME_COUNTER | 80 | select SOC_HAS_REALTIME_COUNTER |
80 | select ARM_ARCH_TIMER | ||
81 | 81 | ||
82 | comment "OMAP Core Type" | 82 | comment "OMAP Core Type" |
83 | depends on ARCH_OMAP2 | 83 | depends on ARCH_OMAP2 |
@@ -109,8 +109,8 @@ config SOC_TI81XX | |||
109 | config SOC_AM33XX | 109 | config SOC_AM33XX |
110 | bool "AM33XX support" | 110 | bool "AM33XX support" |
111 | default y | 111 | default y |
112 | select CPU_V7 | ||
113 | select ARM_CPU_SUSPEND if PM | 112 | select ARM_CPU_SUSPEND if PM |
113 | select CPU_V7 | ||
114 | select MULTI_IRQ_HANDLER | 114 | select MULTI_IRQ_HANDLER |
115 | 115 | ||
116 | config OMAP_PACKAGE_ZAF | 116 | config OMAP_PACKAGE_ZAF |
@@ -157,8 +157,8 @@ config MACH_OMAP_H4 | |||
157 | bool "OMAP 2420 H4 board" | 157 | bool "OMAP 2420 H4 board" |
158 | depends on SOC_OMAP2420 | 158 | depends on SOC_OMAP2420 |
159 | default y | 159 | default y |
160 | select OMAP_PACKAGE_ZAF | ||
161 | select OMAP_DEBUG_DEVICES | 160 | select OMAP_DEBUG_DEVICES |
161 | select OMAP_PACKAGE_ZAF | ||
162 | 162 | ||
163 | config MACH_OMAP_APOLLON | 163 | config MACH_OMAP_APOLLON |
164 | bool "OMAP 2420 Apollon board" | 164 | bool "OMAP 2420 Apollon board" |
@@ -193,8 +193,8 @@ config MACH_OMAP_LDP | |||
193 | config MACH_OMAP3530_LV_SOM | 193 | config MACH_OMAP3530_LV_SOM |
194 | bool "OMAP3 Logic 3530 LV SOM board" | 194 | bool "OMAP3 Logic 3530 LV SOM board" |
195 | depends on ARCH_OMAP3 | 195 | depends on ARCH_OMAP3 |
196 | select OMAP_PACKAGE_CBB | ||
197 | default y | 196 | default y |
197 | select OMAP_PACKAGE_CBB | ||
198 | help | 198 | help |
199 | Support for the LogicPD OMAP3530 SOM Development kit | 199 | Support for the LogicPD OMAP3530 SOM Development kit |
200 | for full description please see the products webpage at | 200 | for full description please see the products webpage at |
@@ -203,8 +203,8 @@ config MACH_OMAP3530_LV_SOM | |||
203 | config MACH_OMAP3_TORPEDO | 203 | config MACH_OMAP3_TORPEDO |
204 | bool "OMAP3 Logic 35x Torpedo board" | 204 | bool "OMAP3 Logic 35x Torpedo board" |
205 | depends on ARCH_OMAP3 | 205 | depends on ARCH_OMAP3 |
206 | select OMAP_PACKAGE_CBB | ||
207 | default y | 206 | default y |
207 | select OMAP_PACKAGE_CBB | ||
208 | help | 208 | help |
209 | Support for the LogicPD OMAP35x Torpedo Development kit | 209 | Support for the LogicPD OMAP35x Torpedo Development kit |
210 | for full description please see the products webpage at | 210 | for full description please see the products webpage at |
@@ -265,17 +265,17 @@ config MACH_NOKIA_N8X0 | |||
265 | bool "Nokia N800/N810" | 265 | bool "Nokia N800/N810" |
266 | depends on SOC_OMAP2420 | 266 | depends on SOC_OMAP2420 |
267 | default y | 267 | default y |
268 | select OMAP_PACKAGE_ZAC | ||
269 | select MACH_NOKIA_N800 | 268 | select MACH_NOKIA_N800 |
270 | select MACH_NOKIA_N810 | 269 | select MACH_NOKIA_N810 |
271 | select MACH_NOKIA_N810_WIMAX | 270 | select MACH_NOKIA_N810_WIMAX |
271 | select OMAP_PACKAGE_ZAC | ||
272 | 272 | ||
273 | config MACH_NOKIA_RM680 | 273 | config MACH_NOKIA_RM680 |
274 | bool "Nokia RM-680/696 board" | 274 | bool "Nokia RM-680/696 board" |
275 | depends on ARCH_OMAP3 | 275 | depends on ARCH_OMAP3 |
276 | default y | 276 | default y |
277 | select OMAP_PACKAGE_CBB | ||
278 | select MACH_NOKIA_RM696 | 277 | select MACH_NOKIA_RM696 |
278 | select OMAP_PACKAGE_CBB | ||
279 | 279 | ||
280 | config MACH_NOKIA_RX51 | 280 | config MACH_NOKIA_RX51 |
281 | bool "Nokia RX-51 board" | 281 | bool "Nokia RX-51 board" |
@@ -288,20 +288,20 @@ config MACH_OMAP_ZOOM2 | |||
288 | depends on ARCH_OMAP3 | 288 | depends on ARCH_OMAP3 |
289 | default y | 289 | default y |
290 | select OMAP_PACKAGE_CBB | 290 | select OMAP_PACKAGE_CBB |
291 | select REGULATOR_FIXED_VOLTAGE if REGULATOR | ||
291 | select SERIAL_8250 | 292 | select SERIAL_8250 |
292 | select SERIAL_CORE_CONSOLE | ||
293 | select SERIAL_8250_CONSOLE | 293 | select SERIAL_8250_CONSOLE |
294 | select REGULATOR_FIXED_VOLTAGE if REGULATOR | 294 | select SERIAL_CORE_CONSOLE |
295 | 295 | ||
296 | config MACH_OMAP_ZOOM3 | 296 | config MACH_OMAP_ZOOM3 |
297 | bool "OMAP3630 Zoom3 board" | 297 | bool "OMAP3630 Zoom3 board" |
298 | depends on ARCH_OMAP3 | 298 | depends on ARCH_OMAP3 |
299 | default y | 299 | default y |
300 | select OMAP_PACKAGE_CBP | 300 | select OMAP_PACKAGE_CBP |
301 | select REGULATOR_FIXED_VOLTAGE if REGULATOR | ||
301 | select SERIAL_8250 | 302 | select SERIAL_8250 |
302 | select SERIAL_CORE_CONSOLE | ||
303 | select SERIAL_8250_CONSOLE | 303 | select SERIAL_8250_CONSOLE |
304 | select REGULATOR_FIXED_VOLTAGE if REGULATOR | 304 | select SERIAL_CORE_CONSOLE |
305 | 305 | ||
306 | config MACH_CM_T35 | 306 | config MACH_CM_T35 |
307 | bool "CompuLab CM-T35/CM-T3730 modules" | 307 | bool "CompuLab CM-T35/CM-T3730 modules" |
@@ -329,8 +329,8 @@ config MACH_IGEP0030 | |||
329 | bool "IGEP OMAP3 module" | 329 | bool "IGEP OMAP3 module" |
330 | depends on ARCH_OMAP3 | 330 | depends on ARCH_OMAP3 |
331 | default y | 331 | default y |
332 | select OMAP_PACKAGE_CBB | ||
333 | select MACH_IGEP0020 | 332 | select MACH_IGEP0020 |
333 | select OMAP_PACKAGE_CBB | ||
334 | 334 | ||
335 | config MACH_SBC3530 | 335 | config MACH_SBC3530 |
336 | bool "OMAP3 SBC STALKER board" | 336 | bool "OMAP3 SBC STALKER board" |
diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig index 41fc85327673..558ccfb8d458 100644 --- a/arch/arm/mach-prima2/Kconfig +++ b/arch/arm/mach-prima2/Kconfig | |||
@@ -6,8 +6,8 @@ config ARCH_PRIMA2 | |||
6 | bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform" | 6 | bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform" |
7 | default y | 7 | default y |
8 | select CPU_V7 | 8 | select CPU_V7 |
9 | select ZONE_DMA | ||
10 | select SIRF_IRQ | 9 | select SIRF_IRQ |
10 | select ZONE_DMA | ||
11 | help | 11 | help |
12 | Support for CSR SiRFSoC ARM Cortex A9 Platform | 12 | Support for CSR SiRFSoC ARM Cortex A9 Platform |
13 | 13 | ||
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index 8e6288de69b9..11aa7399dc09 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig | |||
@@ -27,10 +27,10 @@ comment "Intel/Marvell Dev Platforms (sorted by hardware release time)" | |||
27 | 27 | ||
28 | config MACH_PXA3XX_DT | 28 | config MACH_PXA3XX_DT |
29 | bool "Support PXA3xx platforms from device tree" | 29 | bool "Support PXA3xx platforms from device tree" |
30 | select PXA3xx | ||
31 | select CPU_PXA300 | 30 | select CPU_PXA300 |
32 | select POWER_SUPPLY | ||
33 | select HAVE_PWM | 31 | select HAVE_PWM |
32 | select POWER_SUPPLY | ||
33 | select PXA3xx | ||
34 | select USE_OF | 34 | select USE_OF |
35 | help | 35 | help |
36 | Include support for Marvell PXA3xx based platforms using | 36 | Include support for Marvell PXA3xx based platforms using |
@@ -44,13 +44,13 @@ config ARCH_LUBBOCK | |||
44 | 44 | ||
45 | config MACH_MAINSTONE | 45 | config MACH_MAINSTONE |
46 | bool "Intel HCDDBBVA0 Development Platform (aka Mainstone)" | 46 | bool "Intel HCDDBBVA0 Development Platform (aka Mainstone)" |
47 | select PXA27x | ||
48 | select HAVE_PWM | 47 | select HAVE_PWM |
48 | select PXA27x | ||
49 | 49 | ||
50 | config MACH_ZYLONITE | 50 | config MACH_ZYLONITE |
51 | bool | 51 | bool |
52 | select PXA3xx | ||
53 | select HAVE_PWM | 52 | select HAVE_PWM |
53 | select PXA3xx | ||
54 | 54 | ||
55 | config MACH_ZYLONITE300 | 55 | config MACH_ZYLONITE300 |
56 | bool "PXA3xx Development Platform (aka Zylonite) PXA300/310" | 56 | bool "PXA3xx Development Platform (aka Zylonite) PXA300/310" |
@@ -65,19 +65,19 @@ config MACH_ZYLONITE320 | |||
65 | 65 | ||
66 | config MACH_LITTLETON | 66 | config MACH_LITTLETON |
67 | bool "PXA3xx Form Factor Platform (aka Littleton)" | 67 | bool "PXA3xx Form Factor Platform (aka Littleton)" |
68 | select PXA3xx | ||
69 | select CPU_PXA300 | 68 | select CPU_PXA300 |
70 | select CPU_PXA310 | 69 | select CPU_PXA310 |
70 | select PXA3xx | ||
71 | 71 | ||
72 | config MACH_TAVOREVB | 72 | config MACH_TAVOREVB |
73 | bool "PXA930 Evaluation Board (aka TavorEVB)" | 73 | bool "PXA930 Evaluation Board (aka TavorEVB)" |
74 | select PXA3xx | ||
75 | select CPU_PXA930 | 74 | select CPU_PXA930 |
75 | select PXA3xx | ||
76 | 76 | ||
77 | config MACH_SAAR | 77 | config MACH_SAAR |
78 | bool "PXA930 Handheld Platform (aka SAAR)" | 78 | bool "PXA930 Handheld Platform (aka SAAR)" |
79 | select PXA3xx | ||
80 | select CPU_PXA930 | 79 | select CPU_PXA930 |
80 | select PXA3xx | ||
81 | 81 | ||
82 | comment "Third Party Dev Platforms (sorted by vendor name)" | 82 | comment "Third Party Dev Platforms (sorted by vendor name)" |
83 | 83 | ||
@@ -87,29 +87,29 @@ config ARCH_PXA_IDP | |||
87 | 87 | ||
88 | config ARCH_VIPER | 88 | config ARCH_VIPER |
89 | bool "Arcom/Eurotech VIPER SBC" | 89 | bool "Arcom/Eurotech VIPER SBC" |
90 | select PXA25x | 90 | select ARCOM_PCMCIA |
91 | select ISA | ||
92 | select I2C_GPIO | ||
93 | select HAVE_PWM | 91 | select HAVE_PWM |
92 | select I2C_GPIO | ||
93 | select ISA | ||
94 | select PXA25x | ||
94 | select PXA_HAVE_ISA_IRQS | 95 | select PXA_HAVE_ISA_IRQS |
95 | select ARCOM_PCMCIA | ||
96 | 96 | ||
97 | config MACH_ARCOM_ZEUS | 97 | config MACH_ARCOM_ZEUS |
98 | bool "Arcom/Eurotech ZEUS SBC" | 98 | bool "Arcom/Eurotech ZEUS SBC" |
99 | select PXA27x | 99 | select ARCOM_PCMCIA |
100 | select ISA | 100 | select ISA |
101 | select PXA27x | ||
101 | select PXA_HAVE_ISA_IRQS | 102 | select PXA_HAVE_ISA_IRQS |
102 | select ARCOM_PCMCIA | ||
103 | 103 | ||
104 | config MACH_BALLOON3 | 104 | config MACH_BALLOON3 |
105 | bool "Balloon 3 board" | 105 | bool "Balloon 3 board" |
106 | select PXA27x | ||
107 | select IWMMXT | 106 | select IWMMXT |
107 | select PXA27x | ||
108 | 108 | ||
109 | config MACH_CSB726 | 109 | config MACH_CSB726 |
110 | bool "Enable Cogent CSB726 System On a Module" | 110 | bool "Enable Cogent CSB726 System On a Module" |
111 | select PXA27x | ||
112 | select IWMMXT | 111 | select IWMMXT |
112 | select PXA27x | ||
113 | help | 113 | help |
114 | Say Y here if you intend to run this kernel on a Cogent | 114 | Say Y here if you intend to run this kernel on a Cogent |
115 | CSB726 System On Module. | 115 | CSB726 System On Module. |
@@ -121,11 +121,11 @@ config CSB726_CSB701 | |||
121 | config MACH_ARMCORE | 121 | config MACH_ARMCORE |
122 | bool "CompuLab CM-X255/CM-X270 modules" | 122 | bool "CompuLab CM-X255/CM-X270 modules" |
123 | select ARCH_HAS_DMA_SET_COHERENT_MASK if PCI | 123 | select ARCH_HAS_DMA_SET_COHERENT_MASK if PCI |
124 | select PXA27x | ||
125 | select IWMMXT | 124 | select IWMMXT |
126 | select PXA25x | ||
127 | select MIGHT_HAVE_PCI | 125 | select MIGHT_HAVE_PCI |
128 | select NEED_MACH_IO_H if PCI | 126 | select NEED_MACH_IO_H if PCI |
127 | select PXA25x | ||
128 | select PXA27x | ||
129 | 129 | ||
130 | config MACH_EM_X270 | 130 | config MACH_EM_X270 |
131 | bool "CompuLab EM-x270 platform" | 131 | bool "CompuLab EM-x270 platform" |
@@ -137,10 +137,10 @@ config MACH_EXEDA | |||
137 | 137 | ||
138 | config MACH_CM_X300 | 138 | config MACH_CM_X300 |
139 | bool "CompuLab CM-X300 modules" | 139 | bool "CompuLab CM-X300 modules" |
140 | select PXA3xx | ||
141 | select CPU_PXA300 | 140 | select CPU_PXA300 |
142 | select CPU_PXA310 | 141 | select CPU_PXA310 |
143 | select HAVE_PWM | 142 | select HAVE_PWM |
143 | select PXA3xx | ||
144 | 144 | ||
145 | config MACH_CAPC7117 | 145 | config MACH_CAPC7117 |
146 | bool "Embedian CAPC-7117 evaluation kit based on the MXM-8x10 CoM" | 146 | bool "Embedian CAPC-7117 evaluation kit based on the MXM-8x10 CoM" |
@@ -168,22 +168,22 @@ endchoice | |||
168 | 168 | ||
169 | config MACH_INTELMOTE2 | 169 | config MACH_INTELMOTE2 |
170 | bool "Intel Mote 2 Platform" | 170 | bool "Intel Mote 2 Platform" |
171 | select PXA27x | ||
172 | select IWMMXT | 171 | select IWMMXT |
172 | select PXA27x | ||
173 | 173 | ||
174 | config MACH_STARGATE2 | 174 | config MACH_STARGATE2 |
175 | bool "Intel Stargate 2 Platform" | 175 | bool "Intel Stargate 2 Platform" |
176 | select PXA27x | ||
177 | select IWMMXT | 176 | select IWMMXT |
177 | select PXA27x | ||
178 | 178 | ||
179 | config MACH_XCEP | 179 | config MACH_XCEP |
180 | bool "Iskratel Electronics XCEP" | 180 | bool "Iskratel Electronics XCEP" |
181 | select PXA25x | ||
182 | select MTD | 181 | select MTD |
183 | select MTD_PHYSMAP | ||
184 | select MTD_CFI_INTELEXT | ||
185 | select MTD_CFI | 182 | select MTD_CFI |
183 | select MTD_CFI_INTELEXT | ||
186 | select MTD_CHAR | 184 | select MTD_CHAR |
185 | select MTD_PHYSMAP | ||
186 | select PXA25x | ||
187 | select SMC91X | 187 | select SMC91X |
188 | help | 188 | help |
189 | PXA255 based Single Board Computer with SMC 91C111 ethernet chip and 64 MB of flash. | 189 | PXA255 based Single Board Computer with SMC 91C111 ethernet chip and 64 MB of flash. |
@@ -195,14 +195,14 @@ config TRIZEPS_PXA | |||
195 | config MACH_TRIZEPS4 | 195 | config MACH_TRIZEPS4 |
196 | bool "Keith und Koep Trizeps4 DIMM-Module" | 196 | bool "Keith und Koep Trizeps4 DIMM-Module" |
197 | depends on TRIZEPS_PXA | 197 | depends on TRIZEPS_PXA |
198 | select TRIZEPS_PCMCIA | ||
199 | select PXA27x | 198 | select PXA27x |
199 | select TRIZEPS_PCMCIA | ||
200 | 200 | ||
201 | config MACH_TRIZEPS4WL | 201 | config MACH_TRIZEPS4WL |
202 | bool "Keith und Koep Trizeps4-WL DIMM-Module" | 202 | bool "Keith und Koep Trizeps4-WL DIMM-Module" |
203 | depends on TRIZEPS_PXA | 203 | depends on TRIZEPS_PXA |
204 | select TRIZEPS_PCMCIA | ||
205 | select PXA27x | 204 | select PXA27x |
205 | select TRIZEPS_PCMCIA | ||
206 | 206 | ||
207 | choice | 207 | choice |
208 | prompt "Select base board for Trizeps module" | 208 | prompt "Select base board for Trizeps module" |
@@ -231,18 +231,18 @@ config TRIZEPS_PCMCIA | |||
231 | 231 | ||
232 | config MACH_LOGICPD_PXA270 | 232 | config MACH_LOGICPD_PXA270 |
233 | bool "LogicPD PXA270 Card Engine Development Platform" | 233 | bool "LogicPD PXA270 Card Engine Development Platform" |
234 | select PXA27x | ||
235 | select HAVE_PWM | 234 | select HAVE_PWM |
235 | select PXA27x | ||
236 | 236 | ||
237 | config MACH_PCM027 | 237 | config MACH_PCM027 |
238 | bool "Phytec phyCORE-PXA270 CPU module (PCM-027)" | 238 | bool "Phytec phyCORE-PXA270 CPU module (PCM-027)" |
239 | select PXA27x | ||
240 | select IWMMXT | 239 | select IWMMXT |
240 | select PXA27x | ||
241 | 241 | ||
242 | config MACH_PCM990_BASEBOARD | 242 | config MACH_PCM990_BASEBOARD |
243 | bool "PHYTEC PCM-990 development board" | 243 | bool "PHYTEC PCM-990 development board" |
244 | select HAVE_PWM | ||
245 | depends on MACH_PCM027 | 244 | depends on MACH_PCM027 |
245 | select HAVE_PWM | ||
246 | 246 | ||
247 | choice | 247 | choice |
248 | prompt "display on pcm990" | 248 | prompt "display on pcm990" |
@@ -266,19 +266,19 @@ config MACH_COLIBRI | |||
266 | config MACH_COLIBRI_PXA270_INCOME | 266 | config MACH_COLIBRI_PXA270_INCOME |
267 | bool "Income s.r.o. PXA270 SBC" | 267 | bool "Income s.r.o. PXA270 SBC" |
268 | depends on MACH_COLIBRI | 268 | depends on MACH_COLIBRI |
269 | select PXA27x | ||
270 | select HAVE_PWM | 269 | select HAVE_PWM |
270 | select PXA27x | ||
271 | 271 | ||
272 | config MACH_COLIBRI300 | 272 | config MACH_COLIBRI300 |
273 | bool "Toradex Colibri PXA300/310" | 273 | bool "Toradex Colibri PXA300/310" |
274 | select PXA3xx | ||
275 | select CPU_PXA300 | 274 | select CPU_PXA300 |
276 | select CPU_PXA310 | 275 | select CPU_PXA310 |
276 | select PXA3xx | ||
277 | 277 | ||
278 | config MACH_COLIBRI320 | 278 | config MACH_COLIBRI320 |
279 | bool "Toradex Colibri PXA320" | 279 | bool "Toradex Colibri PXA320" |
280 | select PXA3xx | ||
281 | select CPU_PXA320 | 280 | select CPU_PXA320 |
281 | select PXA3xx | ||
282 | 282 | ||
283 | config MACH_COLIBRI_EVALBOARD | 283 | config MACH_COLIBRI_EVALBOARD |
284 | bool "Toradex Colibri Evaluation Carrier Board support" | 284 | bool "Toradex Colibri Evaluation Carrier Board support" |
@@ -286,8 +286,8 @@ config MACH_COLIBRI_EVALBOARD | |||
286 | 286 | ||
287 | config MACH_VPAC270 | 287 | config MACH_VPAC270 |
288 | bool "Voipac PXA270" | 288 | bool "Voipac PXA270" |
289 | select PXA27x | ||
290 | select HAVE_PATA_PLATFORM | 289 | select HAVE_PATA_PLATFORM |
290 | select PXA27x | ||
291 | help | 291 | help |
292 | PXA270 based Single Board Computer. | 292 | PXA270 based Single Board Computer. |
293 | 293 | ||
@@ -295,9 +295,9 @@ comment "End-user Products (sorted by vendor name)" | |||
295 | 295 | ||
296 | config MACH_H4700 | 296 | config MACH_H4700 |
297 | bool "HP iPAQ hx4700" | 297 | bool "HP iPAQ hx4700" |
298 | select PXA27x | ||
299 | select IWMMXT | ||
300 | select HAVE_PWM | 298 | select HAVE_PWM |
299 | select IWMMXT | ||
300 | select PXA27x | ||
301 | 301 | ||
302 | config MACH_H5000 | 302 | config MACH_H5000 |
303 | bool "HP iPAQ h5000" | 303 | bool "HP iPAQ h5000" |
@@ -309,16 +309,16 @@ config MACH_HIMALAYA | |||
309 | 309 | ||
310 | config MACH_MAGICIAN | 310 | config MACH_MAGICIAN |
311 | bool "Enable HTC Magician Support" | 311 | bool "Enable HTC Magician Support" |
312 | select PXA27x | ||
313 | select IWMMXT | ||
314 | select HAVE_PWM | 312 | select HAVE_PWM |
313 | select IWMMXT | ||
314 | select PXA27x | ||
315 | 315 | ||
316 | config MACH_MIOA701 | 316 | config MACH_MIOA701 |
317 | bool "Mitac Mio A701 Support" | 317 | bool "Mitac Mio A701 Support" |
318 | select PXA27x | ||
319 | select IWMMXT | ||
320 | select HAVE_PWM | ||
321 | select GPIO_SYSFS | 318 | select GPIO_SYSFS |
319 | select HAVE_PWM | ||
320 | select IWMMXT | ||
321 | select PXA27x | ||
322 | help | 322 | help |
323 | Say Y here if you intend to run this kernel on a | 323 | Say Y here if you intend to run this kernel on a |
324 | MIO A701. Currently there is only basic support | 324 | MIO A701. Currently there is only basic support |
@@ -326,9 +326,9 @@ config MACH_MIOA701 | |||
326 | 326 | ||
327 | config PXA_EZX | 327 | config PXA_EZX |
328 | bool "Motorola EZX Platform" | 328 | bool "Motorola EZX Platform" |
329 | select PXA27x | ||
330 | select IWMMXT | ||
331 | select HAVE_PWM | 329 | select HAVE_PWM |
330 | select IWMMXT | ||
331 | select PXA27x | ||
332 | 332 | ||
333 | config MACH_EZX_A780 | 333 | config MACH_EZX_A780 |
334 | bool "Motorola EZX A780" | 334 | bool "Motorola EZX A780" |
@@ -393,9 +393,9 @@ config MACH_PALMT5 | |||
393 | bool "Palm Tungsten|T5" | 393 | bool "Palm Tungsten|T5" |
394 | default y | 394 | default y |
395 | depends on ARCH_PXA_PALM | 395 | depends on ARCH_PXA_PALM |
396 | select PXA27x | ||
397 | select IWMMXT | 396 | select IWMMXT |
398 | select MACH_PALM27X | 397 | select MACH_PALM27X |
398 | select PXA27x | ||
399 | help | 399 | help |
400 | Say Y here if you intend to run this kernel on a Palm Tungsten|T5 | 400 | Say Y here if you intend to run this kernel on a Palm Tungsten|T5 |
401 | handheld computer. | 401 | handheld computer. |
@@ -404,9 +404,9 @@ config MACH_PALMTX | |||
404 | bool "Palm T|X" | 404 | bool "Palm T|X" |
405 | default y | 405 | default y |
406 | depends on ARCH_PXA_PALM | 406 | depends on ARCH_PXA_PALM |
407 | select PXA27x | ||
408 | select IWMMXT | 407 | select IWMMXT |
409 | select MACH_PALM27X | 408 | select MACH_PALM27X |
409 | select PXA27x | ||
410 | help | 410 | help |
411 | Say Y here if you intend to run this kernel on a Palm T|X | 411 | Say Y here if you intend to run this kernel on a Palm T|X |
412 | handheld computer. | 412 | handheld computer. |
@@ -415,9 +415,9 @@ config MACH_PALMZ72 | |||
415 | bool "Palm Zire 72" | 415 | bool "Palm Zire 72" |
416 | default y | 416 | default y |
417 | depends on ARCH_PXA_PALM | 417 | depends on ARCH_PXA_PALM |
418 | select PXA27x | ||
419 | select IWMMXT | 418 | select IWMMXT |
420 | select MACH_PALM27X | 419 | select MACH_PALM27X |
420 | select PXA27x | ||
421 | help | 421 | help |
422 | Say Y here if you intend to run this kernel on Palm Zire 72 | 422 | Say Y here if you intend to run this kernel on Palm Zire 72 |
423 | handheld computer. | 423 | handheld computer. |
@@ -426,9 +426,9 @@ config MACH_PALMLD | |||
426 | bool "Palm LifeDrive" | 426 | bool "Palm LifeDrive" |
427 | default y | 427 | default y |
428 | depends on ARCH_PXA_PALM | 428 | depends on ARCH_PXA_PALM |
429 | select PXA27x | ||
430 | select IWMMXT | 429 | select IWMMXT |
431 | select MACH_PALM27X | 430 | select MACH_PALM27X |
431 | select PXA27x | ||
432 | help | 432 | help |
433 | Say Y here if you intend to run this kernel on a Palm LifeDrive | 433 | Say Y here if you intend to run this kernel on a Palm LifeDrive |
434 | handheld computer. | 434 | handheld computer. |
@@ -441,10 +441,10 @@ config MACH_CENTRO | |||
441 | bool "Palm Centro 685 (GSM)" | 441 | bool "Palm Centro 685 (GSM)" |
442 | default y | 442 | default y |
443 | depends on ARCH_PXA_PALM | 443 | depends on ARCH_PXA_PALM |
444 | select MACH_PALM27X | ||
445 | select PXA27x | ||
446 | select IWMMXT | 444 | select IWMMXT |
445 | select MACH_PALM27X | ||
447 | select PALM_TREO | 446 | select PALM_TREO |
447 | select PXA27x | ||
448 | help | 448 | help |
449 | Say Y here if you intend to run this kernel on Palm Centro 685 (GSM) | 449 | Say Y here if you intend to run this kernel on Palm Centro 685 (GSM) |
450 | smartphone. | 450 | smartphone. |
@@ -453,37 +453,37 @@ config MACH_TREO680 | |||
453 | bool "Palm Treo 680" | 453 | bool "Palm Treo 680" |
454 | default y | 454 | default y |
455 | depends on ARCH_PXA_PALM | 455 | depends on ARCH_PXA_PALM |
456 | select MACH_PALM27X | ||
457 | select PXA27x | ||
458 | select IWMMXT | 456 | select IWMMXT |
457 | select MACH_PALM27X | ||
459 | select PALM_TREO | 458 | select PALM_TREO |
459 | select PXA27x | ||
460 | help | 460 | help |
461 | Say Y here if you intend to run this kernel on Palm Treo 680 | 461 | Say Y here if you intend to run this kernel on Palm Treo 680 |
462 | smartphone. | 462 | smartphone. |
463 | 463 | ||
464 | config MACH_RAUMFELD_RC | 464 | config MACH_RAUMFELD_RC |
465 | bool "Raumfeld Controller" | 465 | bool "Raumfeld Controller" |
466 | select PXA3xx | ||
467 | select CPU_PXA300 | 466 | select CPU_PXA300 |
468 | select POWER_SUPPLY | ||
469 | select HAVE_PWM | 467 | select HAVE_PWM |
468 | select POWER_SUPPLY | ||
469 | select PXA3xx | ||
470 | 470 | ||
471 | config MACH_RAUMFELD_CONNECTOR | 471 | config MACH_RAUMFELD_CONNECTOR |
472 | bool "Raumfeld Connector" | 472 | bool "Raumfeld Connector" |
473 | select CPU_PXA300 | ||
473 | select POWER_SUPPLY | 474 | select POWER_SUPPLY |
474 | select PXA3xx | 475 | select PXA3xx |
475 | select CPU_PXA300 | ||
476 | 476 | ||
477 | config MACH_RAUMFELD_SPEAKER | 477 | config MACH_RAUMFELD_SPEAKER |
478 | bool "Raumfeld Speaker" | 478 | bool "Raumfeld Speaker" |
479 | select CPU_PXA300 | ||
479 | select POWER_SUPPLY | 480 | select POWER_SUPPLY |
480 | select PXA3xx | 481 | select PXA3xx |
481 | select CPU_PXA300 | ||
482 | 482 | ||
483 | config PXA_SHARPSL | 483 | config PXA_SHARPSL |
484 | bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models" | 484 | bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models" |
485 | select SHARP_SCOOP | ||
486 | select SHARP_PARAM | 485 | select SHARP_PARAM |
486 | select SHARP_SCOOP | ||
487 | help | 487 | help |
488 | Say Y here if you intend to run this kernel on a | 488 | Say Y here if you intend to run this kernel on a |
489 | Sharp Zaurus SL-5600 (Poodle), SL-C700 (Corgi), | 489 | Sharp Zaurus SL-5600 (Poodle), SL-C700 (Corgi), |
@@ -526,11 +526,11 @@ config MACH_HUSKY | |||
526 | config MACH_AKITA | 526 | config MACH_AKITA |
527 | bool "Enable Sharp SL-1000 (Akita) Support" | 527 | bool "Enable Sharp SL-1000 (Akita) Support" |
528 | depends on PXA_SHARPSL | 528 | depends on PXA_SHARPSL |
529 | select PXA27x | ||
530 | select PXA_SHARP_Cxx00 | ||
531 | select MACH_SPITZ | ||
532 | select I2C | 529 | select I2C |
533 | select I2C_PXA | 530 | select I2C_PXA |
531 | select MACH_SPITZ | ||
532 | select PXA27x | ||
533 | select PXA_SHARP_Cxx00 | ||
534 | 534 | ||
535 | config MACH_SPITZ | 535 | config MACH_SPITZ |
536 | bool "Enable Sharp Zaurus SL-3000 (Spitz) Support" | 536 | bool "Enable Sharp Zaurus SL-3000 (Spitz) Support" |
@@ -575,8 +575,8 @@ config MACH_ICONTROL | |||
575 | 575 | ||
576 | config ARCH_PXA_ESERIES | 576 | config ARCH_PXA_ESERIES |
577 | bool "PXA based Toshiba e-series PDAs" | 577 | bool "PXA based Toshiba e-series PDAs" |
578 | select PXA25x | ||
579 | select FB_W100 | 578 | select FB_W100 |
579 | select PXA25x | ||
580 | 580 | ||
581 | config MACH_E330 | 581 | config MACH_E330 |
582 | bool "Toshiba e330" | 582 | bool "Toshiba e330" |
@@ -628,8 +628,8 @@ config MACH_E800 | |||
628 | 628 | ||
629 | config MACH_ZIPIT2 | 629 | config MACH_ZIPIT2 |
630 | bool "Zipit Z2 Handheld" | 630 | bool "Zipit Z2 Handheld" |
631 | select PXA27x | ||
632 | select HAVE_PWM | 631 | select HAVE_PWM |
632 | select PXA27x | ||
633 | endif | 633 | endif |
634 | endmenu | 634 | endmenu |
635 | 635 | ||
@@ -720,9 +720,9 @@ config SHARPSL_PM | |||
720 | config SHARPSL_PM_MAX1111 | 720 | config SHARPSL_PM_MAX1111 |
721 | bool | 721 | bool |
722 | select HWMON | 722 | select HWMON |
723 | select SENSORS_MAX1111 | ||
723 | select SPI | 724 | select SPI |
724 | select SPI_MASTER | 725 | select SPI_MASTER |
725 | select SENSORS_MAX1111 | ||
726 | 726 | ||
727 | config PXA_HAVE_ISA_IRQS | 727 | config PXA_HAVE_ISA_IRQS |
728 | bool | 728 | bool |
diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig index c593be428b8f..14c1d47e1abf 100644 --- a/arch/arm/mach-realview/Kconfig +++ b/arch/arm/mach-realview/Kconfig | |||
@@ -21,8 +21,8 @@ config REALVIEW_EB_A9MP | |||
21 | config REALVIEW_EB_ARM11MP | 21 | config REALVIEW_EB_ARM11MP |
22 | bool "Support ARM11MPCore Tile" | 22 | bool "Support ARM11MPCore Tile" |
23 | depends on MACH_REALVIEW_EB | 23 | depends on MACH_REALVIEW_EB |
24 | select CPU_V6K | ||
25 | select ARCH_HAS_BARRIERS if SMP | 24 | select ARCH_HAS_BARRIERS if SMP |
25 | select CPU_V6K | ||
26 | select HAVE_SMP | 26 | select HAVE_SMP |
27 | select MIGHT_HAVE_CACHE_L2X0 | 27 | select MIGHT_HAVE_CACHE_L2X0 |
28 | help | 28 | help |
@@ -40,12 +40,12 @@ config REALVIEW_EB_ARM11MP_REVB | |||
40 | 40 | ||
41 | config MACH_REALVIEW_PB11MP | 41 | config MACH_REALVIEW_PB11MP |
42 | bool "Support RealView(R) Platform Baseboard for ARM11MPCore" | 42 | bool "Support RealView(R) Platform Baseboard for ARM11MPCore" |
43 | select CPU_V6K | 43 | select ARCH_HAS_BARRIERS if SMP |
44 | select ARM_GIC | 44 | select ARM_GIC |
45 | select CPU_V6K | ||
45 | select HAVE_PATA_PLATFORM | 46 | select HAVE_PATA_PLATFORM |
46 | select HAVE_SMP | 47 | select HAVE_SMP |
47 | select MIGHT_HAVE_CACHE_L2X0 | 48 | select MIGHT_HAVE_CACHE_L2X0 |
48 | select ARCH_HAS_BARRIERS if SMP | ||
49 | help | 49 | help |
50 | Include support for the ARM(R) RealView(R) Platform Baseboard for | 50 | Include support for the ARM(R) RealView(R) Platform Baseboard for |
51 | the ARM11MPCore. This platform has an on-board ARM11MPCore and has | 51 | the ARM11MPCore. This platform has an on-board ARM11MPCore and has |
@@ -54,8 +54,8 @@ config MACH_REALVIEW_PB11MP | |||
54 | # ARMv6 CPU without K extensions, but does have the new exclusive ops | 54 | # ARMv6 CPU without K extensions, but does have the new exclusive ops |
55 | config MACH_REALVIEW_PB1176 | 55 | config MACH_REALVIEW_PB1176 |
56 | bool "Support RealView(R) Platform Baseboard for ARM1176JZF-S" | 56 | bool "Support RealView(R) Platform Baseboard for ARM1176JZF-S" |
57 | select CPU_V6 | ||
58 | select ARM_GIC | 57 | select ARM_GIC |
58 | select CPU_V6 | ||
59 | select HAVE_TCM | 59 | select HAVE_TCM |
60 | select MIGHT_HAVE_CACHE_L2X0 | 60 | select MIGHT_HAVE_CACHE_L2X0 |
61 | help | 61 | help |
@@ -73,8 +73,8 @@ config REALVIEW_PB1176_SECURE_FLASH | |||
73 | 73 | ||
74 | config MACH_REALVIEW_PBA8 | 74 | config MACH_REALVIEW_PBA8 |
75 | bool "Support RealView(R) Platform Baseboard for Cortex(tm)-A8 platform" | 75 | bool "Support RealView(R) Platform Baseboard for Cortex(tm)-A8 platform" |
76 | select CPU_V7 | ||
77 | select ARM_GIC | 76 | select ARM_GIC |
77 | select CPU_V7 | ||
78 | select HAVE_PATA_PLATFORM | 78 | select HAVE_PATA_PLATFORM |
79 | help | 79 | help |
80 | Include support for the ARM(R) RealView Platform Baseboard for | 80 | Include support for the ARM(R) RealView Platform Baseboard for |
@@ -83,11 +83,11 @@ config MACH_REALVIEW_PBA8 | |||
83 | 83 | ||
84 | config MACH_REALVIEW_PBX | 84 | config MACH_REALVIEW_PBX |
85 | bool "Support RealView(R) Platform Baseboard Explore" | 85 | bool "Support RealView(R) Platform Baseboard Explore" |
86 | select ARCH_SPARSEMEM_ENABLE if CPU_V7 && !REALVIEW_HIGH_PHYS_OFFSET | ||
86 | select ARM_GIC | 87 | select ARM_GIC |
87 | select HAVE_PATA_PLATFORM | 88 | select HAVE_PATA_PLATFORM |
88 | select HAVE_SMP | 89 | select HAVE_SMP |
89 | select MIGHT_HAVE_CACHE_L2X0 | 90 | select MIGHT_HAVE_CACHE_L2X0 |
90 | select ARCH_SPARSEMEM_ENABLE if CPU_V7 && !REALVIEW_HIGH_PHYS_OFFSET | ||
91 | select ZONE_DMA if SPARSEMEM | 91 | select ZONE_DMA if SPARSEMEM |
92 | help | 92 | help |
93 | Include support for the ARM(R) RealView(R) Platform Baseboard | 93 | Include support for the ARM(R) RealView(R) Platform Baseboard |
diff --git a/arch/arm/mach-s3c2412/Kconfig b/arch/arm/mach-s3c2412/Kconfig index c5256f4e90bb..495f6928cbaa 100644 --- a/arch/arm/mach-s3c2412/Kconfig +++ b/arch/arm/mach-s3c2412/Kconfig | |||
@@ -7,7 +7,7 @@ | |||
7 | config S3C2412_CPUFREQ | 7 | config S3C2412_CPUFREQ |
8 | bool | 8 | bool |
9 | depends on CPU_FREQ_S3C24XX && CPU_S3C2412 | 9 | depends on CPU_FREQ_S3C24XX && CPU_S3C2412 |
10 | select S3C2412_IOTIMING | ||
11 | default y | 10 | default y |
11 | select S3C2412_IOTIMING | ||
12 | help | 12 | help |
13 | CPU Frequency scaling support for S3C2412 and S3C2413 SoC CPUs. | 13 | CPU Frequency scaling support for S3C2412 and S3C2413 SoC CPUs. |
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig index ece7a10fe3c6..a4d7fd27bec5 100644 --- a/arch/arm/mach-s3c2440/Kconfig +++ b/arch/arm/mach-s3c2440/Kconfig | |||
@@ -5,8 +5,8 @@ | |||
5 | config S3C2440_CPUFREQ | 5 | config S3C2440_CPUFREQ |
6 | bool "S3C2440/S3C2442 CPU Frequency scaling support" | 6 | bool "S3C2440/S3C2442 CPU Frequency scaling support" |
7 | depends on CPU_FREQ_S3C24XX && (CPU_S3C2440 || CPU_S3C2442) | 7 | depends on CPU_FREQ_S3C24XX && (CPU_S3C2440 || CPU_S3C2442) |
8 | select S3C2410_CPUFREQ_UTILS | ||
9 | default y | 8 | default y |
9 | select S3C2410_CPUFREQ_UTILS | ||
10 | help | 10 | help |
11 | CPU Frequency scaling support for S3C2440 and S3C2442 SoC CPUs. | 11 | CPU Frequency scaling support for S3C2440 and S3C2442 SoC CPUs. |
12 | 12 | ||
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig index d56b0f7f2b20..2b6cb5f29c2d 100644 --- a/arch/arm/mach-s3c24xx/Kconfig +++ b/arch/arm/mach-s3c24xx/Kconfig | |||
@@ -17,10 +17,10 @@ config CPU_S3C2410 | |||
17 | bool "SAMSUNG S3C2410" | 17 | bool "SAMSUNG S3C2410" |
18 | default y | 18 | default y |
19 | select CPU_ARM920T | 19 | select CPU_ARM920T |
20 | select S3C2410_CLOCK | ||
21 | select CPU_LLSERIAL_S3C2410 | 20 | select CPU_LLSERIAL_S3C2410 |
22 | select S3C2410_PM if PM | 21 | select S3C2410_CLOCK |
23 | select S3C2410_CPUFREQ if CPU_FREQ_S3C24XX | 22 | select S3C2410_CPUFREQ if CPU_FREQ_S3C24XX |
23 | select S3C2410_PM if PM | ||
24 | help | 24 | help |
25 | Support for S3C2410 and S3C2410A family from the S3C24XX line | 25 | Support for S3C2410 and S3C2410A family from the S3C24XX line |
26 | of Samsung Mobile CPUs. | 26 | of Samsung Mobile CPUs. |
@@ -30,8 +30,8 @@ config CPU_S3C2412 | |||
30 | depends on ARCH_S3C24XX | 30 | depends on ARCH_S3C24XX |
31 | select CPU_ARM926T | 31 | select CPU_ARM926T |
32 | select CPU_LLSERIAL_S3C2440 | 32 | select CPU_LLSERIAL_S3C2440 |
33 | select S3C2412_PM if PM | ||
34 | select S3C2412_DMA if S3C24XX_DMA | 33 | select S3C2412_DMA if S3C24XX_DMA |
34 | select S3C2412_PM if PM | ||
35 | help | 35 | help |
36 | Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line | 36 | Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line |
37 | 37 | ||
@@ -40,10 +40,10 @@ config CPU_S3C2416 | |||
40 | depends on ARCH_S3C24XX | 40 | depends on ARCH_S3C24XX |
41 | select CPU_ARM926T | 41 | select CPU_ARM926T |
42 | select CPU_LLSERIAL_S3C2440 | 42 | select CPU_LLSERIAL_S3C2440 |
43 | select SAMSUNG_CLKSRC | 43 | select S3C2416_PM if PM |
44 | select S3C2443_COMMON | 44 | select S3C2443_COMMON |
45 | select S3C2443_DMA if S3C24XX_DMA | 45 | select S3C2443_DMA if S3C24XX_DMA |
46 | select S3C2416_PM if PM | 46 | select SAMSUNG_CLKSRC |
47 | help | 47 | help |
48 | Support for the S3C2416 SoC from the S3C24XX line | 48 | Support for the S3C2416 SoC from the S3C24XX line |
49 | 49 | ||
@@ -75,9 +75,9 @@ config CPU_S3C2443 | |||
75 | depends on ARCH_S3C24XX | 75 | depends on ARCH_S3C24XX |
76 | select CPU_ARM920T | 76 | select CPU_ARM920T |
77 | select CPU_LLSERIAL_S3C2440 | 77 | select CPU_LLSERIAL_S3C2440 |
78 | select SAMSUNG_CLKSRC | ||
79 | select S3C2443_COMMON | 78 | select S3C2443_COMMON |
80 | select S3C2443_DMA if S3C24XX_DMA | 79 | select S3C2443_DMA if S3C24XX_DMA |
80 | select SAMSUNG_CLKSRC | ||
81 | help | 81 | help |
82 | Support for the S3C2443 SoC from the S3C24XX line | 82 | Support for the S3C2443 SoC from the S3C24XX line |
83 | 83 | ||
@@ -156,16 +156,16 @@ config MACH_AML_M5900 | |||
156 | 156 | ||
157 | config ARCH_BAST | 157 | config ARCH_BAST |
158 | bool "Simtec Electronics BAST (EB2410ITX)" | 158 | bool "Simtec Electronics BAST (EB2410ITX)" |
159 | select ISA | ||
160 | select MACH_BAST_IDE | ||
159 | select S3C2410_IOTIMING if S3C2410_CPUFREQ | 161 | select S3C2410_IOTIMING if S3C2410_CPUFREQ |
160 | select S3C24XX_SIMTEC_PM if PM | 162 | select S3C24XX_DCLK |
161 | select S3C24XX_SIMTEC_NOR | 163 | select S3C24XX_SIMTEC_NOR |
164 | select S3C24XX_SIMTEC_PM if PM | ||
162 | select S3C24XX_SIMTEC_USB | 165 | select S3C24XX_SIMTEC_USB |
163 | select MACH_BAST_IDE | ||
164 | select S3C24XX_DCLK | ||
165 | select ISA | ||
166 | select S3C_DEV_HWMON | 166 | select S3C_DEV_HWMON |
167 | select S3C_DEV_USB_HOST | ||
168 | select S3C_DEV_NAND | 167 | select S3C_DEV_NAND |
168 | select S3C_DEV_USB_HOST | ||
169 | help | 169 | help |
170 | Say Y here if you are using the Simtec Electronics EB2410ITX | 170 | Say Y here if you are using the Simtec Electronics EB2410ITX |
171 | development board (also known as BAST) | 171 | development board (also known as BAST) |
@@ -181,9 +181,9 @@ config BAST_PC104_IRQ | |||
181 | config ARCH_H1940 | 181 | config ARCH_H1940 |
182 | bool "IPAQ H1940" | 182 | bool "IPAQ H1940" |
183 | select PM_H1940 if PM | 183 | select PM_H1940 if PM |
184 | select S3C_DEV_USB_HOST | ||
185 | select S3C_DEV_NAND | ||
186 | select S3C24XX_SETUP_TS | 184 | select S3C24XX_SETUP_TS |
185 | select S3C_DEV_NAND | ||
186 | select S3C_DEV_USB_HOST | ||
187 | help | 187 | help |
188 | Say Y here if you are using the HP IPAQ H1940 | 188 | Say Y here if you are using the HP IPAQ H1940 |
189 | 189 | ||
@@ -203,23 +203,23 @@ config PM_H1940 | |||
203 | config MACH_N30 | 203 | config MACH_N30 |
204 | bool "Acer N30 family" | 204 | bool "Acer N30 family" |
205 | select MACH_N35 | 205 | select MACH_N35 |
206 | select S3C_DEV_USB_HOST | ||
207 | select S3C_DEV_NAND | 206 | select S3C_DEV_NAND |
207 | select S3C_DEV_USB_HOST | ||
208 | help | 208 | help |
209 | Say Y here if you want suppt for the Acer N30, Acer N35, | 209 | Say Y here if you want suppt for the Acer N30, Acer N35, |
210 | Navman PiN570, Yakumo AlphaX or Airis NC05 PDAs. | 210 | Navman PiN570, Yakumo AlphaX or Airis NC05 PDAs. |
211 | 211 | ||
212 | config MACH_OTOM | 212 | config MACH_OTOM |
213 | bool "NexVision OTOM Board" | 213 | bool "NexVision OTOM Board" |
214 | select S3C_DEV_USB_HOST | ||
215 | select S3C_DEV_NAND | 214 | select S3C_DEV_NAND |
215 | select S3C_DEV_USB_HOST | ||
216 | help | 216 | help |
217 | Say Y here if you are using the Nex Vision OTOM board | 217 | Say Y here if you are using the Nex Vision OTOM board |
218 | 218 | ||
219 | config MACH_QT2410 | 219 | config MACH_QT2410 |
220 | bool "QT2410" | 220 | bool "QT2410" |
221 | select S3C_DEV_USB_HOST | ||
222 | select S3C_DEV_NAND | 221 | select S3C_DEV_NAND |
222 | select S3C_DEV_USB_HOST | ||
223 | help | 223 | help |
224 | Say Y here if you are using the Armzone QT2410 | 224 | Say Y here if you are using the Armzone QT2410 |
225 | 225 | ||
@@ -239,12 +239,12 @@ config MACH_TCT_HAMMER | |||
239 | 239 | ||
240 | config MACH_VR1000 | 240 | config MACH_VR1000 |
241 | bool "Thorcom VR1000" | 241 | bool "Thorcom VR1000" |
242 | select S3C24XX_SIMTEC_PM if PM | 242 | select MACH_BAST_IDE |
243 | select S3C24XX_DCLK | 243 | select S3C24XX_DCLK |
244 | select S3C24XX_SIMTEC_NOR | 244 | select S3C24XX_SIMTEC_NOR |
245 | select MACH_BAST_IDE | 245 | select S3C24XX_SIMTEC_PM if PM |
246 | select S3C_DEV_USB_HOST | ||
247 | select S3C24XX_SIMTEC_USB | 246 | select S3C24XX_SIMTEC_USB |
247 | select S3C_DEV_USB_HOST | ||
248 | help | 248 | help |
249 | Say Y here if you are using the Thorcom VR1000 board. | 249 | Say Y here if you are using the Thorcom VR1000 board. |
250 | 250 | ||
@@ -285,8 +285,8 @@ comment "S3C2412 Boards" | |||
285 | 285 | ||
286 | config MACH_JIVE | 286 | config MACH_JIVE |
287 | bool "Logitech Jive" | 287 | bool "Logitech Jive" |
288 | select S3C_DEV_USB_HOST | ||
289 | select S3C_DEV_NAND | 288 | select S3C_DEV_NAND |
289 | select S3C_DEV_USB_HOST | ||
290 | help | 290 | help |
291 | Say Y here if you are using the Logitech Jive. | 291 | Say Y here if you are using the Logitech Jive. |
292 | 292 | ||
@@ -314,15 +314,15 @@ config MACH_SMDK2413 | |||
314 | bool "SMDK2413" | 314 | bool "SMDK2413" |
315 | select MACH_S3C2413 | 315 | select MACH_S3C2413 |
316 | select S3C24XX_SMDK | 316 | select S3C24XX_SMDK |
317 | select S3C_DEV_USB_HOST | ||
318 | select S3C_DEV_NAND | 317 | select S3C_DEV_NAND |
318 | select S3C_DEV_USB_HOST | ||
319 | help | 319 | help |
320 | Say Y here if you are using an SMDK2413 | 320 | Say Y here if you are using an SMDK2413 |
321 | 321 | ||
322 | config MACH_VSTMS | 322 | config MACH_VSTMS |
323 | bool "VMSTMS" | 323 | bool "VMSTMS" |
324 | select S3C_DEV_USB_HOST | ||
325 | select S3C_DEV_NAND | 324 | select S3C_DEV_NAND |
325 | select S3C_DEV_USB_HOST | ||
326 | help | 326 | help |
327 | Say Y here if you are using an VSTMS board | 327 | Say Y here if you are using an VSTMS board |
328 | 328 | ||
@@ -351,13 +351,13 @@ comment "S3C2416 Boards" | |||
351 | 351 | ||
352 | config MACH_SMDK2416 | 352 | config MACH_SMDK2416 |
353 | bool "SMDK2416" | 353 | bool "SMDK2416" |
354 | select S3C2416_SETUP_SDHCI | ||
354 | select S3C24XX_SMDK | 355 | select S3C24XX_SMDK |
355 | select S3C_DEV_FB | 356 | select S3C_DEV_FB |
356 | select S3C_DEV_HSMMC | 357 | select S3C_DEV_HSMMC |
357 | select S3C_DEV_HSMMC1 | 358 | select S3C_DEV_HSMMC1 |
358 | select S3C_DEV_NAND | 359 | select S3C_DEV_NAND |
359 | select S3C_DEV_USB_HOST | 360 | select S3C_DEV_USB_HOST |
360 | select S3C2416_SETUP_SDHCI | ||
361 | help | 361 | help |
362 | Say Y here if you are using an SMDK2416 | 362 | Say Y here if you are using an SMDK2416 |
363 | 363 | ||
@@ -379,11 +379,11 @@ comment "S3C2440 Boards" | |||
379 | 379 | ||
380 | config MACH_ANUBIS | 380 | config MACH_ANUBIS |
381 | bool "Simtec Electronics ANUBIS" | 381 | bool "Simtec Electronics ANUBIS" |
382 | select S3C24XX_DCLK | ||
383 | select S3C24XX_SIMTEC_PM if PM | ||
384 | select HAVE_PATA_PLATFORM | 382 | select HAVE_PATA_PLATFORM |
385 | select S3C24XX_GPIO_EXTRA64 | ||
386 | select S3C2440_XTAL_12000000 | 383 | select S3C2440_XTAL_12000000 |
384 | select S3C24XX_DCLK | ||
385 | select S3C24XX_GPIO_EXTRA64 | ||
386 | select S3C24XX_SIMTEC_PM if PM | ||
387 | select S3C_DEV_USB_HOST | 387 | select S3C_DEV_USB_HOST |
388 | help | 388 | help |
389 | Say Y here if you are using the Simtec Electronics ANUBIS | 389 | Say Y here if you are using the Simtec Electronics ANUBIS |
@@ -391,18 +391,18 @@ config MACH_ANUBIS | |||
391 | 391 | ||
392 | config MACH_AT2440EVB | 392 | config MACH_AT2440EVB |
393 | bool "Avantech AT2440EVB development board" | 393 | bool "Avantech AT2440EVB development board" |
394 | select S3C_DEV_USB_HOST | ||
395 | select S3C_DEV_NAND | 394 | select S3C_DEV_NAND |
395 | select S3C_DEV_USB_HOST | ||
396 | help | 396 | help |
397 | Say Y here if you are using the AT2440EVB development board | 397 | Say Y here if you are using the AT2440EVB development board |
398 | 398 | ||
399 | config MACH_MINI2440 | 399 | config MACH_MINI2440 |
400 | bool "MINI2440 development board" | 400 | bool "MINI2440 development board" |
401 | select EEPROM_AT24 | 401 | select EEPROM_AT24 |
402 | select NEW_LEDS | ||
403 | select LEDS_CLASS | 402 | select LEDS_CLASS |
404 | select LEDS_TRIGGER | 403 | select LEDS_TRIGGER |
405 | select LEDS_TRIGGER_BACKLIGHT | 404 | select LEDS_TRIGGER_BACKLIGHT |
405 | select NEW_LEDS | ||
406 | select S3C_DEV_NAND | 406 | select S3C_DEV_NAND |
407 | select S3C_DEV_USB_HOST | 407 | select S3C_DEV_USB_HOST |
408 | help | 408 | help |
@@ -412,20 +412,20 @@ config MACH_MINI2440 | |||
412 | config MACH_NEXCODER_2440 | 412 | config MACH_NEXCODER_2440 |
413 | bool "NexVision NEXCODER 2440 Light Board" | 413 | bool "NexVision NEXCODER 2440 Light Board" |
414 | select S3C2440_XTAL_12000000 | 414 | select S3C2440_XTAL_12000000 |
415 | select S3C_DEV_USB_HOST | ||
416 | select S3C_DEV_NAND | 415 | select S3C_DEV_NAND |
416 | select S3C_DEV_USB_HOST | ||
417 | help | 417 | help |
418 | Say Y here if you are using the Nex Vision NEXCODER 2440 Light Board | 418 | Say Y here if you are using the Nex Vision NEXCODER 2440 Light Board |
419 | 419 | ||
420 | config MACH_OSIRIS | 420 | config MACH_OSIRIS |
421 | bool "Simtec IM2440D20 (OSIRIS) module" | 421 | bool "Simtec IM2440D20 (OSIRIS) module" |
422 | select S3C2410_IOTIMING if S3C2440_CPUFREQ | ||
423 | select S3C2440_XTAL_12000000 | ||
422 | select S3C24XX_DCLK | 424 | select S3C24XX_DCLK |
423 | select S3C24XX_SIMTEC_PM if PM | ||
424 | select S3C24XX_GPIO_EXTRA128 | 425 | select S3C24XX_GPIO_EXTRA128 |
425 | select S3C2440_XTAL_12000000 | 426 | select S3C24XX_SIMTEC_PM if PM |
426 | select S3C2410_IOTIMING if S3C2440_CPUFREQ | ||
427 | select S3C_DEV_USB_HOST | ||
428 | select S3C_DEV_NAND | 427 | select S3C_DEV_NAND |
428 | select S3C_DEV_USB_HOST | ||
429 | help | 429 | help |
430 | Say Y here if you are using the Simtec IM2440D20 module, also | 430 | Say Y here if you are using the Simtec IM2440D20 module, also |
431 | known as the Osiris. | 431 | known as the Osiris. |
@@ -445,8 +445,8 @@ config MACH_OSIRIS_DVS | |||
445 | 445 | ||
446 | config MACH_RX3715 | 446 | config MACH_RX3715 |
447 | bool "HP iPAQ rx3715" | 447 | bool "HP iPAQ rx3715" |
448 | select S3C2440_XTAL_16934400 | ||
449 | select PM_H1940 if PM | 448 | select PM_H1940 if PM |
449 | select S3C2440_XTAL_16934400 | ||
450 | select S3C_DEV_NAND | 450 | select S3C_DEV_NAND |
451 | help | 451 | help |
452 | Say Y here if you are using the HP iPAQ rx3715. | 452 | Say Y here if you are using the HP iPAQ rx3715. |
@@ -455,8 +455,8 @@ config ARCH_S3C2440 | |||
455 | bool "SMDK2440" | 455 | bool "SMDK2440" |
456 | select S3C2440_XTAL_16934400 | 456 | select S3C2440_XTAL_16934400 |
457 | select S3C24XX_SMDK | 457 | select S3C24XX_SMDK |
458 | select S3C_DEV_USB_HOST | ||
459 | select S3C_DEV_NAND | 458 | select S3C_DEV_NAND |
459 | select S3C_DEV_USB_HOST | ||
460 | help | 460 | help |
461 | Say Y here if you are using the SMDK2440. | 461 | Say Y here if you are using the SMDK2440. |
462 | 462 | ||
@@ -478,11 +478,11 @@ comment "S3C2442 Boards" | |||
478 | 478 | ||
479 | config MACH_NEO1973_GTA02 | 479 | config MACH_NEO1973_GTA02 |
480 | bool "Openmoko GTA02 / Freerunner phone" | 480 | bool "Openmoko GTA02 / Freerunner phone" |
481 | select I2C | ||
482 | select MACH_NEO1973 | ||
481 | select MFD_PCF50633 | 483 | select MFD_PCF50633 |
482 | select PCF50633_GPIO | 484 | select PCF50633_GPIO |
483 | select I2C | ||
484 | select POWER_SUPPLY | 485 | select POWER_SUPPLY |
485 | select MACH_NEO1973 | ||
486 | select S3C24XX_PWM | 486 | select S3C24XX_PWM |
487 | select S3C_DEV_USB_HOST | 487 | select S3C_DEV_USB_HOST |
488 | help | 488 | help |
@@ -490,13 +490,13 @@ config MACH_NEO1973_GTA02 | |||
490 | 490 | ||
491 | config MACH_RX1950 | 491 | config MACH_RX1950 |
492 | bool "HP iPAQ rx1950" | 492 | bool "HP iPAQ rx1950" |
493 | select S3C24XX_DCLK | ||
494 | select PM_H1940 if PM | ||
495 | select I2C | 493 | select I2C |
496 | select S3C24XX_PWM | 494 | select PM_H1940 if PM |
497 | select S3C_DEV_NAND | ||
498 | select S3C2410_IOTIMING if S3C2440_CPUFREQ | 495 | select S3C2410_IOTIMING if S3C2440_CPUFREQ |
499 | select S3C2440_XTAL_16934400 | 496 | select S3C2440_XTAL_16934400 |
497 | select S3C24XX_DCLK | ||
498 | select S3C24XX_PWM | ||
499 | select S3C_DEV_NAND | ||
500 | help | 500 | help |
501 | Say Y here if you're using HP iPAQ rx1950 | 501 | Say Y here if you're using HP iPAQ rx1950 |
502 | 502 | ||
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig index 06ca1cd4cae2..63e7ae3ee9e6 100644 --- a/arch/arm/mach-s3c64xx/Kconfig +++ b/arch/arm/mach-s3c64xx/Kconfig | |||
@@ -7,9 +7,9 @@ | |||
7 | config PLAT_S3C64XX | 7 | config PLAT_S3C64XX |
8 | bool | 8 | bool |
9 | depends on ARCH_S3C64XX | 9 | depends on ARCH_S3C64XX |
10 | select SAMSUNG_WAKEMASK | ||
11 | select PM_GENERIC_DOMAINS | ||
12 | default y | 10 | default y |
11 | select PM_GENERIC_DOMAINS | ||
12 | select SAMSUNG_WAKEMASK | ||
13 | help | 13 | help |
14 | Base platform code for any Samsung S3C64XX device | 14 | Base platform code for any Samsung S3C64XX device |
15 | 15 | ||
@@ -31,8 +31,8 @@ config S3C64XX_DMA | |||
31 | select S3C_DMA | 31 | select S3C_DMA |
32 | 32 | ||
33 | config S3C64XX_SETUP_SDHCI | 33 | config S3C64XX_SETUP_SDHCI |
34 | select S3C64XX_SETUP_SDHCI_GPIO | ||
35 | bool | 34 | bool |
35 | select S3C64XX_SETUP_SDHCI_GPIO | ||
36 | help | 36 | help |
37 | Internal configuration for default SDHCI setup for S3C6400 and | 37 | Internal configuration for default SDHCI setup for S3C6400 and |
38 | S3C6410 SoCs. | 38 | S3C6410 SoCs. |
@@ -93,9 +93,9 @@ config S3C64XX_SETUP_USB_PHY | |||
93 | config MACH_SMDK6400 | 93 | config MACH_SMDK6400 |
94 | bool "SMDK6400" | 94 | bool "SMDK6400" |
95 | select CPU_S3C6400 | 95 | select CPU_S3C6400 |
96 | select S3C64XX_SETUP_SDHCI | ||
96 | select S3C_DEV_HSMMC | 97 | select S3C_DEV_HSMMC |
97 | select S3C_DEV_NAND | 98 | select S3C_DEV_NAND |
98 | select S3C64XX_SETUP_SDHCI | ||
99 | help | 99 | help |
100 | Machine support for the Samsung SMDK6400 | 100 | Machine support for the Samsung SMDK6400 |
101 | 101 | ||
@@ -104,21 +104,21 @@ config MACH_SMDK6400 | |||
104 | config MACH_ANW6410 | 104 | config MACH_ANW6410 |
105 | bool "A&W6410" | 105 | bool "A&W6410" |
106 | select CPU_S3C6410 | 106 | select CPU_S3C6410 |
107 | select S3C_DEV_FB | ||
108 | select S3C64XX_SETUP_FB_24BPP | 107 | select S3C64XX_SETUP_FB_24BPP |
108 | select S3C_DEV_FB | ||
109 | help | 109 | help |
110 | Machine support for the A&W6410 | 110 | Machine support for the A&W6410 |
111 | 111 | ||
112 | config MACH_MINI6410 | 112 | config MACH_MINI6410 |
113 | bool "MINI6410" | 113 | bool "MINI6410" |
114 | select CPU_S3C6410 | 114 | select CPU_S3C6410 |
115 | select S3C64XX_SETUP_FB_24BPP | ||
116 | select S3C64XX_SETUP_SDHCI | ||
117 | select S3C_DEV_FB | ||
115 | select S3C_DEV_HSMMC | 118 | select S3C_DEV_HSMMC |
116 | select S3C_DEV_HSMMC1 | 119 | select S3C_DEV_HSMMC1 |
117 | select S3C64XX_SETUP_SDHCI | ||
118 | select S3C_DEV_USB_HOST | ||
119 | select S3C_DEV_NAND | 120 | select S3C_DEV_NAND |
120 | select S3C_DEV_FB | 121 | select S3C_DEV_USB_HOST |
121 | select S3C64XX_SETUP_FB_24BPP | ||
122 | select SAMSUNG_DEV_ADC | 122 | select SAMSUNG_DEV_ADC |
123 | select SAMSUNG_DEV_TS | 123 | select SAMSUNG_DEV_TS |
124 | help | 124 | help |
@@ -127,42 +127,42 @@ config MACH_MINI6410 | |||
127 | config MACH_REAL6410 | 127 | config MACH_REAL6410 |
128 | bool "REAL6410" | 128 | bool "REAL6410" |
129 | select CPU_S3C6410 | 129 | select CPU_S3C6410 |
130 | select S3C_DEV_HSMMC | 130 | select S3C64XX_SETUP_FB_24BPP |
131 | select S3C_DEV_HSMMC1 | ||
132 | select S3C64XX_SETUP_SDHCI | 131 | select S3C64XX_SETUP_SDHCI |
133 | select S3C_DEV_FB | 132 | select S3C_DEV_FB |
134 | select S3C64XX_SETUP_FB_24BPP | 133 | select S3C_DEV_HSMMC |
134 | select S3C_DEV_HSMMC1 | ||
135 | select S3C_DEV_NAND | 135 | select S3C_DEV_NAND |
136 | select S3C_DEV_USB_HOST | ||
136 | select SAMSUNG_DEV_ADC | 137 | select SAMSUNG_DEV_ADC |
137 | select SAMSUNG_DEV_TS | 138 | select SAMSUNG_DEV_TS |
138 | select S3C_DEV_USB_HOST | ||
139 | help | 139 | help |
140 | Machine support for the CoreWind REAL6410 | 140 | Machine support for the CoreWind REAL6410 |
141 | 141 | ||
142 | config MACH_SMDK6410 | 142 | config MACH_SMDK6410 |
143 | bool "SMDK6410" | 143 | bool "SMDK6410" |
144 | select CPU_S3C6410 | 144 | select CPU_S3C6410 |
145 | select SAMSUNG_DEV_ADC | 145 | select HAVE_S3C2410_WATCHDOG if WATCHDOG |
146 | select S3C64XX_SETUP_FB_24BPP | ||
147 | select S3C64XX_SETUP_I2C1 | ||
148 | select S3C64XX_SETUP_IDE | ||
149 | select S3C64XX_SETUP_KEYPAD | ||
150 | select S3C64XX_SETUP_SDHCI | ||
151 | select S3C64XX_SETUP_USB_PHY | ||
152 | select S3C_DEV_FB | ||
146 | select S3C_DEV_HSMMC | 153 | select S3C_DEV_HSMMC |
147 | select S3C_DEV_HSMMC1 | 154 | select S3C_DEV_HSMMC1 |
148 | select S3C_DEV_I2C1 | 155 | select S3C_DEV_I2C1 |
149 | select SAMSUNG_DEV_IDE | ||
150 | select S3C_DEV_FB | ||
151 | select S3C_DEV_RTC | 156 | select S3C_DEV_RTC |
152 | select SAMSUNG_DEV_TS | ||
153 | select S3C_DEV_USB_HOST | 157 | select S3C_DEV_USB_HOST |
154 | select S3C_DEV_USB_HSOTG | 158 | select S3C_DEV_USB_HSOTG |
155 | select S3C_DEV_WDT | 159 | select S3C_DEV_WDT |
160 | select SAMSUNG_DEV_ADC | ||
156 | select SAMSUNG_DEV_BACKLIGHT | 161 | select SAMSUNG_DEV_BACKLIGHT |
162 | select SAMSUNG_DEV_IDE | ||
157 | select SAMSUNG_DEV_KEYPAD | 163 | select SAMSUNG_DEV_KEYPAD |
158 | select SAMSUNG_DEV_PWM | 164 | select SAMSUNG_DEV_PWM |
159 | select HAVE_S3C2410_WATCHDOG if WATCHDOG | 165 | select SAMSUNG_DEV_TS |
160 | select S3C64XX_SETUP_SDHCI | ||
161 | select S3C64XX_SETUP_I2C1 | ||
162 | select S3C64XX_SETUP_IDE | ||
163 | select S3C64XX_SETUP_FB_24BPP | ||
164 | select S3C64XX_SETUP_KEYPAD | ||
165 | select S3C64XX_SETUP_USB_PHY | ||
166 | help | 166 | help |
167 | Machine support for the Samsung SMDK6410 | 167 | Machine support for the Samsung SMDK6410 |
168 | 168 | ||
@@ -198,13 +198,13 @@ endchoice | |||
198 | config SMDK6410_WM1190_EV1 | 198 | config SMDK6410_WM1190_EV1 |
199 | bool "Support Wolfson Microelectronics 1190-EV1 PMIC card" | 199 | bool "Support Wolfson Microelectronics 1190-EV1 PMIC card" |
200 | depends on MACH_SMDK6410 | 200 | depends on MACH_SMDK6410 |
201 | select REGULATOR | ||
202 | select REGULATOR_WM8350 | ||
203 | select SAMSUNG_GPIO_EXTRA64 | ||
204 | select MFD_WM8350_I2C | ||
205 | select MFD_WM8350_CONFIG_MODE_0 | 201 | select MFD_WM8350_CONFIG_MODE_0 |
206 | select MFD_WM8350_CONFIG_MODE_3 | 202 | select MFD_WM8350_CONFIG_MODE_3 |
203 | select MFD_WM8350_I2C | ||
207 | select MFD_WM8352_CONFIG_MODE_0 | 204 | select MFD_WM8352_CONFIG_MODE_0 |
205 | select REGULATOR | ||
206 | select REGULATOR_WM8350 | ||
207 | select SAMSUNG_GPIO_EXTRA64 | ||
208 | help | 208 | help |
209 | The Wolfson Microelectronics 1190-EV1 is a WM835x based PMIC | 209 | The Wolfson Microelectronics 1190-EV1 is a WM835x based PMIC |
210 | and audio daughtercard for the Samsung SMDK6410 reference | 210 | and audio daughtercard for the Samsung SMDK6410 reference |
@@ -216,11 +216,11 @@ config SMDK6410_WM1190_EV1 | |||
216 | config SMDK6410_WM1192_EV1 | 216 | config SMDK6410_WM1192_EV1 |
217 | bool "Support Wolfson Microelectronics 1192-EV1 PMIC card" | 217 | bool "Support Wolfson Microelectronics 1192-EV1 PMIC card" |
218 | depends on MACH_SMDK6410 | 218 | depends on MACH_SMDK6410 |
219 | select MFD_WM831X | ||
220 | select MFD_WM831X_I2C | ||
219 | select REGULATOR | 221 | select REGULATOR |
220 | select REGULATOR_WM831X | 222 | select REGULATOR_WM831X |
221 | select SAMSUNG_GPIO_EXTRA64 | 223 | select SAMSUNG_GPIO_EXTRA64 |
222 | select MFD_WM831X | ||
223 | select MFD_WM831X_I2C | ||
224 | help | 224 | help |
225 | The Wolfson Microelectronics 1192-EV1 is a WM831x based PMIC | 225 | The Wolfson Microelectronics 1192-EV1 is a WM831x based PMIC |
226 | daughtercard for the Samsung SMDK6410 reference platform. | 226 | daughtercard for the Samsung SMDK6410 reference platform. |
@@ -232,19 +232,19 @@ config SMDK6410_WM1192_EV1 | |||
232 | config MACH_NCP | 232 | config MACH_NCP |
233 | bool "NCP" | 233 | bool "NCP" |
234 | select CPU_S3C6410 | 234 | select CPU_S3C6410 |
235 | select S3C_DEV_I2C1 | ||
236 | select S3C_DEV_HSMMC1 | ||
237 | select S3C64XX_SETUP_I2C1 | 235 | select S3C64XX_SETUP_I2C1 |
236 | select S3C_DEV_HSMMC1 | ||
237 | select S3C_DEV_I2C1 | ||
238 | help | 238 | help |
239 | Machine support for the Samsung NCP | 239 | Machine support for the Samsung NCP |
240 | 240 | ||
241 | config MACH_HMT | 241 | config MACH_HMT |
242 | bool "Airgoo HMT" | 242 | bool "Airgoo HMT" |
243 | select CPU_S3C6410 | 243 | select CPU_S3C6410 |
244 | select S3C64XX_SETUP_FB_24BPP | ||
244 | select S3C_DEV_FB | 245 | select S3C_DEV_FB |
245 | select S3C_DEV_NAND | 246 | select S3C_DEV_NAND |
246 | select S3C_DEV_USB_HOST | 247 | select S3C_DEV_USB_HOST |
247 | select S3C64XX_SETUP_FB_24BPP | ||
248 | select SAMSUNG_DEV_PWM | 248 | select SAMSUNG_DEV_PWM |
249 | help | 249 | help |
250 | Machine support for the Airgoo HMT | 250 | Machine support for the Airgoo HMT |
@@ -252,17 +252,17 @@ config MACH_HMT | |||
252 | config MACH_SMARTQ | 252 | config MACH_SMARTQ |
253 | bool | 253 | bool |
254 | select CPU_S3C6410 | 254 | select CPU_S3C6410 |
255 | select S3C64XX_SETUP_FB_24BPP | ||
256 | select S3C64XX_SETUP_SDHCI | ||
257 | select S3C64XX_SETUP_USB_PHY | ||
258 | select S3C_DEV_FB | ||
255 | select S3C_DEV_HSMMC | 259 | select S3C_DEV_HSMMC |
256 | select S3C_DEV_HSMMC1 | 260 | select S3C_DEV_HSMMC1 |
257 | select S3C_DEV_HSMMC2 | 261 | select S3C_DEV_HSMMC2 |
258 | select S3C_DEV_FB | ||
259 | select S3C_DEV_HWMON | 262 | select S3C_DEV_HWMON |
260 | select S3C_DEV_RTC | 263 | select S3C_DEV_RTC |
261 | select S3C_DEV_USB_HSOTG | ||
262 | select S3C_DEV_USB_HOST | 264 | select S3C_DEV_USB_HOST |
263 | select S3C64XX_SETUP_SDHCI | 265 | select S3C_DEV_USB_HSOTG |
264 | select S3C64XX_SETUP_FB_24BPP | ||
265 | select S3C64XX_SETUP_USB_PHY | ||
266 | select SAMSUNG_DEV_ADC | 266 | select SAMSUNG_DEV_ADC |
267 | select SAMSUNG_DEV_PWM | 267 | select SAMSUNG_DEV_PWM |
268 | select SAMSUNG_DEV_TS | 268 | select SAMSUNG_DEV_TS |
@@ -284,26 +284,26 @@ config MACH_SMARTQ7 | |||
284 | config MACH_WLF_CRAGG_6410 | 284 | config MACH_WLF_CRAGG_6410 |
285 | bool "Wolfson Cragganmore 6410" | 285 | bool "Wolfson Cragganmore 6410" |
286 | select CPU_S3C6410 | 286 | select CPU_S3C6410 |
287 | select S3C64XX_SETUP_SDHCI | 287 | select I2C |
288 | select LEDS_GPIO_REGISTER | ||
289 | select S3C64XX_DEV_SPI0 | ||
290 | select S3C64XX_SETUP_FB_24BPP | ||
288 | select S3C64XX_SETUP_I2C1 | 291 | select S3C64XX_SETUP_I2C1 |
289 | select S3C64XX_SETUP_IDE | 292 | select S3C64XX_SETUP_IDE |
290 | select S3C64XX_SETUP_FB_24BPP | ||
291 | select S3C64XX_SETUP_KEYPAD | 293 | select S3C64XX_SETUP_KEYPAD |
294 | select S3C64XX_SETUP_SDHCI | ||
292 | select S3C64XX_SETUP_SPI | 295 | select S3C64XX_SETUP_SPI |
293 | select S3C64XX_SETUP_USB_PHY | 296 | select S3C64XX_SETUP_USB_PHY |
294 | select SAMSUNG_DEV_ADC | ||
295 | select SAMSUNG_DEV_KEYPAD | ||
296 | select S3C_DEV_USB_HOST | ||
297 | select S3C_DEV_USB_HSOTG | ||
298 | select S3C_DEV_HSMMC | 297 | select S3C_DEV_HSMMC |
299 | select S3C_DEV_HSMMC1 | 298 | select S3C_DEV_HSMMC1 |
300 | select S3C_DEV_HSMMC2 | 299 | select S3C_DEV_HSMMC2 |
301 | select S3C_DEV_I2C1 | 300 | select S3C_DEV_I2C1 |
302 | select S3C_DEV_WDT | ||
303 | select S3C_DEV_RTC | 301 | select S3C_DEV_RTC |
304 | select S3C64XX_DEV_SPI0 | 302 | select S3C_DEV_USB_HOST |
303 | select S3C_DEV_USB_HSOTG | ||
304 | select S3C_DEV_WDT | ||
305 | select SAMSUNG_DEV_ADC | ||
306 | select SAMSUNG_DEV_KEYPAD | ||
305 | select SAMSUNG_GPIO_EXTRA128 | 307 | select SAMSUNG_GPIO_EXTRA128 |
306 | select I2C | ||
307 | select LEDS_GPIO_REGISTER | ||
308 | help | 308 | help |
309 | Machine support for the Wolfson Cragganmore S3C6410 variant. | 309 | Machine support for the Wolfson Cragganmore S3C6410 variant. |
diff --git a/arch/arm/mach-s5p64x0/Kconfig b/arch/arm/mach-s5p64x0/Kconfig index c87f6108eeb1..e8742cb7ddd9 100644 --- a/arch/arm/mach-s5p64x0/Kconfig +++ b/arch/arm/mach-s5p64x0/Kconfig | |||
@@ -9,18 +9,18 @@ if ARCH_S5P64X0 | |||
9 | 9 | ||
10 | config CPU_S5P6440 | 10 | config CPU_S5P6440 |
11 | bool | 11 | bool |
12 | select SAMSUNG_DMADEV | ||
13 | select S5P_HRT | 12 | select S5P_HRT |
14 | select S5P_SLEEP if PM | 13 | select S5P_SLEEP if PM |
14 | select SAMSUNG_DMADEV | ||
15 | select SAMSUNG_WAKEMASK if PM | 15 | select SAMSUNG_WAKEMASK if PM |
16 | help | 16 | help |
17 | Enable S5P6440 CPU support | 17 | Enable S5P6440 CPU support |
18 | 18 | ||
19 | config CPU_S5P6450 | 19 | config CPU_S5P6450 |
20 | bool | 20 | bool |
21 | select SAMSUNG_DMADEV | ||
22 | select S5P_HRT | 21 | select S5P_HRT |
23 | select S5P_SLEEP if PM | 22 | select S5P_SLEEP if PM |
23 | select SAMSUNG_DMADEV | ||
24 | select SAMSUNG_WAKEMASK if PM | 24 | select SAMSUNG_WAKEMASK if PM |
25 | help | 25 | help |
26 | Enable S5P6450 CPU support | 26 | Enable S5P6450 CPU support |
@@ -52,19 +52,19 @@ config MACH_SMDK6440 | |||
52 | bool "SMDK6440" | 52 | bool "SMDK6440" |
53 | select CPU_S5P6440 | 53 | select CPU_S5P6440 |
54 | select S3C_DEV_FB | 54 | select S3C_DEV_FB |
55 | select S3C_DEV_I2C1 | ||
56 | select S3C_DEV_RTC | ||
57 | select S3C_DEV_WDT | ||
58 | select S3C_DEV_HSMMC | 55 | select S3C_DEV_HSMMC |
59 | select S3C_DEV_HSMMC1 | 56 | select S3C_DEV_HSMMC1 |
60 | select S3C_DEV_HSMMC2 | 57 | select S3C_DEV_HSMMC2 |
58 | select S3C_DEV_I2C1 | ||
59 | select S3C_DEV_RTC | ||
60 | select S3C_DEV_WDT | ||
61 | select S5P64X0_SETUP_FB_24BPP | ||
62 | select S5P64X0_SETUP_I2C1 | ||
63 | select S5P64X0_SETUP_SDHCI_GPIO | ||
61 | select SAMSUNG_DEV_ADC | 64 | select SAMSUNG_DEV_ADC |
62 | select SAMSUNG_DEV_BACKLIGHT | 65 | select SAMSUNG_DEV_BACKLIGHT |
63 | select SAMSUNG_DEV_PWM | 66 | select SAMSUNG_DEV_PWM |
64 | select SAMSUNG_DEV_TS | 67 | select SAMSUNG_DEV_TS |
65 | select S5P64X0_SETUP_FB_24BPP | ||
66 | select S5P64X0_SETUP_I2C1 | ||
67 | select S5P64X0_SETUP_SDHCI_GPIO | ||
68 | help | 68 | help |
69 | Machine support for the Samsung SMDK6440 | 69 | Machine support for the Samsung SMDK6440 |
70 | 70 | ||
@@ -72,19 +72,19 @@ config MACH_SMDK6450 | |||
72 | bool "SMDK6450" | 72 | bool "SMDK6450" |
73 | select CPU_S5P6450 | 73 | select CPU_S5P6450 |
74 | select S3C_DEV_FB | 74 | select S3C_DEV_FB |
75 | select S3C_DEV_I2C1 | ||
76 | select S3C_DEV_RTC | ||
77 | select S3C_DEV_WDT | ||
78 | select S3C_DEV_HSMMC | 75 | select S3C_DEV_HSMMC |
79 | select S3C_DEV_HSMMC1 | 76 | select S3C_DEV_HSMMC1 |
80 | select S3C_DEV_HSMMC2 | 77 | select S3C_DEV_HSMMC2 |
78 | select S3C_DEV_I2C1 | ||
79 | select S3C_DEV_RTC | ||
80 | select S3C_DEV_WDT | ||
81 | select S5P64X0_SETUP_FB_24BPP | ||
82 | select S5P64X0_SETUP_I2C1 | ||
83 | select S5P64X0_SETUP_SDHCI_GPIO | ||
81 | select SAMSUNG_DEV_ADC | 84 | select SAMSUNG_DEV_ADC |
82 | select SAMSUNG_DEV_BACKLIGHT | 85 | select SAMSUNG_DEV_BACKLIGHT |
83 | select SAMSUNG_DEV_PWM | 86 | select SAMSUNG_DEV_PWM |
84 | select SAMSUNG_DEV_TS | 87 | select SAMSUNG_DEV_TS |
85 | select S5P64X0_SETUP_FB_24BPP | ||
86 | select S5P64X0_SETUP_I2C1 | ||
87 | select S5P64X0_SETUP_SDHCI_GPIO | ||
88 | help | 88 | help |
89 | Machine support for the Samsung SMDK6450 | 89 | Machine support for the Samsung SMDK6450 |
90 | 90 | ||
diff --git a/arch/arm/mach-s5pc100/Kconfig b/arch/arm/mach-s5pc100/Kconfig index 75a26eaf2633..15170be97a74 100644 --- a/arch/arm/mach-s5pc100/Kconfig +++ b/arch/arm/mach-s5pc100/Kconfig | |||
@@ -60,12 +60,6 @@ config MACH_SMDKC100 | |||
60 | select S3C_DEV_I2C1 | 60 | select S3C_DEV_I2C1 |
61 | select S3C_DEV_RTC | 61 | select S3C_DEV_RTC |
62 | select S3C_DEV_WDT | 62 | select S3C_DEV_WDT |
63 | select SAMSUNG_DEV_ADC | ||
64 | select SAMSUNG_DEV_BACKLIGHT | ||
65 | select SAMSUNG_DEV_IDE | ||
66 | select SAMSUNG_DEV_KEYPAD | ||
67 | select SAMSUNG_DEV_PWM | ||
68 | select SAMSUNG_DEV_TS | ||
69 | select S5PC100_SETUP_FB_24BPP | 63 | select S5PC100_SETUP_FB_24BPP |
70 | select S5PC100_SETUP_I2C1 | 64 | select S5PC100_SETUP_I2C1 |
71 | select S5PC100_SETUP_IDE | 65 | select S5PC100_SETUP_IDE |
@@ -74,6 +68,12 @@ config MACH_SMDKC100 | |||
74 | select S5P_DEV_FIMC0 | 68 | select S5P_DEV_FIMC0 |
75 | select S5P_DEV_FIMC1 | 69 | select S5P_DEV_FIMC1 |
76 | select S5P_DEV_FIMC2 | 70 | select S5P_DEV_FIMC2 |
71 | select SAMSUNG_DEV_ADC | ||
72 | select SAMSUNG_DEV_BACKLIGHT | ||
73 | select SAMSUNG_DEV_IDE | ||
74 | select SAMSUNG_DEV_KEYPAD | ||
75 | select SAMSUNG_DEV_PWM | ||
76 | select SAMSUNG_DEV_TS | ||
77 | help | 77 | help |
78 | Machine support for the Samsung SMDKC100 | 78 | Machine support for the Samsung SMDKC100 |
79 | 79 | ||
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig index 77185c38188b..92ad72f0ef98 100644 --- a/arch/arm/mach-s5pv210/Kconfig +++ b/arch/arm/mach-s5pv210/Kconfig | |||
@@ -11,11 +11,11 @@ if ARCH_S5PV210 | |||
11 | 11 | ||
12 | config CPU_S5PV210 | 12 | config CPU_S5PV210 |
13 | bool | 13 | bool |
14 | select SAMSUNG_DMADEV | ||
15 | select S5P_EXT_INT | 14 | select S5P_EXT_INT |
16 | select S5P_HRT | 15 | select S5P_HRT |
17 | select S5P_PM if PM | 16 | select S5P_PM if PM |
18 | select S5P_SLEEP if PM | 17 | select S5P_SLEEP if PM |
18 | select SAMSUNG_DMADEV | ||
19 | help | 19 | help |
20 | Enable S5PV210 CPU support | 20 | Enable S5PV210 CPU support |
21 | 21 | ||
@@ -76,44 +76,44 @@ config MACH_AQUILA | |||
76 | bool "Aquila" | 76 | bool "Aquila" |
77 | select CPU_S5PV210 | 77 | select CPU_S5PV210 |
78 | select S3C_DEV_FB | 78 | select S3C_DEV_FB |
79 | select S5P_DEV_FIMC0 | ||
80 | select S5P_DEV_FIMC1 | ||
81 | select S5P_DEV_FIMC2 | ||
82 | select S3C_DEV_HSMMC | 79 | select S3C_DEV_HSMMC |
83 | select S3C_DEV_HSMMC1 | 80 | select S3C_DEV_HSMMC1 |
84 | select S3C_DEV_HSMMC2 | 81 | select S3C_DEV_HSMMC2 |
85 | select S5P_DEV_ONENAND | ||
86 | select S5PV210_SETUP_FB_24BPP | 82 | select S5PV210_SETUP_FB_24BPP |
87 | select S5PV210_SETUP_SDHCI | 83 | select S5PV210_SETUP_SDHCI |
88 | select S5PV210_SETUP_USB_PHY | 84 | select S5PV210_SETUP_USB_PHY |
85 | select S5P_DEV_FIMC0 | ||
86 | select S5P_DEV_FIMC1 | ||
87 | select S5P_DEV_FIMC2 | ||
88 | select S5P_DEV_ONENAND | ||
89 | help | 89 | help |
90 | Machine support for the Samsung Aquila target based on S5PC110 SoC | 90 | Machine support for the Samsung Aquila target based on S5PC110 SoC |
91 | 91 | ||
92 | config MACH_GONI | 92 | config MACH_GONI |
93 | bool "GONI" | 93 | bool "GONI" |
94 | select CPU_S5PV210 | 94 | select CPU_S5PV210 |
95 | select S5P_GPIO_INT | ||
96 | select S3C_DEV_FB | 95 | select S3C_DEV_FB |
97 | select S5P_DEV_FIMC0 | ||
98 | select S5P_DEV_FIMC1 | ||
99 | select S5P_DEV_FIMC2 | ||
100 | select S3C_DEV_HSMMC | 96 | select S3C_DEV_HSMMC |
101 | select S3C_DEV_HSMMC1 | 97 | select S3C_DEV_HSMMC1 |
102 | select S3C_DEV_HSMMC2 | 98 | select S3C_DEV_HSMMC2 |
103 | select S3C_DEV_I2C1 | 99 | select S3C_DEV_I2C1 |
104 | select S3C_DEV_I2C2 | 100 | select S3C_DEV_I2C2 |
105 | select S5P_DEV_MFC | ||
106 | select S3C_DEV_USB_HSOTG | 101 | select S3C_DEV_USB_HSOTG |
107 | select S5P_DEV_ONENAND | ||
108 | select SAMSUNG_DEV_KEYPAD | ||
109 | select S5P_DEV_TV | ||
110 | select S5PV210_SETUP_FB_24BPP | 102 | select S5PV210_SETUP_FB_24BPP |
103 | select S5PV210_SETUP_FIMC | ||
111 | select S5PV210_SETUP_I2C1 | 104 | select S5PV210_SETUP_I2C1 |
112 | select S5PV210_SETUP_I2C2 | 105 | select S5PV210_SETUP_I2C2 |
113 | select S5PV210_SETUP_KEYPAD | 106 | select S5PV210_SETUP_KEYPAD |
114 | select S5PV210_SETUP_SDHCI | 107 | select S5PV210_SETUP_SDHCI |
115 | select S5PV210_SETUP_FIMC | ||
116 | select S5PV210_SETUP_USB_PHY | 108 | select S5PV210_SETUP_USB_PHY |
109 | select S5P_DEV_FIMC0 | ||
110 | select S5P_DEV_FIMC1 | ||
111 | select S5P_DEV_FIMC2 | ||
112 | select S5P_DEV_MFC | ||
113 | select S5P_DEV_ONENAND | ||
114 | select S5P_DEV_TV | ||
115 | select S5P_GPIO_INT | ||
116 | select SAMSUNG_DEV_KEYPAD | ||
117 | help | 117 | help |
118 | Machine support for Samsung GONI board | 118 | Machine support for Samsung GONI board |
119 | S5PC110(MCP) is one of package option of S5PV210 | 119 | S5PC110(MCP) is one of package option of S5PV210 |
@@ -125,14 +125,14 @@ config MACH_SMDKC110 | |||
125 | select S3C_DEV_I2C2 | 125 | select S3C_DEV_I2C2 |
126 | select S3C_DEV_RTC | 126 | select S3C_DEV_RTC |
127 | select S3C_DEV_WDT | 127 | select S3C_DEV_WDT |
128 | select S5PV210_SETUP_I2C1 | ||
129 | select S5PV210_SETUP_I2C2 | ||
130 | select S5PV210_SETUP_IDE | ||
128 | select S5P_DEV_FIMC0 | 131 | select S5P_DEV_FIMC0 |
129 | select S5P_DEV_FIMC1 | 132 | select S5P_DEV_FIMC1 |
130 | select S5P_DEV_FIMC2 | 133 | select S5P_DEV_FIMC2 |
131 | select S5P_DEV_MFC | 134 | select S5P_DEV_MFC |
132 | select SAMSUNG_DEV_IDE | 135 | select SAMSUNG_DEV_IDE |
133 | select S5PV210_SETUP_I2C1 | ||
134 | select S5PV210_SETUP_I2C2 | ||
135 | select S5PV210_SETUP_IDE | ||
136 | help | 136 | help |
137 | Machine support for Samsung SMDKC110 | 137 | Machine support for Samsung SMDKC110 |
138 | S5PC110(MCP) is one of package option of S5PV210 | 138 | S5PC110(MCP) is one of package option of S5PV210 |
@@ -154,6 +154,13 @@ config MACH_SMDKV210 | |||
154 | select S3C_DEV_RTC | 154 | select S3C_DEV_RTC |
155 | select S3C_DEV_USB_HSOTG | 155 | select S3C_DEV_USB_HSOTG |
156 | select S3C_DEV_WDT | 156 | select S3C_DEV_WDT |
157 | select S5PV210_SETUP_FB_24BPP | ||
158 | select S5PV210_SETUP_I2C1 | ||
159 | select S5PV210_SETUP_I2C2 | ||
160 | select S5PV210_SETUP_IDE | ||
161 | select S5PV210_SETUP_KEYPAD | ||
162 | select S5PV210_SETUP_SDHCI | ||
163 | select S5PV210_SETUP_USB_PHY | ||
157 | select S5P_DEV_FIMC0 | 164 | select S5P_DEV_FIMC0 |
158 | select S5P_DEV_FIMC1 | 165 | select S5P_DEV_FIMC1 |
159 | select S5P_DEV_FIMC2 | 166 | select S5P_DEV_FIMC2 |
@@ -165,20 +172,13 @@ config MACH_SMDKV210 | |||
165 | select SAMSUNG_DEV_KEYPAD | 172 | select SAMSUNG_DEV_KEYPAD |
166 | select SAMSUNG_DEV_PWM | 173 | select SAMSUNG_DEV_PWM |
167 | select SAMSUNG_DEV_TS | 174 | select SAMSUNG_DEV_TS |
168 | select S5PV210_SETUP_FB_24BPP | ||
169 | select S5PV210_SETUP_I2C1 | ||
170 | select S5PV210_SETUP_I2C2 | ||
171 | select S5PV210_SETUP_IDE | ||
172 | select S5PV210_SETUP_KEYPAD | ||
173 | select S5PV210_SETUP_SDHCI | ||
174 | select S5PV210_SETUP_USB_PHY | ||
175 | help | 175 | help |
176 | Machine support for Samsung SMDKV210 | 176 | Machine support for Samsung SMDKV210 |
177 | 177 | ||
178 | config MACH_TORBRECK | 178 | config MACH_TORBRECK |
179 | bool "Torbreck" | 179 | bool "Torbreck" |
180 | select CPU_S5PV210 | ||
181 | select ARCH_SPARSEMEM_ENABLE | 180 | select ARCH_SPARSEMEM_ENABLE |
181 | select CPU_S5PV210 | ||
182 | select S3C_DEV_HSMMC | 182 | select S3C_DEV_HSMMC |
183 | select S3C_DEV_HSMMC1 | 183 | select S3C_DEV_HSMMC1 |
184 | select S3C_DEV_HSMMC2 | 184 | select S3C_DEV_HSMMC2 |
diff --git a/arch/arm/mach-sa1100/Kconfig b/arch/arm/mach-sa1100/Kconfig index 42625e4d949a..ca14dbdcfb22 100644 --- a/arch/arm/mach-sa1100/Kconfig +++ b/arch/arm/mach-sa1100/Kconfig | |||
@@ -49,15 +49,15 @@ config SA1100_COLLIE | |||
49 | bool "Sharp Zaurus SL5500" | 49 | bool "Sharp Zaurus SL5500" |
50 | # FIXME: select CPU_FREQ_SA11x0 | 50 | # FIXME: select CPU_FREQ_SA11x0 |
51 | select SHARP_LOCOMO | 51 | select SHARP_LOCOMO |
52 | select SHARP_SCOOP | ||
53 | select SHARP_PARAM | 52 | select SHARP_PARAM |
53 | select SHARP_SCOOP | ||
54 | help | 54 | help |
55 | Say Y here to support the Sharp Zaurus SL5500 PDAs. | 55 | Say Y here to support the Sharp Zaurus SL5500 PDAs. |
56 | 56 | ||
57 | config SA1100_H3100 | 57 | config SA1100_H3100 |
58 | bool "Compaq iPAQ H3100" | 58 | bool "Compaq iPAQ H3100" |
59 | select HTC_EGPIO | ||
60 | select CPU_FREQ_SA1110 | 59 | select CPU_FREQ_SA1110 |
60 | select HTC_EGPIO | ||
61 | help | 61 | help |
62 | Say Y here if you intend to run this kernel on the Compaq iPAQ | 62 | Say Y here if you intend to run this kernel on the Compaq iPAQ |
63 | H3100 handheld computer. Information about this machine and the | 63 | H3100 handheld computer. Information about this machine and the |
@@ -67,8 +67,8 @@ config SA1100_H3100 | |||
67 | 67 | ||
68 | config SA1100_H3600 | 68 | config SA1100_H3600 |
69 | bool "Compaq iPAQ H3600/H3700" | 69 | bool "Compaq iPAQ H3600/H3700" |
70 | select HTC_EGPIO | ||
71 | select CPU_FREQ_SA1110 | 70 | select CPU_FREQ_SA1110 |
71 | select HTC_EGPIO | ||
72 | help | 72 | help |
73 | Say Y here if you intend to run this kernel on the Compaq iPAQ | 73 | Say Y here if you intend to run this kernel on the Compaq iPAQ |
74 | H3600 handheld computer. Information about this machine and the | 74 | H3600 handheld computer. Information about this machine and the |
@@ -78,16 +78,16 @@ config SA1100_H3600 | |||
78 | 78 | ||
79 | config SA1100_BADGE4 | 79 | config SA1100_BADGE4 |
80 | bool "HP Labs BadgePAD 4" | 80 | bool "HP Labs BadgePAD 4" |
81 | select SA1111 | ||
82 | select CPU_FREQ_SA1100 | 81 | select CPU_FREQ_SA1100 |
82 | select SA1111 | ||
83 | help | 83 | help |
84 | Say Y here if you want to build a kernel for the HP Laboratories | 84 | Say Y here if you want to build a kernel for the HP Laboratories |
85 | BadgePAD 4. | 85 | BadgePAD 4. |
86 | 86 | ||
87 | config SA1100_JORNADA720 | 87 | config SA1100_JORNADA720 |
88 | bool "HP Jornada 720" | 88 | bool "HP Jornada 720" |
89 | select SA1111 | ||
90 | # FIXME: select CPU_FREQ_SA11x0 | 89 | # FIXME: select CPU_FREQ_SA11x0 |
90 | select SA1111 | ||
91 | help | 91 | help |
92 | Say Y here if you want to build a kernel for the HP Jornada 720 | 92 | Say Y here if you want to build a kernel for the HP Jornada 720 |
93 | handheld computer. See | 93 | handheld computer. See |
@@ -95,8 +95,8 @@ config SA1100_JORNADA720 | |||
95 | 95 | ||
96 | config SA1100_JORNADA720_SSP | 96 | config SA1100_JORNADA720_SSP |
97 | bool "HP Jornada 720 Extended SSP driver" | 97 | bool "HP Jornada 720 Extended SSP driver" |
98 | select SA1100_SSP | ||
99 | depends on SA1100_JORNADA720 | 98 | depends on SA1100_JORNADA720 |
99 | select SA1100_SSP | ||
100 | help | 100 | help |
101 | Say Y here if you have a HP Jornada 7xx handheld computer and you | 101 | Say Y here if you have a HP Jornada 7xx handheld computer and you |
102 | want to access devices connected to the MCU. Those include the | 102 | want to access devices connected to the MCU. Those include the |
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 4cacc2d22fbe..8ae100cc655c 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig | |||
@@ -4,49 +4,49 @@ comment "SH-Mobile System Type" | |||
4 | 4 | ||
5 | config ARCH_SH7367 | 5 | config ARCH_SH7367 |
6 | bool "SH-Mobile G3 (SH7367)" | 6 | bool "SH-Mobile G3 (SH7367)" |
7 | select ARCH_WANT_OPTIONAL_GPIOLIB | ||
7 | select CPU_V6 | 8 | select CPU_V6 |
8 | select SH_CLK_CPG | 9 | select SH_CLK_CPG |
9 | select ARCH_WANT_OPTIONAL_GPIOLIB | ||
10 | 10 | ||
11 | config ARCH_SH7377 | 11 | config ARCH_SH7377 |
12 | bool "SH-Mobile G4 (SH7377)" | 12 | bool "SH-Mobile G4 (SH7377)" |
13 | select ARCH_WANT_OPTIONAL_GPIOLIB | ||
13 | select CPU_V7 | 14 | select CPU_V7 |
14 | select SH_CLK_CPG | 15 | select SH_CLK_CPG |
15 | select ARCH_WANT_OPTIONAL_GPIOLIB | ||
16 | 16 | ||
17 | config ARCH_SH7372 | 17 | config ARCH_SH7372 |
18 | bool "SH-Mobile AP4 (SH7372)" | 18 | bool "SH-Mobile AP4 (SH7372)" |
19 | select CPU_V7 | ||
20 | select SH_CLK_CPG | ||
21 | select ARCH_WANT_OPTIONAL_GPIOLIB | 19 | select ARCH_WANT_OPTIONAL_GPIOLIB |
22 | select ARM_CPU_SUSPEND if PM || CPU_IDLE | 20 | select ARM_CPU_SUSPEND if PM || CPU_IDLE |
21 | select CPU_V7 | ||
22 | select SH_CLK_CPG | ||
23 | 23 | ||
24 | config ARCH_SH73A0 | 24 | config ARCH_SH73A0 |
25 | bool "SH-Mobile AG5 (R8A73A00)" | 25 | bool "SH-Mobile AG5 (R8A73A00)" |
26 | select CPU_V7 | ||
27 | select SH_CLK_CPG | ||
28 | select ARCH_WANT_OPTIONAL_GPIOLIB | 26 | select ARCH_WANT_OPTIONAL_GPIOLIB |
29 | select ARM_GIC | 27 | select ARM_GIC |
28 | select CPU_V7 | ||
30 | select I2C | 29 | select I2C |
30 | select SH_CLK_CPG | ||
31 | 31 | ||
32 | config ARCH_R8A7740 | 32 | config ARCH_R8A7740 |
33 | bool "R-Mobile A1 (R8A77400)" | 33 | bool "R-Mobile A1 (R8A77400)" |
34 | select ARCH_WANT_OPTIONAL_GPIOLIB | ||
34 | select CPU_V7 | 35 | select CPU_V7 |
35 | select SH_CLK_CPG | 36 | select SH_CLK_CPG |
36 | select ARCH_WANT_OPTIONAL_GPIOLIB | ||
37 | 37 | ||
38 | config ARCH_R8A7779 | 38 | config ARCH_R8A7779 |
39 | bool "R-Car H1 (R8A77790)" | 39 | bool "R-Car H1 (R8A77790)" |
40 | select ARCH_WANT_OPTIONAL_GPIOLIB | ||
41 | select ARM_GIC | ||
40 | select CPU_V7 | 42 | select CPU_V7 |
41 | select SH_CLK_CPG | 43 | select SH_CLK_CPG |
42 | select ARM_GIC | ||
43 | select ARCH_WANT_OPTIONAL_GPIOLIB | ||
44 | 44 | ||
45 | config ARCH_EMEV2 | 45 | config ARCH_EMEV2 |
46 | bool "Emma Mobile EV2" | 46 | bool "Emma Mobile EV2" |
47 | select CPU_V7 | ||
48 | select ARM_GIC | ||
49 | select ARCH_WANT_OPTIONAL_GPIOLIB | 47 | select ARCH_WANT_OPTIONAL_GPIOLIB |
48 | select ARM_GIC | ||
49 | select CPU_V7 | ||
50 | 50 | ||
51 | comment "SH-Mobile Board Type" | 51 | comment "SH-Mobile Board Type" |
52 | 52 | ||
@@ -65,9 +65,9 @@ config MACH_AP4EVB | |||
65 | bool "AP4EVB board" | 65 | bool "AP4EVB board" |
66 | depends on ARCH_SH7372 | 66 | depends on ARCH_SH7372 |
67 | select ARCH_REQUIRE_GPIOLIB | 67 | select ARCH_REQUIRE_GPIOLIB |
68 | select REGULATOR_FIXED_VOLTAGE if REGULATOR | ||
68 | select SH_LCD_MIPI_DSI | 69 | select SH_LCD_MIPI_DSI |
69 | select SND_SOC_AK4642 if SND_SIMPLE_CARD | 70 | select SND_SOC_AK4642 if SND_SIMPLE_CARD |
70 | select REGULATOR_FIXED_VOLTAGE if REGULATOR | ||
71 | 71 | ||
72 | choice | 72 | choice |
73 | prompt "AP4EVB LCD panel selection" | 73 | prompt "AP4EVB LCD panel selection" |
@@ -84,37 +84,37 @@ endchoice | |||
84 | 84 | ||
85 | config MACH_AG5EVM | 85 | config MACH_AG5EVM |
86 | bool "AG5EVM board" | 86 | bool "AG5EVM board" |
87 | depends on ARCH_SH73A0 | ||
87 | select ARCH_REQUIRE_GPIOLIB | 88 | select ARCH_REQUIRE_GPIOLIB |
88 | select SH_LCD_MIPI_DSI | ||
89 | select REGULATOR_FIXED_VOLTAGE if REGULATOR | 89 | select REGULATOR_FIXED_VOLTAGE if REGULATOR |
90 | depends on ARCH_SH73A0 | 90 | select SH_LCD_MIPI_DSI |
91 | 91 | ||
92 | config MACH_MACKEREL | 92 | config MACH_MACKEREL |
93 | bool "mackerel board" | 93 | bool "mackerel board" |
94 | depends on ARCH_SH7372 | 94 | depends on ARCH_SH7372 |
95 | select ARCH_REQUIRE_GPIOLIB | 95 | select ARCH_REQUIRE_GPIOLIB |
96 | select SND_SOC_AK4642 if SND_SIMPLE_CARD | ||
97 | select REGULATOR_FIXED_VOLTAGE if REGULATOR | 96 | select REGULATOR_FIXED_VOLTAGE if REGULATOR |
97 | select SND_SOC_AK4642 if SND_SIMPLE_CARD | ||
98 | 98 | ||
99 | config MACH_KOTA2 | 99 | config MACH_KOTA2 |
100 | bool "KOTA2 board" | 100 | bool "KOTA2 board" |
101 | depends on ARCH_SH73A0 | ||
101 | select ARCH_REQUIRE_GPIOLIB | 102 | select ARCH_REQUIRE_GPIOLIB |
102 | select REGULATOR_FIXED_VOLTAGE if REGULATOR | 103 | select REGULATOR_FIXED_VOLTAGE if REGULATOR |
103 | depends on ARCH_SH73A0 | ||
104 | 104 | ||
105 | config MACH_BONITO | 105 | config MACH_BONITO |
106 | bool "bonito board" | 106 | bool "bonito board" |
107 | depends on ARCH_R8A7740 | ||
107 | select ARCH_REQUIRE_GPIOLIB | 108 | select ARCH_REQUIRE_GPIOLIB |
108 | select REGULATOR_FIXED_VOLTAGE if REGULATOR | 109 | select REGULATOR_FIXED_VOLTAGE if REGULATOR |
109 | depends on ARCH_R8A7740 | ||
110 | 110 | ||
111 | config MACH_ARMADILLO800EVA | 111 | config MACH_ARMADILLO800EVA |
112 | bool "Armadillo-800 EVA board" | 112 | bool "Armadillo-800 EVA board" |
113 | depends on ARCH_R8A7740 | 113 | depends on ARCH_R8A7740 |
114 | select ARCH_REQUIRE_GPIOLIB | 114 | select ARCH_REQUIRE_GPIOLIB |
115 | select USE_OF | ||
116 | select REGULATOR_FIXED_VOLTAGE if REGULATOR | 115 | select REGULATOR_FIXED_VOLTAGE if REGULATOR |
117 | select SND_SOC_WM8978 if SND_SIMPLE_CARD | 116 | select SND_SOC_WM8978 if SND_SIMPLE_CARD |
117 | select USE_OF | ||
118 | 118 | ||
119 | config MACH_MARZEN | 119 | config MACH_MARZEN |
120 | bool "MARZEN board" | 120 | bool "MARZEN board" |
@@ -125,16 +125,16 @@ config MACH_MARZEN | |||
125 | config MACH_KZM9D | 125 | config MACH_KZM9D |
126 | bool "KZM9D board" | 126 | bool "KZM9D board" |
127 | depends on ARCH_EMEV2 | 127 | depends on ARCH_EMEV2 |
128 | select USE_OF | ||
129 | select REGULATOR_FIXED_VOLTAGE if REGULATOR | 128 | select REGULATOR_FIXED_VOLTAGE if REGULATOR |
129 | select USE_OF | ||
130 | 130 | ||
131 | config MACH_KZM9G | 131 | config MACH_KZM9G |
132 | bool "KZM-A9-GT board" | 132 | bool "KZM-A9-GT board" |
133 | depends on ARCH_SH73A0 | 133 | depends on ARCH_SH73A0 |
134 | select ARCH_REQUIRE_GPIOLIB | 134 | select ARCH_REQUIRE_GPIOLIB |
135 | select USE_OF | ||
136 | select SND_SOC_AK4642 if SND_SIMPLE_CARD | ||
137 | select REGULATOR_FIXED_VOLTAGE if REGULATOR | 135 | select REGULATOR_FIXED_VOLTAGE if REGULATOR |
136 | select SND_SOC_AK4642 if SND_SIMPLE_CARD | ||
137 | select USE_OF | ||
138 | 138 | ||
139 | comment "SH-Mobile System Configuration" | 139 | comment "SH-Mobile System Configuration" |
140 | 140 | ||
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 11680c532b38..9ff6f6ea3617 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig | |||
@@ -4,42 +4,42 @@ comment "NVIDIA Tegra options" | |||
4 | 4 | ||
5 | config ARCH_TEGRA_2x_SOC | 5 | config ARCH_TEGRA_2x_SOC |
6 | bool "Enable support for Tegra20 family" | 6 | bool "Enable support for Tegra20 family" |
7 | select CPU_V7 | ||
8 | select ARM_GIC | ||
9 | select ARCH_REQUIRE_GPIOLIB | 7 | select ARCH_REQUIRE_GPIOLIB |
10 | select PINCTRL | ||
11 | select PINCTRL_TEGRA20 | ||
12 | select USB_ARCH_HAS_EHCI if USB_SUPPORT | ||
13 | select USB_ULPI if USB | ||
14 | select USB_ULPI_VIEWPORT if USB_SUPPORT | ||
15 | select ARM_ERRATA_720789 | 8 | select ARM_ERRATA_720789 |
16 | select ARM_ERRATA_742230 | 9 | select ARM_ERRATA_742230 |
17 | select ARM_ERRATA_751472 | 10 | select ARM_ERRATA_751472 |
18 | select ARM_ERRATA_754327 | 11 | select ARM_ERRATA_754327 |
19 | select ARM_ERRATA_764369 if SMP | 12 | select ARM_ERRATA_764369 if SMP |
13 | select ARM_GIC | ||
14 | select CPU_FREQ_TABLE if CPU_FREQ | ||
15 | select CPU_V7 | ||
16 | select PINCTRL | ||
17 | select PINCTRL_TEGRA20 | ||
20 | select PL310_ERRATA_727915 if CACHE_L2X0 | 18 | select PL310_ERRATA_727915 if CACHE_L2X0 |
21 | select PL310_ERRATA_769419 if CACHE_L2X0 | 19 | select PL310_ERRATA_769419 if CACHE_L2X0 |
22 | select CPU_FREQ_TABLE if CPU_FREQ | 20 | select USB_ARCH_HAS_EHCI if USB_SUPPORT |
21 | select USB_ULPI if USB | ||
22 | select USB_ULPI_VIEWPORT if USB_SUPPORT | ||
23 | help | 23 | help |
24 | Support for NVIDIA Tegra AP20 and T20 processors, based on the | 24 | Support for NVIDIA Tegra AP20 and T20 processors, based on the |
25 | ARM CortexA9MP CPU and the ARM PL310 L2 cache controller | 25 | ARM CortexA9MP CPU and the ARM PL310 L2 cache controller |
26 | 26 | ||
27 | config ARCH_TEGRA_3x_SOC | 27 | config ARCH_TEGRA_3x_SOC |
28 | bool "Enable support for Tegra30 family" | 28 | bool "Enable support for Tegra30 family" |
29 | select CPU_V7 | ||
30 | select ARM_GIC | ||
31 | select ARCH_REQUIRE_GPIOLIB | 29 | select ARCH_REQUIRE_GPIOLIB |
32 | select PINCTRL | ||
33 | select PINCTRL_TEGRA30 | ||
34 | select USB_ARCH_HAS_EHCI if USB_SUPPORT | ||
35 | select USB_ULPI if USB | ||
36 | select USB_ULPI_VIEWPORT if USB_SUPPORT | ||
37 | select ARM_ERRATA_743622 | 30 | select ARM_ERRATA_743622 |
38 | select ARM_ERRATA_751472 | 31 | select ARM_ERRATA_751472 |
39 | select ARM_ERRATA_754322 | 32 | select ARM_ERRATA_754322 |
40 | select ARM_ERRATA_764369 if SMP | 33 | select ARM_ERRATA_764369 if SMP |
41 | select PL310_ERRATA_769419 if CACHE_L2X0 | 34 | select ARM_GIC |
42 | select CPU_FREQ_TABLE if CPU_FREQ | 35 | select CPU_FREQ_TABLE if CPU_FREQ |
36 | select CPU_V7 | ||
37 | select PINCTRL | ||
38 | select PINCTRL_TEGRA30 | ||
39 | select PL310_ERRATA_769419 if CACHE_L2X0 | ||
40 | select USB_ARCH_HAS_EHCI if USB_SUPPORT | ||
41 | select USB_ULPI if USB | ||
42 | select USB_ULPI_VIEWPORT if USB_SUPPORT | ||
43 | help | 43 | help |
44 | Support for NVIDIA Tegra T30 processor family, based on the | 44 | Support for NVIDIA Tegra T30 processor family, based on the |
45 | ARM CortexA9MP CPU and the ARM PL310 L2 cache controller | 45 | ARM CortexA9MP CPU and the ARM PL310 L2 cache controller |
diff --git a/arch/arm/mach-u300/Kconfig b/arch/arm/mach-u300/Kconfig index f7e12ede008c..1f597647d431 100644 --- a/arch/arm/mach-u300/Kconfig +++ b/arch/arm/mach-u300/Kconfig | |||
@@ -7,8 +7,8 @@ comment "ST-Ericsson Mobile Platform Products" | |||
7 | config MACH_U300 | 7 | config MACH_U300 |
8 | bool "U300" | 8 | bool "U300" |
9 | select PINCTRL | 9 | select PINCTRL |
10 | select PINCTRL_U300 | ||
11 | select PINCTRL_COH901 | 10 | select PINCTRL_COH901 |
11 | select PINCTRL_U300 | ||
12 | 12 | ||
13 | comment "ST-Ericsson U300/U335 Feature Selections" | 13 | comment "ST-Ericsson U300/U335 Feature Selections" |
14 | 14 | ||
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig index 5848206ee9b9..e8c3f0d70ca6 100644 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig | |||
@@ -3,33 +3,33 @@ if ARCH_U8500 | |||
3 | config UX500_SOC_COMMON | 3 | config UX500_SOC_COMMON |
4 | bool | 4 | bool |
5 | default y | 5 | default y |
6 | select ARM_GIC | ||
7 | select HAS_MTU | ||
8 | select PL310_ERRATA_753970 if CACHE_PL310 | ||
9 | select ARM_ERRATA_754322 | 6 | select ARM_ERRATA_754322 |
10 | select ARM_ERRATA_764369 if SMP | 7 | select ARM_ERRATA_764369 if SMP |
8 | select ARM_GIC | ||
11 | select CACHE_L2X0 | 9 | select CACHE_L2X0 |
10 | select COMMON_CLK | ||
11 | select HAS_MTU | ||
12 | select PINCTRL | 12 | select PINCTRL |
13 | select PINCTRL_NOMADIK | 13 | select PINCTRL_NOMADIK |
14 | select COMMON_CLK | 14 | select PL310_ERRATA_753970 if CACHE_PL310 |
15 | 15 | ||
16 | config UX500_SOC_DB8500 | 16 | config UX500_SOC_DB8500 |
17 | bool | 17 | bool |
18 | select CPU_FREQ_TABLE if CPU_FREQ | ||
18 | select MFD_DB8500_PRCMU | 19 | select MFD_DB8500_PRCMU |
20 | select PINCTRL_DB8500 | ||
19 | select REGULATOR | 21 | select REGULATOR |
20 | select REGULATOR_DB8500_PRCMU | 22 | select REGULATOR_DB8500_PRCMU |
21 | select CPU_FREQ_TABLE if CPU_FREQ | ||
22 | select PINCTRL_DB8500 | ||
23 | 23 | ||
24 | menu "Ux500 target platform (boards)" | 24 | menu "Ux500 target platform (boards)" |
25 | 25 | ||
26 | config MACH_MOP500 | 26 | config MACH_MOP500 |
27 | bool "U8500 Development platform, MOP500 versions" | 27 | bool "U8500 Development platform, MOP500 versions" |
28 | select UX500_SOC_DB8500 | ||
29 | select I2C | 28 | select I2C |
30 | select I2C_NOMADIK | 29 | select I2C_NOMADIK |
31 | select SOC_BUS | ||
32 | select REGULATOR_FIXED_VOLTAGE | 30 | select REGULATOR_FIXED_VOLTAGE |
31 | select SOC_BUS | ||
32 | select UX500_SOC_DB8500 | ||
33 | help | 33 | help |
34 | Include support for the MOP500 development platform. | 34 | Include support for the MOP500 development platform. |
35 | 35 | ||
diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig index c1f38f6625b2..63d8e9f81b99 100644 --- a/arch/arm/mach-versatile/Kconfig +++ b/arch/arm/mach-versatile/Kconfig | |||
@@ -3,9 +3,9 @@ menu "Versatile platform type" | |||
3 | 3 | ||
4 | config ARCH_VERSATILE_PB | 4 | config ARCH_VERSATILE_PB |
5 | bool "Support Versatile Platform Baseboard for ARM926EJ-S" | 5 | bool "Support Versatile Platform Baseboard for ARM926EJ-S" |
6 | default y | ||
6 | select CPU_ARM926T | 7 | select CPU_ARM926T |
7 | select MIGHT_HAVE_PCI | 8 | select MIGHT_HAVE_PCI |
8 | default y | ||
9 | help | 9 | help |
10 | Include support for the ARM(R) Versatile Platform Baseboard | 10 | Include support for the ARM(R) Versatile Platform Baseboard |
11 | for the ARM926EJ-S. | 11 | for the ARM926EJ-S. |
@@ -19,8 +19,8 @@ config MACH_VERSATILE_AB | |||
19 | 19 | ||
20 | config MACH_VERSATILE_DT | 20 | config MACH_VERSATILE_DT |
21 | bool "Support Versatile platform from device tree" | 21 | bool "Support Versatile platform from device tree" |
22 | select USE_OF | ||
23 | select CPU_ARM926T | 22 | select CPU_ARM926T |
23 | select USE_OF | ||
24 | help | 24 | help |
25 | Include support for the ARM(R) Versatile/PB platform, | 25 | Include support for the ARM(R) Versatile/PB platform, |
26 | using the device tree for discovery | 26 | using the device tree for discovery |
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index c9a4963b5c3d..94186b6c685f 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
@@ -10,8 +10,8 @@ config CPU_ARM7TDMI | |||
10 | depends on !MMU | 10 | depends on !MMU |
11 | select CPU_32v4T | 11 | select CPU_32v4T |
12 | select CPU_ABRT_LV4T | 12 | select CPU_ABRT_LV4T |
13 | select CPU_PABRT_LEGACY | ||
14 | select CPU_CACHE_V4 | 13 | select CPU_CACHE_V4 |
14 | select CPU_PABRT_LEGACY | ||
15 | help | 15 | help |
16 | A 32-bit RISC microprocessor based on the ARM7 processor core | 16 | A 32-bit RISC microprocessor based on the ARM7 processor core |
17 | which has no memory control unit and cache. | 17 | which has no memory control unit and cache. |
@@ -24,11 +24,11 @@ config CPU_ARM720T | |||
24 | bool "Support ARM720T processor" if ARCH_INTEGRATOR | 24 | bool "Support ARM720T processor" if ARCH_INTEGRATOR |
25 | select CPU_32v4T | 25 | select CPU_32v4T |
26 | select CPU_ABRT_LV4T | 26 | select CPU_ABRT_LV4T |
27 | select CPU_PABRT_LEGACY | ||
28 | select CPU_CACHE_V4 | 27 | select CPU_CACHE_V4 |
29 | select CPU_CACHE_VIVT | 28 | select CPU_CACHE_VIVT |
30 | select CPU_CP15_MMU | ||
31 | select CPU_COPY_V4WT if MMU | 29 | select CPU_COPY_V4WT if MMU |
30 | select CPU_CP15_MMU | ||
31 | select CPU_PABRT_LEGACY | ||
32 | select CPU_TLB_V4WT if MMU | 32 | select CPU_TLB_V4WT if MMU |
33 | help | 33 | help |
34 | A 32-bit RISC processor with 8kByte Cache, Write Buffer and | 34 | A 32-bit RISC processor with 8kByte Cache, Write Buffer and |
@@ -43,9 +43,9 @@ config CPU_ARM740T | |||
43 | depends on !MMU | 43 | depends on !MMU |
44 | select CPU_32v4T | 44 | select CPU_32v4T |
45 | select CPU_ABRT_LV4T | 45 | select CPU_ABRT_LV4T |
46 | select CPU_PABRT_LEGACY | ||
47 | select CPU_CACHE_V3 # although the core is v4t | 46 | select CPU_CACHE_V3 # although the core is v4t |
48 | select CPU_CP15_MPU | 47 | select CPU_CP15_MPU |
48 | select CPU_PABRT_LEGACY | ||
49 | help | 49 | help |
50 | A 32-bit RISC processor with 8KB cache or 4KB variants, | 50 | A 32-bit RISC processor with 8KB cache or 4KB variants, |
51 | write buffer and MPU(Protection Unit) built around | 51 | write buffer and MPU(Protection Unit) built around |
@@ -60,8 +60,8 @@ config CPU_ARM9TDMI | |||
60 | depends on !MMU | 60 | depends on !MMU |
61 | select CPU_32v4T | 61 | select CPU_32v4T |
62 | select CPU_ABRT_NOMMU | 62 | select CPU_ABRT_NOMMU |
63 | select CPU_PABRT_LEGACY | ||
64 | select CPU_CACHE_V4 | 63 | select CPU_CACHE_V4 |
64 | select CPU_PABRT_LEGACY | ||
65 | help | 65 | help |
66 | A 32-bit RISC microprocessor based on the ARM9 processor core | 66 | A 32-bit RISC microprocessor based on the ARM9 processor core |
67 | which has no memory control unit and cache. | 67 | which has no memory control unit and cache. |
@@ -74,11 +74,11 @@ config CPU_ARM920T | |||
74 | bool "Support ARM920T processor" if ARCH_INTEGRATOR | 74 | bool "Support ARM920T processor" if ARCH_INTEGRATOR |
75 | select CPU_32v4T | 75 | select CPU_32v4T |
76 | select CPU_ABRT_EV4T | 76 | select CPU_ABRT_EV4T |
77 | select CPU_PABRT_LEGACY | ||
78 | select CPU_CACHE_V4WT | 77 | select CPU_CACHE_V4WT |
79 | select CPU_CACHE_VIVT | 78 | select CPU_CACHE_VIVT |
80 | select CPU_CP15_MMU | ||
81 | select CPU_COPY_V4WB if MMU | 79 | select CPU_COPY_V4WB if MMU |
80 | select CPU_CP15_MMU | ||
81 | select CPU_PABRT_LEGACY | ||
82 | select CPU_TLB_V4WBI if MMU | 82 | select CPU_TLB_V4WBI if MMU |
83 | help | 83 | help |
84 | The ARM920T is licensed to be produced by numerous vendors, | 84 | The ARM920T is licensed to be produced by numerous vendors, |
@@ -92,11 +92,11 @@ config CPU_ARM922T | |||
92 | bool "Support ARM922T processor" if ARCH_INTEGRATOR | 92 | bool "Support ARM922T processor" if ARCH_INTEGRATOR |
93 | select CPU_32v4T | 93 | select CPU_32v4T |
94 | select CPU_ABRT_EV4T | 94 | select CPU_ABRT_EV4T |
95 | select CPU_PABRT_LEGACY | ||
96 | select CPU_CACHE_V4WT | 95 | select CPU_CACHE_V4WT |
97 | select CPU_CACHE_VIVT | 96 | select CPU_CACHE_VIVT |
98 | select CPU_CP15_MMU | ||
99 | select CPU_COPY_V4WB if MMU | 97 | select CPU_COPY_V4WB if MMU |
98 | select CPU_CP15_MMU | ||
99 | select CPU_PABRT_LEGACY | ||
100 | select CPU_TLB_V4WBI if MMU | 100 | select CPU_TLB_V4WBI if MMU |
101 | help | 101 | help |
102 | The ARM922T is a version of the ARM920T, but with smaller | 102 | The ARM922T is a version of the ARM920T, but with smaller |
@@ -111,11 +111,11 @@ config CPU_ARM925T | |||
111 | bool "Support ARM925T processor" if ARCH_OMAP1 | 111 | bool "Support ARM925T processor" if ARCH_OMAP1 |
112 | select CPU_32v4T | 112 | select CPU_32v4T |
113 | select CPU_ABRT_EV4T | 113 | select CPU_ABRT_EV4T |
114 | select CPU_PABRT_LEGACY | ||
115 | select CPU_CACHE_V4WT | 114 | select CPU_CACHE_V4WT |
116 | select CPU_CACHE_VIVT | 115 | select CPU_CACHE_VIVT |
117 | select CPU_CP15_MMU | ||
118 | select CPU_COPY_V4WB if MMU | 116 | select CPU_COPY_V4WB if MMU |
117 | select CPU_CP15_MMU | ||
118 | select CPU_PABRT_LEGACY | ||
119 | select CPU_TLB_V4WBI if MMU | 119 | select CPU_TLB_V4WBI if MMU |
120 | help | 120 | help |
121 | The ARM925T is a mix between the ARM920T and ARM926T, but with | 121 | The ARM925T is a mix between the ARM920T and ARM926T, but with |
@@ -130,10 +130,10 @@ config CPU_ARM926T | |||
130 | bool "Support ARM926T processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB | 130 | bool "Support ARM926T processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB |
131 | select CPU_32v5 | 131 | select CPU_32v5 |
132 | select CPU_ABRT_EV5TJ | 132 | select CPU_ABRT_EV5TJ |
133 | select CPU_PABRT_LEGACY | ||
134 | select CPU_CACHE_VIVT | 133 | select CPU_CACHE_VIVT |
135 | select CPU_CP15_MMU | ||
136 | select CPU_COPY_V4WB if MMU | 134 | select CPU_COPY_V4WB if MMU |
135 | select CPU_CP15_MMU | ||
136 | select CPU_PABRT_LEGACY | ||
137 | select CPU_TLB_V4WBI if MMU | 137 | select CPU_TLB_V4WBI if MMU |
138 | help | 138 | help |
139 | This is a variant of the ARM920. It has slightly different | 139 | This is a variant of the ARM920. It has slightly different |
@@ -148,11 +148,11 @@ config CPU_FA526 | |||
148 | bool | 148 | bool |
149 | select CPU_32v4 | 149 | select CPU_32v4 |
150 | select CPU_ABRT_EV4 | 150 | select CPU_ABRT_EV4 |
151 | select CPU_PABRT_LEGACY | ||
152 | select CPU_CACHE_VIVT | ||
153 | select CPU_CP15_MMU | ||
154 | select CPU_CACHE_FA | 151 | select CPU_CACHE_FA |
152 | select CPU_CACHE_VIVT | ||
155 | select CPU_COPY_FA if MMU | 153 | select CPU_COPY_FA if MMU |
154 | select CPU_CP15_MMU | ||
155 | select CPU_PABRT_LEGACY | ||
156 | select CPU_TLB_FA if MMU | 156 | select CPU_TLB_FA if MMU |
157 | help | 157 | help |
158 | The FA526 is a version of the ARMv4 compatible processor with | 158 | The FA526 is a version of the ARMv4 compatible processor with |
@@ -167,9 +167,9 @@ config CPU_ARM940T | |||
167 | depends on !MMU | 167 | depends on !MMU |
168 | select CPU_32v4T | 168 | select CPU_32v4T |
169 | select CPU_ABRT_NOMMU | 169 | select CPU_ABRT_NOMMU |
170 | select CPU_PABRT_LEGACY | ||
171 | select CPU_CACHE_VIVT | 170 | select CPU_CACHE_VIVT |
172 | select CPU_CP15_MPU | 171 | select CPU_CP15_MPU |
172 | select CPU_PABRT_LEGACY | ||
173 | help | 173 | help |
174 | ARM940T is a member of the ARM9TDMI family of general- | 174 | ARM940T is a member of the ARM9TDMI family of general- |
175 | purpose microprocessors with MPU and separate 4KB | 175 | purpose microprocessors with MPU and separate 4KB |
@@ -185,9 +185,9 @@ config CPU_ARM946E | |||
185 | depends on !MMU | 185 | depends on !MMU |
186 | select CPU_32v5 | 186 | select CPU_32v5 |
187 | select CPU_ABRT_NOMMU | 187 | select CPU_ABRT_NOMMU |
188 | select CPU_PABRT_LEGACY | ||
189 | select CPU_CACHE_VIVT | 188 | select CPU_CACHE_VIVT |
190 | select CPU_CP15_MPU | 189 | select CPU_CP15_MPU |
190 | select CPU_PABRT_LEGACY | ||
191 | help | 191 | help |
192 | ARM946E-S is a member of the ARM9E-S family of high- | 192 | ARM946E-S is a member of the ARM9E-S family of high- |
193 | performance, 32-bit system-on-chip processor solutions. | 193 | performance, 32-bit system-on-chip processor solutions. |
@@ -201,11 +201,11 @@ config CPU_ARM1020 | |||
201 | bool "Support ARM1020T (rev 0) processor" if ARCH_INTEGRATOR | 201 | bool "Support ARM1020T (rev 0) processor" if ARCH_INTEGRATOR |
202 | select CPU_32v5 | 202 | select CPU_32v5 |
203 | select CPU_ABRT_EV4T | 203 | select CPU_ABRT_EV4T |
204 | select CPU_PABRT_LEGACY | ||
205 | select CPU_CACHE_V4WT | 204 | select CPU_CACHE_V4WT |
206 | select CPU_CACHE_VIVT | 205 | select CPU_CACHE_VIVT |
207 | select CPU_CP15_MMU | ||
208 | select CPU_COPY_V4WB if MMU | 206 | select CPU_COPY_V4WB if MMU |
207 | select CPU_CP15_MMU | ||
208 | select CPU_PABRT_LEGACY | ||
209 | select CPU_TLB_V4WBI if MMU | 209 | select CPU_TLB_V4WBI if MMU |
210 | help | 210 | help |
211 | The ARM1020 is the 32K cached version of the ARM10 processor, | 211 | The ARM1020 is the 32K cached version of the ARM10 processor, |
@@ -217,25 +217,25 @@ config CPU_ARM1020 | |||
217 | # ARM1020E - needs validating | 217 | # ARM1020E - needs validating |
218 | config CPU_ARM1020E | 218 | config CPU_ARM1020E |
219 | bool "Support ARM1020E processor" if ARCH_INTEGRATOR | 219 | bool "Support ARM1020E processor" if ARCH_INTEGRATOR |
220 | depends on n | ||
220 | select CPU_32v5 | 221 | select CPU_32v5 |
221 | select CPU_ABRT_EV4T | 222 | select CPU_ABRT_EV4T |
222 | select CPU_PABRT_LEGACY | ||
223 | select CPU_CACHE_V4WT | 223 | select CPU_CACHE_V4WT |
224 | select CPU_CACHE_VIVT | 224 | select CPU_CACHE_VIVT |
225 | select CPU_CP15_MMU | ||
226 | select CPU_COPY_V4WB if MMU | 225 | select CPU_COPY_V4WB if MMU |
226 | select CPU_CP15_MMU | ||
227 | select CPU_PABRT_LEGACY | ||
227 | select CPU_TLB_V4WBI if MMU | 228 | select CPU_TLB_V4WBI if MMU |
228 | depends on n | ||
229 | 229 | ||
230 | # ARM1022E | 230 | # ARM1022E |
231 | config CPU_ARM1022 | 231 | config CPU_ARM1022 |
232 | bool "Support ARM1022E processor" if ARCH_INTEGRATOR | 232 | bool "Support ARM1022E processor" if ARCH_INTEGRATOR |
233 | select CPU_32v5 | 233 | select CPU_32v5 |
234 | select CPU_ABRT_EV4T | 234 | select CPU_ABRT_EV4T |
235 | select CPU_PABRT_LEGACY | ||
236 | select CPU_CACHE_VIVT | 235 | select CPU_CACHE_VIVT |
237 | select CPU_CP15_MMU | ||
238 | select CPU_COPY_V4WB if MMU # can probably do better | 236 | select CPU_COPY_V4WB if MMU # can probably do better |
237 | select CPU_CP15_MMU | ||
238 | select CPU_PABRT_LEGACY | ||
239 | select CPU_TLB_V4WBI if MMU | 239 | select CPU_TLB_V4WBI if MMU |
240 | help | 240 | help |
241 | The ARM1022E is an implementation of the ARMv5TE architecture | 241 | The ARM1022E is an implementation of the ARMv5TE architecture |
@@ -250,10 +250,10 @@ config CPU_ARM1026 | |||
250 | bool "Support ARM1026EJ-S processor" if ARCH_INTEGRATOR | 250 | bool "Support ARM1026EJ-S processor" if ARCH_INTEGRATOR |
251 | select CPU_32v5 | 251 | select CPU_32v5 |
252 | select CPU_ABRT_EV5T # But need Jazelle, but EV5TJ ignores bit 10 | 252 | select CPU_ABRT_EV5T # But need Jazelle, but EV5TJ ignores bit 10 |
253 | select CPU_PABRT_LEGACY | ||
254 | select CPU_CACHE_VIVT | 253 | select CPU_CACHE_VIVT |
255 | select CPU_CP15_MMU | ||
256 | select CPU_COPY_V4WB if MMU # can probably do better | 254 | select CPU_COPY_V4WB if MMU # can probably do better |
255 | select CPU_CP15_MMU | ||
256 | select CPU_PABRT_LEGACY | ||
257 | select CPU_TLB_V4WBI if MMU | 257 | select CPU_TLB_V4WBI if MMU |
258 | help | 258 | help |
259 | The ARM1026EJ-S is an implementation of the ARMv5TEJ architecture | 259 | The ARM1026EJ-S is an implementation of the ARMv5TEJ architecture |
@@ -268,11 +268,11 @@ config CPU_SA110 | |||
268 | select CPU_32v3 if ARCH_RPC | 268 | select CPU_32v3 if ARCH_RPC |
269 | select CPU_32v4 if !ARCH_RPC | 269 | select CPU_32v4 if !ARCH_RPC |
270 | select CPU_ABRT_EV4 | 270 | select CPU_ABRT_EV4 |
271 | select CPU_PABRT_LEGACY | ||
272 | select CPU_CACHE_V4WB | 271 | select CPU_CACHE_V4WB |
273 | select CPU_CACHE_VIVT | 272 | select CPU_CACHE_VIVT |
274 | select CPU_CP15_MMU | ||
275 | select CPU_COPY_V4WB if MMU | 273 | select CPU_COPY_V4WB if MMU |
274 | select CPU_CP15_MMU | ||
275 | select CPU_PABRT_LEGACY | ||
276 | select CPU_TLB_V4WB if MMU | 276 | select CPU_TLB_V4WB if MMU |
277 | help | 277 | help |
278 | The Intel StrongARM(R) SA-110 is a 32-bit microprocessor and | 278 | The Intel StrongARM(R) SA-110 is a 32-bit microprocessor and |
@@ -288,10 +288,10 @@ config CPU_SA1100 | |||
288 | bool | 288 | bool |
289 | select CPU_32v4 | 289 | select CPU_32v4 |
290 | select CPU_ABRT_EV4 | 290 | select CPU_ABRT_EV4 |
291 | select CPU_PABRT_LEGACY | ||
292 | select CPU_CACHE_V4WB | 291 | select CPU_CACHE_V4WB |
293 | select CPU_CACHE_VIVT | 292 | select CPU_CACHE_VIVT |
294 | select CPU_CP15_MMU | 293 | select CPU_CP15_MMU |
294 | select CPU_PABRT_LEGACY | ||
295 | select CPU_TLB_V4WB if MMU | 295 | select CPU_TLB_V4WB if MMU |
296 | 296 | ||
297 | # XScale | 297 | # XScale |
@@ -299,9 +299,9 @@ config CPU_XSCALE | |||
299 | bool | 299 | bool |
300 | select CPU_32v5 | 300 | select CPU_32v5 |
301 | select CPU_ABRT_EV5T | 301 | select CPU_ABRT_EV5T |
302 | select CPU_PABRT_LEGACY | ||
303 | select CPU_CACHE_VIVT | 302 | select CPU_CACHE_VIVT |
304 | select CPU_CP15_MMU | 303 | select CPU_CP15_MMU |
304 | select CPU_PABRT_LEGACY | ||
305 | select CPU_TLB_V4WBI if MMU | 305 | select CPU_TLB_V4WBI if MMU |
306 | 306 | ||
307 | # XScale Core Version 3 | 307 | # XScale Core Version 3 |
@@ -309,9 +309,9 @@ config CPU_XSC3 | |||
309 | bool | 309 | bool |
310 | select CPU_32v5 | 310 | select CPU_32v5 |
311 | select CPU_ABRT_EV5T | 311 | select CPU_ABRT_EV5T |
312 | select CPU_PABRT_LEGACY | ||
313 | select CPU_CACHE_VIVT | 312 | select CPU_CACHE_VIVT |
314 | select CPU_CP15_MMU | 313 | select CPU_CP15_MMU |
314 | select CPU_PABRT_LEGACY | ||
315 | select CPU_TLB_V4WBI if MMU | 315 | select CPU_TLB_V4WBI if MMU |
316 | select IO_36 | 316 | select IO_36 |
317 | 317 | ||
@@ -320,21 +320,21 @@ config CPU_MOHAWK | |||
320 | bool | 320 | bool |
321 | select CPU_32v5 | 321 | select CPU_32v5 |
322 | select CPU_ABRT_EV5T | 322 | select CPU_ABRT_EV5T |
323 | select CPU_PABRT_LEGACY | ||
324 | select CPU_CACHE_VIVT | 323 | select CPU_CACHE_VIVT |
324 | select CPU_COPY_V4WB if MMU | ||
325 | select CPU_CP15_MMU | 325 | select CPU_CP15_MMU |
326 | select CPU_PABRT_LEGACY | ||
326 | select CPU_TLB_V4WBI if MMU | 327 | select CPU_TLB_V4WBI if MMU |
327 | select CPU_COPY_V4WB if MMU | ||
328 | 328 | ||
329 | # Feroceon | 329 | # Feroceon |
330 | config CPU_FEROCEON | 330 | config CPU_FEROCEON |
331 | bool | 331 | bool |
332 | select CPU_32v5 | 332 | select CPU_32v5 |
333 | select CPU_ABRT_EV5T | 333 | select CPU_ABRT_EV5T |
334 | select CPU_PABRT_LEGACY | ||
335 | select CPU_CACHE_VIVT | 334 | select CPU_CACHE_VIVT |
336 | select CPU_CP15_MMU | ||
337 | select CPU_COPY_FEROCEON if MMU | 335 | select CPU_COPY_FEROCEON if MMU |
336 | select CPU_CP15_MMU | ||
337 | select CPU_PABRT_LEGACY | ||
338 | select CPU_TLB_FEROCEON if MMU | 338 | select CPU_TLB_FEROCEON if MMU |
339 | 339 | ||
340 | config CPU_FEROCEON_OLD_ID | 340 | config CPU_FEROCEON_OLD_ID |
@@ -349,20 +349,20 @@ config CPU_FEROCEON_OLD_ID | |||
349 | # Marvell PJ4 | 349 | # Marvell PJ4 |
350 | config CPU_PJ4 | 350 | config CPU_PJ4 |
351 | bool | 351 | bool |
352 | select CPU_V7 | ||
353 | select ARM_THUMBEE | 352 | select ARM_THUMBEE |
353 | select CPU_V7 | ||
354 | 354 | ||
355 | # ARMv6 | 355 | # ARMv6 |
356 | config CPU_V6 | 356 | config CPU_V6 |
357 | bool "Support ARM V6 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX | 357 | bool "Support ARM V6 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX |
358 | select CPU_32v6 | 358 | select CPU_32v6 |
359 | select CPU_ABRT_EV6 | 359 | select CPU_ABRT_EV6 |
360 | select CPU_PABRT_V6 | ||
361 | select CPU_CACHE_V6 | 360 | select CPU_CACHE_V6 |
362 | select CPU_CACHE_VIPT | 361 | select CPU_CACHE_VIPT |
362 | select CPU_COPY_V6 if MMU | ||
363 | select CPU_CP15_MMU | 363 | select CPU_CP15_MMU |
364 | select CPU_HAS_ASID if MMU | 364 | select CPU_HAS_ASID if MMU |
365 | select CPU_COPY_V6 if MMU | 365 | select CPU_PABRT_V6 |
366 | select CPU_TLB_V6 if MMU | 366 | select CPU_TLB_V6 if MMU |
367 | 367 | ||
368 | # ARMv6k | 368 | # ARMv6k |
@@ -371,12 +371,12 @@ config CPU_V6K | |||
371 | select CPU_32v6 | 371 | select CPU_32v6 |
372 | select CPU_32v6K | 372 | select CPU_32v6K |
373 | select CPU_ABRT_EV6 | 373 | select CPU_ABRT_EV6 |
374 | select CPU_PABRT_V6 | ||
375 | select CPU_CACHE_V6 | 374 | select CPU_CACHE_V6 |
376 | select CPU_CACHE_VIPT | 375 | select CPU_CACHE_VIPT |
376 | select CPU_COPY_V6 if MMU | ||
377 | select CPU_CP15_MMU | 377 | select CPU_CP15_MMU |
378 | select CPU_HAS_ASID if MMU | 378 | select CPU_HAS_ASID if MMU |
379 | select CPU_COPY_V6 if MMU | 379 | select CPU_PABRT_V6 |
380 | select CPU_TLB_V6 if MMU | 380 | select CPU_TLB_V6 if MMU |
381 | 381 | ||
382 | # ARMv7 | 382 | # ARMv7 |
@@ -385,44 +385,44 @@ config CPU_V7 | |||
385 | select CPU_32v6K | 385 | select CPU_32v6K |
386 | select CPU_32v7 | 386 | select CPU_32v7 |
387 | select CPU_ABRT_EV7 | 387 | select CPU_ABRT_EV7 |
388 | select CPU_PABRT_V7 | ||
389 | select CPU_CACHE_V7 | 388 | select CPU_CACHE_V7 |
390 | select CPU_CACHE_VIPT | 389 | select CPU_CACHE_VIPT |
390 | select CPU_COPY_V6 if MMU | ||
391 | select CPU_CP15_MMU | 391 | select CPU_CP15_MMU |
392 | select CPU_HAS_ASID if MMU | 392 | select CPU_HAS_ASID if MMU |
393 | select CPU_COPY_V6 if MMU | 393 | select CPU_PABRT_V7 |
394 | select CPU_TLB_V7 if MMU | 394 | select CPU_TLB_V7 if MMU |
395 | 395 | ||
396 | # Figure out what processor architecture version we should be using. | 396 | # Figure out what processor architecture version we should be using. |
397 | # This defines the compiler instruction set which depends on the machine type. | 397 | # This defines the compiler instruction set which depends on the machine type. |
398 | config CPU_32v3 | 398 | config CPU_32v3 |
399 | bool | 399 | bool |
400 | select TLS_REG_EMUL if SMP || !MMU | ||
401 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP | ||
402 | select CPU_USE_DOMAINS if MMU | 400 | select CPU_USE_DOMAINS if MMU |
401 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP | ||
402 | select TLS_REG_EMUL if SMP || !MMU | ||
403 | 403 | ||
404 | config CPU_32v4 | 404 | config CPU_32v4 |
405 | bool | 405 | bool |
406 | select TLS_REG_EMUL if SMP || !MMU | ||
407 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP | ||
408 | select CPU_USE_DOMAINS if MMU | 406 | select CPU_USE_DOMAINS if MMU |
407 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP | ||
408 | select TLS_REG_EMUL if SMP || !MMU | ||
409 | 409 | ||
410 | config CPU_32v4T | 410 | config CPU_32v4T |
411 | bool | 411 | bool |
412 | select TLS_REG_EMUL if SMP || !MMU | ||
413 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP | ||
414 | select CPU_USE_DOMAINS if MMU | 412 | select CPU_USE_DOMAINS if MMU |
413 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP | ||
414 | select TLS_REG_EMUL if SMP || !MMU | ||
415 | 415 | ||
416 | config CPU_32v5 | 416 | config CPU_32v5 |
417 | bool | 417 | bool |
418 | select TLS_REG_EMUL if SMP || !MMU | ||
419 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP | ||
420 | select CPU_USE_DOMAINS if MMU | 418 | select CPU_USE_DOMAINS if MMU |
419 | select NEEDS_SYSCALL_FOR_CMPXCHG if SMP | ||
420 | select TLS_REG_EMUL if SMP || !MMU | ||
421 | 421 | ||
422 | config CPU_32v6 | 422 | config CPU_32v6 |
423 | bool | 423 | bool |
424 | select TLS_REG_EMUL if !CPU_32v6K && !MMU | ||
425 | select CPU_USE_DOMAINS if CPU_V6 && MMU | 424 | select CPU_USE_DOMAINS if CPU_V6 && MMU |
425 | select TLS_REG_EMUL if !CPU_32v6K && !MMU | ||
426 | 426 | ||
427 | config CPU_32v6K | 427 | config CPU_32v6K |
428 | bool | 428 | bool |
@@ -644,8 +644,8 @@ config ARM_VIRT_EXT | |||
644 | config SWP_EMULATE | 644 | config SWP_EMULATE |
645 | bool "Emulate SWP/SWPB instructions" | 645 | bool "Emulate SWP/SWPB instructions" |
646 | depends on !CPU_USE_DOMAINS && CPU_V7 | 646 | depends on !CPU_USE_DOMAINS && CPU_V7 |
647 | select HAVE_PROC_CPU if PROC_FS | ||
648 | default y if SMP | 647 | default y if SMP |
648 | select HAVE_PROC_CPU if PROC_FS | ||
649 | help | 649 | help |
650 | ARMv6 architecture deprecates use of the SWP/SWPB instructions. | 650 | ARMv6 architecture deprecates use of the SWP/SWPB instructions. |
651 | ARMv7 multiprocessing extensions introduce the ability to disable | 651 | ARMv7 multiprocessing extensions introduce the ability to disable |
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig index baf9064c0844..88e1e2e7a20d 100644 --- a/arch/arm/plat-mxc/Kconfig +++ b/arch/arm/plat-mxc/Kconfig | |||
@@ -10,16 +10,16 @@ choice | |||
10 | 10 | ||
11 | config ARCH_IMX_V4_V5 | 11 | config ARCH_IMX_V4_V5 |
12 | bool "i.MX1, i.MX21, i.MX25, i.MX27" | 12 | bool "i.MX1, i.MX21, i.MX25, i.MX27" |
13 | select AUTO_ZRELADDR if !ZBOOT_ROM | ||
14 | select ARM_PATCH_PHYS_VIRT | 13 | select ARM_PATCH_PHYS_VIRT |
14 | select AUTO_ZRELADDR if !ZBOOT_ROM | ||
15 | help | 15 | help |
16 | This enables support for systems based on the Freescale i.MX ARMv4 | 16 | This enables support for systems based on the Freescale i.MX ARMv4 |
17 | and ARMv5 SoCs | 17 | and ARMv5 SoCs |
18 | 18 | ||
19 | config ARCH_IMX_V6_V7 | 19 | config ARCH_IMX_V6_V7 |
20 | bool "i.MX3, i.MX5, i.MX6" | 20 | bool "i.MX3, i.MX5, i.MX6" |
21 | select AUTO_ZRELADDR if !ZBOOT_ROM | ||
22 | select ARM_PATCH_PHYS_VIRT | 21 | select ARM_PATCH_PHYS_VIRT |
22 | select AUTO_ZRELADDR if !ZBOOT_ROM | ||
23 | select MIGHT_HAVE_CACHE_L2X0 | 23 | select MIGHT_HAVE_CACHE_L2X0 |
24 | help | 24 | help |
25 | This enables support for systems based on the Freescale i.MX3, i.MX5 | 25 | This enables support for systems based on the Freescale i.MX3, i.MX5 |
diff --git a/arch/arm/plat-mxc/devices/Kconfig b/arch/arm/plat-mxc/devices/Kconfig index 6b46cee2f9cd..a35d9841f494 100644 --- a/arch/arm/plat-mxc/devices/Kconfig +++ b/arch/arm/plat-mxc/devices/Kconfig | |||
@@ -3,8 +3,8 @@ config IMX_HAVE_PLATFORM_FEC | |||
3 | default y if ARCH_MX25 || SOC_IMX27 || SOC_IMX35 || SOC_IMX50 || SOC_IMX51 || SOC_IMX53 | 3 | default y if ARCH_MX25 || SOC_IMX27 || SOC_IMX35 || SOC_IMX50 || SOC_IMX51 || SOC_IMX53 |
4 | 4 | ||
5 | config IMX_HAVE_PLATFORM_FLEXCAN | 5 | config IMX_HAVE_PLATFORM_FLEXCAN |
6 | select HAVE_CAN_FLEXCAN if CAN | ||
7 | bool | 6 | bool |
7 | select HAVE_CAN_FLEXCAN if CAN | ||
8 | 8 | ||
9 | config IMX_HAVE_PLATFORM_FSL_USB2_UDC | 9 | config IMX_HAVE_PLATFORM_FSL_USB2_UDC |
10 | bool | 10 | bool |
diff --git a/arch/arm/plat-nomadik/Kconfig b/arch/arm/plat-nomadik/Kconfig index 4c48c8b60b54..19f55cae5d73 100644 --- a/arch/arm/plat-nomadik/Kconfig +++ b/arch/arm/plat-nomadik/Kconfig | |||
@@ -5,8 +5,8 @@ | |||
5 | config PLAT_NOMADIK | 5 | config PLAT_NOMADIK |
6 | bool | 6 | bool |
7 | depends on ARCH_NOMADIK || ARCH_U8500 | 7 | depends on ARCH_NOMADIK || ARCH_U8500 |
8 | select CLKSRC_MMIO | ||
9 | default y | 8 | default y |
9 | select CLKSRC_MMIO | ||
10 | help | 10 | help |
11 | Common platform code for Nomadik and other ST-Ericsson | 11 | Common platform code for Nomadik and other ST-Ericsson |
12 | platforms. | 12 | platforms. |
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig index c9d1c3603bbf..7cd56ed5cd94 100644 --- a/arch/arm/plat-omap/Kconfig +++ b/arch/arm/plat-omap/Kconfig | |||
@@ -14,10 +14,10 @@ config ARCH_OMAP1 | |||
14 | select CLKDEV_LOOKUP | 14 | select CLKDEV_LOOKUP |
15 | select CLKSRC_MMIO | 15 | select CLKSRC_MMIO |
16 | select GENERIC_IRQ_CHIP | 16 | select GENERIC_IRQ_CHIP |
17 | select IRQ_DOMAIN | ||
18 | select HAVE_IDE | 17 | select HAVE_IDE |
19 | select NEED_MACH_MEMORY_H | 18 | select IRQ_DOMAIN |
20 | select NEED_MACH_IO_H if PCCARD | 19 | select NEED_MACH_IO_H if PCCARD |
20 | select NEED_MACH_MEMORY_H | ||
21 | help | 21 | help |
22 | "Systems based on omap7xx, omap15xx or omap16xx" | 22 | "Systems based on omap7xx, omap15xx or omap16xx" |
23 | 23 | ||
@@ -25,10 +25,10 @@ config ARCH_OMAP2PLUS | |||
25 | bool "TI OMAP2/3/4" | 25 | bool "TI OMAP2/3/4" |
26 | select CLKDEV_LOOKUP | 26 | select CLKDEV_LOOKUP |
27 | select GENERIC_IRQ_CHIP | 27 | select GENERIC_IRQ_CHIP |
28 | select SPARSE_IRQ | ||
29 | select OMAP_DM_TIMER | 28 | select OMAP_DM_TIMER |
30 | select USE_OF | ||
31 | select PROC_DEVICETREE if PROC_FS | 29 | select PROC_DEVICETREE if PROC_FS |
30 | select SPARSE_IRQ | ||
31 | select USE_OF | ||
32 | help | 32 | help |
33 | "Systems based on OMAP2, OMAP3, OMAP4 or OMAP5" | 33 | "Systems based on OMAP2, OMAP3, OMAP4 or OMAP5" |
34 | 34 | ||
@@ -43,8 +43,8 @@ config OMAP_DEBUG_DEVICES | |||
43 | 43 | ||
44 | config OMAP_DEBUG_LEDS | 44 | config OMAP_DEBUG_LEDS |
45 | def_bool y if NEW_LEDS | 45 | def_bool y if NEW_LEDS |
46 | select LEDS_CLASS | ||
47 | depends on OMAP_DEBUG_DEVICES | 46 | depends on OMAP_DEBUG_DEVICES |
47 | select LEDS_CLASS | ||
48 | 48 | ||
49 | config POWER_AVS_OMAP | 49 | config POWER_AVS_OMAP |
50 | bool "AVS(Adaptive Voltage Scaling) support for OMAP IP versions 1&2" | 50 | bool "AVS(Adaptive Voltage Scaling) support for OMAP IP versions 1&2" |
diff --git a/arch/arm/plat-s3c24xx/Kconfig b/arch/arm/plat-s3c24xx/Kconfig index 21bf6adb9198..eef3b6a2f8a8 100644 --- a/arch/arm/plat-s3c24xx/Kconfig +++ b/arch/arm/plat-s3c24xx/Kconfig | |||
@@ -6,8 +6,8 @@ config PLAT_S3C24XX | |||
6 | bool | 6 | bool |
7 | depends on ARCH_S3C24XX | 7 | depends on ARCH_S3C24XX |
8 | default y | 8 | default y |
9 | select NO_IOPORT | ||
10 | select ARCH_REQUIRE_GPIOLIB | 9 | select ARCH_REQUIRE_GPIOLIB |
10 | select NO_IOPORT | ||
11 | select S3C_DEV_NAND | 11 | select S3C_DEV_NAND |
12 | help | 12 | help |
13 | Base platform code for any Samsung S3C24XX device | 13 | Base platform code for any Samsung S3C24XX device |
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index 9c3b90c3538e..59401e1cc530 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig | |||
@@ -7,9 +7,9 @@ | |||
7 | config PLAT_SAMSUNG | 7 | config PLAT_SAMSUNG |
8 | bool | 8 | bool |
9 | depends on PLAT_S3C24XX || ARCH_S3C64XX || PLAT_S5P | 9 | depends on PLAT_S3C24XX || ARCH_S3C64XX || PLAT_S5P |
10 | select NO_IOPORT | ||
11 | select GENERIC_IRQ_CHIP | ||
12 | default y | 10 | default y |
11 | select GENERIC_IRQ_CHIP | ||
12 | select NO_IOPORT | ||
13 | help | 13 | help |
14 | Base platform code for all Samsung SoC based systems | 14 | Base platform code for all Samsung SoC based systems |
15 | 15 | ||
@@ -17,16 +17,16 @@ config PLAT_S5P | |||
17 | bool | 17 | bool |
18 | depends on (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS) | 18 | depends on (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS) |
19 | default y | 19 | default y |
20 | select ARM_VIC if !ARCH_EXYNOS | 20 | select ARCH_REQUIRE_GPIOLIB |
21 | select ARM_GIC if ARCH_EXYNOS | 21 | select ARM_GIC if ARCH_EXYNOS |
22 | select ARM_VIC if !ARCH_EXYNOS | ||
22 | select GIC_NON_BANKED if ARCH_EXYNOS4 | 23 | select GIC_NON_BANKED if ARCH_EXYNOS4 |
23 | select NO_IOPORT | 24 | select NO_IOPORT |
24 | select ARCH_REQUIRE_GPIOLIB | 25 | select PLAT_SAMSUNG |
25 | select S3C_GPIO_TRACK | 26 | select S3C_GPIO_TRACK |
26 | select S5P_GPIO_DRVSTR | 27 | select S5P_GPIO_DRVSTR |
27 | select SAMSUNG_GPIOLIB_4BIT | ||
28 | select PLAT_SAMSUNG | ||
29 | select SAMSUNG_CLKSRC | 28 | select SAMSUNG_CLKSRC |
29 | select SAMSUNG_GPIOLIB_4BIT | ||
30 | select SAMSUNG_IRQ_VIC_TIMER | 30 | select SAMSUNG_IRQ_VIC_TIMER |
31 | help | 31 | help |
32 | Base platform code for Samsung's S5P series SoC. | 32 | Base platform code for Samsung's S5P series SoC. |
@@ -423,10 +423,10 @@ config S3C_DMA | |||
423 | 423 | ||
424 | config SAMSUNG_DMADEV | 424 | config SAMSUNG_DMADEV |
425 | bool | 425 | bool |
426 | select ARM_AMBA | ||
426 | select DMADEVICES | 427 | select DMADEVICES |
427 | select PL330_DMA if (ARCH_EXYNOS5 || ARCH_EXYNOS4 || CPU_S5PV210 || CPU_S5PC100 || \ | 428 | select PL330_DMA if (ARCH_EXYNOS5 || ARCH_EXYNOS4 || CPU_S5PV210 || CPU_S5PC100 || \ |
428 | CPU_S5P6450 || CPU_S5P6440) | 429 | CPU_S5P6450 || CPU_S5P6440) |
429 | select ARM_AMBA | ||
430 | help | 430 | help |
431 | Use DMA device engine for PL330 DMAC. | 431 | Use DMA device engine for PL330 DMAC. |
432 | 432 | ||
diff --git a/arch/arm/plat-spear/Kconfig b/arch/arm/plat-spear/Kconfig index 4404f82d5979..f8db7b2deb36 100644 --- a/arch/arm/plat-spear/Kconfig +++ b/arch/arm/plat-spear/Kconfig | |||
@@ -12,10 +12,10 @@ config ARCH_SPEAR13XX | |||
12 | bool "ST SPEAr13xx with Device Tree" | 12 | bool "ST SPEAr13xx with Device Tree" |
13 | select ARM_GIC | 13 | select ARM_GIC |
14 | select CPU_V7 | 14 | select CPU_V7 |
15 | select USE_OF | ||
16 | select HAVE_SMP | 15 | select HAVE_SMP |
17 | select MIGHT_HAVE_CACHE_L2X0 | 16 | select MIGHT_HAVE_CACHE_L2X0 |
18 | select PINCTRL | 17 | select PINCTRL |
18 | select USE_OF | ||
19 | help | 19 | help |
20 | Supports for ARM's SPEAR13XX family | 20 | Supports for ARM's SPEAR13XX family |
21 | 21 | ||
@@ -23,8 +23,8 @@ config ARCH_SPEAR3XX | |||
23 | bool "ST SPEAr3xx with Device Tree" | 23 | bool "ST SPEAr3xx with Device Tree" |
24 | select ARM_VIC | 24 | select ARM_VIC |
25 | select CPU_ARM926T | 25 | select CPU_ARM926T |
26 | select USE_OF | ||
27 | select PINCTRL | 26 | select PINCTRL |
27 | select USE_OF | ||
28 | help | 28 | help |
29 | Supports for ARM's SPEAR3XX family | 29 | Supports for ARM's SPEAR3XX family |
30 | 30 | ||