summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorRussell King2010-02-25 23:09:41 +0100
committerRussell King2010-02-25 23:09:41 +0100
commit2741ecb4ce5c2d430b5c44b0a169038338c21df5 (patch)
tree4aa71d7551184ee88f32c7f3660d821133058c32 /arch/arm/configs
parentMerge branch 'perf' into devel (diff)
parentARM: Eliminate decompressor -Dstatic= PIC hack (diff)
downloadkernel-qcow2-linux-2741ecb4ce5c2d430b5c44b0a169038338c21df5.tar.gz
kernel-qcow2-linux-2741ecb4ce5c2d430b5c44b0a169038338c21df5.tar.xz
kernel-qcow2-linux-2741ecb4ce5c2d430b5c44b0a169038338c21df5.zip
Merge branch 'misc2' into devel
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/omap_4430sdp_defconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/omap_4430sdp_defconfig b/arch/arm/configs/omap_4430sdp_defconfig
index 3de640ac294b..c48d7b893869 100644
--- a/arch/arm/configs/omap_4430sdp_defconfig
+++ b/arch/arm/configs/omap_4430sdp_defconfig
@@ -242,10 +242,13 @@ CONFIG_CPU_CP15_MMU=y
# CONFIG_CPU_DCACHE_DISABLE is not set
# CONFIG_CPU_BPREDICT_DISABLE is not set
CONFIG_HAS_TLS_REG=y
+CONFIG_OUTER_CACHE=y
+CONFIG_CACHE_L2X0=y
CONFIG_ARM_L1_CACHE_SHIFT=5
# CONFIG_ARM_ERRATA_430973 is not set
# CONFIG_ARM_ERRATA_458693 is not set
# CONFIG_ARM_ERRATA_460075 is not set
+CONFIG_PL310_ERRATA_588369=y
CONFIG_ARM_GIC=y
#