aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-02-25 17:09:41 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-02-25 17:09:41 -0500
commit2741ecb4ce5c2d430b5c44b0a169038338c21df5 (patch)
tree4aa71d7551184ee88f32c7f3660d821133058c32 /arch/arm/Kconfig
parentbc85e585c6d0fab4bde12d60964b2f25802c3163 (diff)
parent5de813b6cd06460b337f9da9afe316823cf3ef45 (diff)
Merge branch 'misc2' into devel
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig24
1 files changed, 24 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 100b90f3778a..e932da033499 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -12,6 +12,7 @@ config ARM
12 select HAVE_IDE 12 select HAVE_IDE
13 select RTC_LIB 13 select RTC_LIB
14 select SYS_SUPPORTS_APM_EMULATION 14 select SYS_SUPPORTS_APM_EMULATION
15 select GENERIC_ATOMIC64 if (!CPU_32v6K)
15 select HAVE_OPROFILE 16 select HAVE_OPROFILE
16 select HAVE_ARCH_KGDB 17 select HAVE_ARCH_KGDB
17 select HAVE_KPROBES if (!XIP_KERNEL) 18 select HAVE_KPROBES if (!XIP_KERNEL)
@@ -54,6 +55,9 @@ config HAVE_TCM
54 bool 55 bool
55 select GENERIC_ALLOCATOR 56 select GENERIC_ALLOCATOR
56 57
58config HAVE_PROC_CPU
59 bool
60
57config NO_IOPORT 61config NO_IOPORT
58 bool 62 bool
59 63
@@ -163,6 +167,11 @@ config ARCH_MTD_XIP
163config GENERIC_HARDIRQS_NO__DO_IRQ 167config GENERIC_HARDIRQS_NO__DO_IRQ
164 def_bool y 168 def_bool y
165 169
170config ARM_L1_CACHE_SHIFT_6
171 bool
172 help
173 Setting ARM L1 cache line size to 64 Bytes.
174
166if OPROFILE 175if OPROFILE
167 176
168config OPROFILE_ARMV6 177config OPROFILE_ARMV6
@@ -649,6 +658,7 @@ config ARCH_S5PC1XX
649 select GENERIC_GPIO 658 select GENERIC_GPIO
650 select HAVE_CLK 659 select HAVE_CLK
651 select CPU_V7 660 select CPU_V7
661 select ARM_L1_CACHE_SHIFT_6
652 help 662 help
653 Samsung S5PC1XX series based systems 663 Samsung S5PC1XX series based systems
654 664
@@ -938,6 +948,19 @@ config ARM_ERRATA_460075
938 ACTLR register. Note that setting specific bits in the ACTLR register 948 ACTLR register. Note that setting specific bits in the ACTLR register
939 may not be available in non-secure mode. 949 may not be available in non-secure mode.
940 950
951config PL310_ERRATA_588369
952 bool "Clean & Invalidate maintenance operations do not invalidate clean lines"
953 depends on CACHE_L2X0 && ARCH_OMAP4
954 help
955 The PL310 L2 cache controller implements three types of Clean &
956 Invalidate maintenance operations: by Physical Address
957 (offset 0x7F0), by Index/Way (0x7F8) and by Way (0x7FC).
958 They are architecturally defined to behave as the execution of a
959 clean operation followed immediately by an invalidate operation,
960 both performing to the same memory location. This functionality
961 is not correctly implemented in PL310 as clean lines are not
962 invalidated as a result of these operations. Note that this errata
963 uses Texas Instrument's secure monitor api.
941endmenu 964endmenu
942 965
943source "arch/arm/common/Kconfig" 966source "arch/arm/common/Kconfig"
@@ -1255,6 +1278,7 @@ config ALIGNMENT_TRAP
1255 bool 1278 bool
1256 depends on CPU_CP15_MMU 1279 depends on CPU_CP15_MMU
1257 default y if !ARCH_EBSA110 1280 default y if !ARCH_EBSA110
1281 select HAVE_PROC_CPU if PROC_FS
1258 help 1282 help
1259 ARM processors cannot fetch/store information which is not 1283 ARM processors cannot fetch/store information which is not
1260 naturally aligned on the bus, i.e., a 4 byte fetch must start at an 1284 naturally aligned on the bus, i.e., a 4 byte fetch must start at an