summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Porotchkin <kostap@marvell.com>2011-04-07 13:49:41 +0300
committerNicolas Pitre <nico@fluxnic.net>2011-05-03 15:38:12 -0400
commit7b769bb3e859b0de65999468dd1660e3364f8994 (patch)
treed9ca4ce2bed85eb097bc1027372eaf9f0d5d6d52
parent8e10cd74342c7f5ce259cceca36f6eba084f5d58 (diff)
downloadlinux-7b769bb3e859b0de65999468dd1660e3364f8994.tar.gz
linux-7b769bb3e859b0de65999468dd1660e3364f8994.tar.bz2
linux-7b769bb3e859b0de65999468dd1660e3364f8994.zip
ARM: Moving Marvell Dove platform defaults to ARMv7
Disabled legacy support for ARMv6 architecture on Dove platform. Latest Dove HW uses only ARMv7 model. Signed-off-by: Konstantin Porotchkin <kostap@marvell.com> Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
-rw-r--r--arch/arm/Kconfig2
-rw-r--r--arch/arm/configs/dove_defconfig2
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 377a7a595b08..44c16f061734 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -468,7 +468,7 @@ config ARCH_IXP4XX
config ARCH_DOVE
bool "Marvell Dove"
- select CPU_V6K
+ select CPU_V7
select PCI
select ARCH_REQUIRE_GPIOLIB
select GENERIC_CLOCKEVENTS
diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig
index 54bf5eec8016..d7c3cfa44774 100644
--- a/arch/arm/configs/dove_defconfig
+++ b/arch/arm/configs/dove_defconfig
@@ -8,8 +8,6 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set
CONFIG_ARCH_DOVE=y
CONFIG_MACH_DOVE_DB=y
-CONFIG_CPU_V6=y
-CONFIG_CPU_32v6K=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_AEABI=y