diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-11-09 07:33:48 -0500 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-12-10 02:52:18 -0500 |
commit | bf98c1eac1d4a6bcf00532e4fa41d8126cd6c187 (patch) | |
tree | dfe4a81c726e130e52419fd9d318cc4138391828 /arch/arm/mach-shmobile/Kconfig | |
parent | cf4f85ccd5c235123a8a1827d2265da5c33a1bb0 (diff) |
ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY
SH-Mobile platforms are transitioning from non-multiplatform to
multiplatform kernel. A new ARCH_SHMOBILE_MULTI configuration symbol has
been created to group all multiplatform-enabled SH-Mobile SoCs. The
existing ARCH_SHMOBILE configuration symbol groups SoCs that haven't
been converted yet.
This arrangement works fine for the arch/ code, but lots of drivers
needed on both ARCH_SHMOBILE and ARCH_SHMOBILE_MULTI depend on
ARCH_SHMOBILE only. In order to avoid changing them, rename
ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY, and create a new boolean
ARCH_SHMOBILE configuration symbol that is selected by both
ARCH_SHMOBILE_LEGACY and ARCH_SHMOBILE_MULTI.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/Kconfig')
-rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 180b71fd86f8..1b7df173db0e 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig | |||
@@ -1,6 +1,10 @@ | |||
1 | config ARCH_SHMOBILE | ||
2 | bool | ||
3 | |||
1 | config ARCH_SHMOBILE_MULTI | 4 | config ARCH_SHMOBILE_MULTI |
2 | bool "SH-Mobile Series" if ARCH_MULTI_V7 | 5 | bool "SH-Mobile Series" if ARCH_MULTI_V7 |
3 | depends on MMU | 6 | depends on MMU |
7 | select ARCH_SHMOBILE | ||
4 | select CPU_V7 | 8 | select CPU_V7 |
5 | select GENERIC_CLOCKEVENTS | 9 | select GENERIC_CLOCKEVENTS |
6 | select HAVE_ARM_SCU if SMP | 10 | select HAVE_ARM_SCU if SMP |
@@ -30,7 +34,7 @@ config MACH_KZM9D | |||
30 | comment "SH-Mobile System Configuration" | 34 | comment "SH-Mobile System Configuration" |
31 | endif | 35 | endif |
32 | 36 | ||
33 | if ARCH_SHMOBILE | 37 | if ARCH_SHMOBILE_LEGACY |
34 | 38 | ||
35 | comment "SH-Mobile System Type" | 39 | comment "SH-Mobile System Type" |
36 | 40 | ||
@@ -272,7 +276,7 @@ source "drivers/sh/Kconfig" | |||
272 | 276 | ||
273 | endif | 277 | endif |
274 | 278 | ||
275 | if ARCH_SHMOBILE || ARCH_SHMOBILE_MULTI | 279 | if ARCH_SHMOBILE |
276 | 280 | ||
277 | menu "Timer and clock configuration" | 281 | menu "Timer and clock configuration" |
278 | 282 | ||