diff options
author | Magnus Lilja <lilja.magnus@gmail.com> | 2009-04-18 12:20:50 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-05-05 03:38:04 -0400 |
commit | 25971dfe3a9d14c3b91fc51de96d7f48da394c99 (patch) | |
tree | 838d3f8e9970ad232bbdd37391fef5ac496c181f | |
parent | b09de4209d179c92ab880d911e72a892d053ff01 (diff) |
i.MX31: Disable CPU_32v6K in mx3_defconfig.
The i.MX31 ARM11 core is not a v6K core. Disable this option as it
is incompatible with non v6K cores.
Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | arch/arm/configs/mx3_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/mx3_defconfig b/arch/arm/configs/mx3_defconfig index 72a8201a5370..20ada526f6de 100644 --- a/arch/arm/configs/mx3_defconfig +++ b/arch/arm/configs/mx3_defconfig | |||
@@ -197,7 +197,7 @@ CONFIG_MXC_PWM=y | |||
197 | # | 197 | # |
198 | CONFIG_CPU_32=y | 198 | CONFIG_CPU_32=y |
199 | CONFIG_CPU_V6=y | 199 | CONFIG_CPU_V6=y |
200 | CONFIG_CPU_32v6K=y | 200 | # CONFIG_CPU_32v6K is not set |
201 | CONFIG_CPU_32v6=y | 201 | CONFIG_CPU_32v6=y |
202 | CONFIG_CPU_ABRT_EV6=y | 202 | CONFIG_CPU_ABRT_EV6=y |
203 | CONFIG_CPU_PABRT_NOIFAR=y | 203 | CONFIG_CPU_PABRT_NOIFAR=y |