diff options
author | Konstantin Porotchkin <kostap@marvell.com> | 2011-04-07 06:49:41 -0400 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2011-05-03 15:38:12 -0400 |
commit | 7b769bb3e859b0de65999468dd1660e3364f8994 (patch) | |
tree | d9ca4ce2bed85eb097bc1027372eaf9f0d5d6d52 | |
parent | 8e10cd74342c7f5ce259cceca36f6eba084f5d58 (diff) |
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/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/configs/dove_defconfig | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 377a7a595b0..44c16f06173 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -468,7 +468,7 @@ config ARCH_IXP4XX | |||
468 | 468 | ||
469 | config ARCH_DOVE | 469 | config ARCH_DOVE |
470 | bool "Marvell Dove" | 470 | bool "Marvell Dove" |
471 | select CPU_V6K | 471 | select CPU_V7 |
472 | select PCI | 472 | select PCI |
473 | select ARCH_REQUIRE_GPIOLIB | 473 | select ARCH_REQUIRE_GPIOLIB |
474 | select GENERIC_CLOCKEVENTS | 474 | select GENERIC_CLOCKEVENTS |
diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig index 54bf5eec801..d7c3cfa4477 100644 --- a/arch/arm/configs/dove_defconfig +++ b/arch/arm/configs/dove_defconfig | |||
@@ -8,8 +8,6 @@ CONFIG_MODULE_UNLOAD=y | |||
8 | # CONFIG_BLK_DEV_BSG is not set | 8 | # CONFIG_BLK_DEV_BSG is not set |
9 | CONFIG_ARCH_DOVE=y | 9 | CONFIG_ARCH_DOVE=y |
10 | CONFIG_MACH_DOVE_DB=y | 10 | CONFIG_MACH_DOVE_DB=y |
11 | CONFIG_CPU_V6=y | ||
12 | CONFIG_CPU_32v6K=y | ||
13 | CONFIG_NO_HZ=y | 11 | CONFIG_NO_HZ=y |
14 | CONFIG_HIGH_RES_TIMERS=y | 12 | CONFIG_HIGH_RES_TIMERS=y |
15 | CONFIG_AEABI=y | 13 | CONFIG_AEABI=y |