aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91
diff options
context:
space:
mode:
authorLudovic Desroches <ludovic.desroches@atmel.com>2013-03-22 09:24:11 -0400
committerNicolas Ferre <nicolas.ferre@atmel.com>2013-03-26 07:18:04 -0400
commit8f0cdcc5700d9f9508385f41f6047fca82334eba (patch)
treefd006d9dfcf69272cbe0658e53e47683d0d41f7e /arch/arm/mach-at91
parentfc05b6571dc1054c31fc7bb1cdaa186c28f7de79 (diff)
ARM: at91: introduce the core type choice to split ARMv4/5 and ARMv7 arch
As we will introduce SAMA5, we need to distinguish the core architecture. It is useless to show ARMv4/5 entries if we are configuring a kernel for SAMA5 devices. Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91')
-rw-r--r--arch/arm/mach-at91/Kconfig22
1 files changed, 18 insertions, 4 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 68c53c3933ef..8b35c7f1634f 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -6,6 +6,10 @@ config HAVE_AT91_DBGU0
6config HAVE_AT91_DBGU1 6config HAVE_AT91_DBGU1
7 bool 7 bool
8 8
9config AT91_PMC_UNIT
10 bool
11 default !ARCH_AT91X40
12
9config AT91_SAM9_ALT_RESET 13config AT91_SAM9_ALT_RESET
10 bool 14 bool
11 default !ARCH_AT91X40 15 default !ARCH_AT91X40
@@ -27,8 +31,21 @@ config SOC_AT91SAM9
27 31
28menu "Atmel AT91 System-on-Chip" 32menu "Atmel AT91 System-on-Chip"
29 33
34choice
35
36 prompt "Core type"
37
38config SOC_SAM_V4_V5
39 bool "ARM7/ARM9"
40 help
41 Select this if you are using one of Atmel's AT91SAM9, AT91RM9200
42 or AT91X40 SoC.
43
44endchoice
45
30comment "Atmel AT91 Processor" 46comment "Atmel AT91 Processor"
31 47
48if SOC_SAM_V4_V5
32config SOC_AT91RM9200 49config SOC_AT91RM9200
33 bool "AT91RM9200" 50 bool "AT91RM9200"
34 select CPU_ARM920T 51 select CPU_ARM920T
@@ -94,13 +111,10 @@ config SOC_AT91SAM9N12
94 help 111 help
95 Select this if you are using Atmel's AT91SAM9N12 SoC. 112 Select this if you are using Atmel's AT91SAM9N12 SoC.
96 113
97config AT91_PMC_UNIT
98 bool
99 default !ARCH_AT91X40
100
101# ---------------------------------------------------------- 114# ----------------------------------------------------------
102 115
103source arch/arm/mach-at91/Kconfig.non_dt 116source arch/arm/mach-at91/Kconfig.non_dt
117endif # SOC_SAM_V4_V5
104 118
105comment "Generic Board Type" 119comment "Generic Board Type"
106 120