diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 16:42:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 16:42:43 -0400 |
commit | 2cf4d4514d5b43c1f3b64bd0ec8b9853bde8f1dc (patch) | |
tree | e35a625496acc6ac852846d40b8851186b9d1ac4 /arch/arm/mm/Kconfig | |
parent | 44b7532b8b464f606053562400719c9c21276037 (diff) | |
parent | ce53895a5d24e0ee19fb92f56c17323fb4c9ab27 (diff) |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (417 commits)
MAINTAINERS: EB110ATX is not ebsa110
MAINTAINERS: update Eric Miao's email address and status
fb: add support of LCD display controller on pxa168/910 (base layer)
[ARM] 5552/1: ep93xx get_uart_rate(): use EP93XX_SYSCON_PWRCNT and EP93XX_SYSCON_PWRCN
[ARM] pxa/sharpsl_pm: zaurus needs generic pxa suspend/resume routines
[ARM] 5544/1: Trust PrimeCell resource sizes
[ARM] pxa/sharpsl_pm: cleanup of gpio-related code.
[ARM] pxa/sharpsl_pm: drop set_irq_type calls
[ARM] pxa/sharpsl_pm: merge pxa-specific code into generic one
[ARM] pxa/sharpsl_pm: merge the two sharpsl_pm.c since it's now pxa specific
[ARM] sa1100: remove unused collie_pm.c
[ARM] pxa: fix the conflicting non-static declarations of global_gpios[]
[ARM] 5550/1: Add default configure file for w90p910 platform
[ARM] 5549/1: Add clock api for w90p910 platform.
[ARM] 5548/1: Add gpio api for w90p910 platform
[ARM] 5551/1: Add multi-function pin api for w90p910 platform.
[ARM] Make ARM_VIC_NR depend on ARM_VIC
[ARM] 5546/1: ARM PL022 SSP/SPI driver v3
ARM: OMAP4: SMP: Update defconfig for OMAP4430
ARM: OMAP4: SMP: Enable SMP support for OMAP4430
...
Diffstat (limited to 'arch/arm/mm/Kconfig')
-rw-r--r-- | arch/arm/mm/Kconfig | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 20979564e7e..83c025e72ce 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
@@ -391,7 +391,7 @@ config CPU_FEROCEON_OLD_ID | |||
391 | 391 | ||
392 | # ARMv6 | 392 | # ARMv6 |
393 | config CPU_V6 | 393 | config CPU_V6 |
394 | bool "Support ARM V6 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB | 394 | bool "Support ARM V6 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX |
395 | select CPU_32v6 | 395 | select CPU_32v6 |
396 | select CPU_ABRT_EV6 | 396 | select CPU_ABRT_EV6 |
397 | select CPU_PABRT_NOIFAR | 397 | select CPU_PABRT_NOIFAR |
@@ -416,7 +416,7 @@ config CPU_32v6K | |||
416 | 416 | ||
417 | # ARMv7 | 417 | # ARMv7 |
418 | config CPU_V7 | 418 | config CPU_V7 |
419 | bool "Support ARM V7 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB | 419 | bool "Support ARM V7 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX |
420 | select CPU_32v6K | 420 | select CPU_32v6K |
421 | select CPU_32v7 | 421 | select CPU_32v7 |
422 | select CPU_ABRT_EV7 | 422 | select CPU_ABRT_EV7 |
@@ -639,10 +639,23 @@ config CPU_BIG_ENDIAN | |||
639 | port must properly enable any big-endian related features | 639 | port must properly enable any big-endian related features |
640 | of your chipset/board/processor. | 640 | of your chipset/board/processor. |
641 | 641 | ||
642 | config CPU_ENDIAN_BE8 | ||
643 | bool | ||
644 | depends on CPU_BIG_ENDIAN | ||
645 | default CPU_V6 || CPU_V7 | ||
646 | help | ||
647 | Support for the BE-8 (big-endian) mode on ARMv6 and ARMv7 processors. | ||
648 | |||
649 | config CPU_ENDIAN_BE32 | ||
650 | bool | ||
651 | depends on CPU_BIG_ENDIAN | ||
652 | default !CPU_ENDIAN_BE8 | ||
653 | help | ||
654 | Support for the BE-32 (big-endian) mode on pre-ARMv6 processors. | ||
655 | |||
642 | config CPU_HIGH_VECTOR | 656 | config CPU_HIGH_VECTOR |
643 | depends on !MMU && CPU_CP15 && !CPU_ARM740T | 657 | depends on !MMU && CPU_CP15 && !CPU_ARM740T |
644 | bool "Select the High exception vector" | 658 | bool "Select the High exception vector" |
645 | default n | ||
646 | help | 659 | help |
647 | Say Y here to select high exception vector(0xFFFF0000~). | 660 | Say Y here to select high exception vector(0xFFFF0000~). |
648 | The exception vector can be vary depending on the platform | 661 | The exception vector can be vary depending on the platform |
@@ -726,7 +739,6 @@ config NEEDS_SYSCALL_FOR_CMPXCHG | |||
726 | 739 | ||
727 | config OUTER_CACHE | 740 | config OUTER_CACHE |
728 | bool | 741 | bool |
729 | default n | ||
730 | 742 | ||
731 | config CACHE_FEROCEON_L2 | 743 | config CACHE_FEROCEON_L2 |
732 | bool "Enable the Feroceon L2 cache controller" | 744 | bool "Enable the Feroceon L2 cache controller" |
@@ -739,7 +751,6 @@ config CACHE_FEROCEON_L2 | |||
739 | config CACHE_FEROCEON_L2_WRITETHROUGH | 751 | config CACHE_FEROCEON_L2_WRITETHROUGH |
740 | bool "Force Feroceon L2 cache write through" | 752 | bool "Force Feroceon L2 cache write through" |
741 | depends on CACHE_FEROCEON_L2 | 753 | depends on CACHE_FEROCEON_L2 |
742 | default n | ||
743 | help | 754 | help |
744 | Say Y here to use the Feroceon L2 cache in writethrough mode. | 755 | Say Y here to use the Feroceon L2 cache in writethrough mode. |
745 | Unless you specifically require this, say N for writeback mode. | 756 | Unless you specifically require this, say N for writeback mode. |
@@ -747,7 +758,7 @@ config CACHE_FEROCEON_L2_WRITETHROUGH | |||
747 | config CACHE_L2X0 | 758 | config CACHE_L2X0 |
748 | bool "Enable the L2x0 outer cache controller" | 759 | bool "Enable the L2x0 outer cache controller" |
749 | depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \ | 760 | depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \ |
750 | REALVIEW_EB_A9MP || ARCH_MX35 || ARCH_MX31 | 761 | REALVIEW_EB_A9MP || ARCH_MX35 || ARCH_MX31 || MACH_REALVIEW_PBX |
751 | default y | 762 | default y |
752 | select OUTER_CACHE | 763 | select OUTER_CACHE |
753 | help | 764 | help |