From: Dave Martin Date: Mon, 12 Dec 2011 16:17:34 +0000 (+0000) Subject: highbank: Unconditionally require l2x0 L2 cache controller support X-Git-Tag: v3.3-rc1~176^2~1^2~5^2~1 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=22d80379e9b6b167e145c12099705bc8e9946d84;p=~emulex%2Finfiniband.git highbank: Unconditionally require l2x0 L2 cache controller support If running in the Normal World on a TrustZone-enabled SoC, Linux does not have complete control over the L2 cache controller configuration. The kernel cannot work reliably on such platforms without the l2x0 cache support code built in. This patch unconditionally enables l2x0 support for the Highbank SoC. Thanks to Rob Herring for this suggestion. [1] [1] http://lists.infradead.org/pipermail/linux-arm-kernel/2011-November/074495.html Signed-off-by: Dave Martin Acked-by: Rob Herring --- diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index eca82f9a717..17921468d1c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -340,12 +340,12 @@ config ARCH_HIGHBANK select ARM_AMBA select ARM_GIC select ARM_TIMER_SP804 + select CACHE_L2X0 select CLKDEV_LOOKUP select CPU_V7 select GENERIC_CLOCKEVENTS select HAVE_ARM_SCU select HAVE_SMP - select MIGHT_HAVE_CACHE_L2X0 select USE_OF help Support for the Calxeda Highbank SoC based boards.