diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-25 17:19:00 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-26 21:35:44 -0400 |
| commit | f8afae40a076347eeb9be179522b570e50d39af4 (patch) | |
| tree | 9d7466751498726f533ac12edd5cc762d0c9b3dd | |
| parent | bf5fd5bf0a96a8bbc9c073118fc646bae13e24bd (diff) | |
ARM: moxart: fix CPU selection
Moxart uses an FA526 CPU core, which is ARMv4 based, not ARMv4T.
Before moxart, we had no CONFIG_MULTI_V4 option, since no ARMv4 platform
was enabled for multiplatform. This now adds the missing option, which
will give us slightly more efficient code on pure moxart kernels,
because we can build a pure FA526 kernel now rather than a combined
FA526+ARM920T kernel that we used to.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/Kconfig | 6 | ||||
| -rw-r--r-- | arch/arm/mach-moxart/Kconfig | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3dad96105ce4..4f85b09f9f61 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -893,6 +893,12 @@ menu "Multiple platform selection" | |||
| 893 | 893 | ||
| 894 | comment "CPU Core family selection" | 894 | comment "CPU Core family selection" |
| 895 | 895 | ||
| 896 | config ARCH_MULTI_V4 | ||
| 897 | bool "ARMv4 based platforms (FA526)" | ||
| 898 | depends on !ARCH_MULTI_V6_V7 | ||
| 899 | select ARCH_MULTI_V4_V5 | ||
| 900 | select CPU_FA526 | ||
| 901 | |||
| 896 | config ARCH_MULTI_V4T | 902 | config ARCH_MULTI_V4T |
| 897 | bool "ARMv4T based platforms (ARM720T, ARM920T, ...)" | 903 | bool "ARMv4T based platforms (ARM720T, ARM920T, ...)" |
| 898 | depends on !ARCH_MULTI_V6_V7 | 904 | depends on !ARCH_MULTI_V6_V7 |
diff --git a/arch/arm/mach-moxart/Kconfig b/arch/arm/mach-moxart/Kconfig index 3795ae28a613..e9b45bb58263 100644 --- a/arch/arm/mach-moxart/Kconfig +++ b/arch/arm/mach-moxart/Kconfig | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | config ARCH_MOXART | 1 | config ARCH_MOXART |
| 2 | bool "MOXA ART SoC" if ARCH_MULTI_V4T | 2 | bool "MOXA ART SoC" if ARCH_MULTI_V4 |
| 3 | select CPU_FA526 | 3 | select CPU_FA526 |
| 4 | select ARM_DMA_MEM_BUFFERABLE | 4 | select ARM_DMA_MEM_BUFFERABLE |
| 5 | select USE_OF | 5 | select USE_OF |