commit 06772b6f025a4ec09f44348d1e810fb9ba412606
author Masahiro Yamada <yamada.masahiro@socionext.com> Tue Apr 21 21:59:39 2015 +0900
committer Tom Rini <trini@konsulko.com> Thu Apr 23 08:52:27 2015 -0400
tree 505ee75daeaf945670c827876d91d58e761c2869
parent 665ab67487848f57c13bc2a76f536fd8de5d1827

ARM: integrator: move CONFIG_ARCH_CINTEGRATOR to Kconfig

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Linus Walleij <linus.walleij@linaro.org>

arch/arm/mach-integrator/Kconfig

diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig
index 6794660..8ffc544 100644
--- a/arch/arm/mach-integrator/Kconfig
+++ b/arch/arm/mach-integrator/Kconfig
@@ -9,9 +9,13 @@
 
 config ARCH_INTEGRATOR_CP
 	bool "Support Integrator/CP platform"
+	select ARCH_CINTEGRATOR
 
 endchoice
 
+config ARCH_CINTEGRATOR
+	bool
+
 choice
 	prompt "Integrator core module select"
 

include/configs/integratorcp.h

diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index 7c1ef24..7518b60 100644
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -18,7 +18,6 @@
 #include "integrator-common.h"
 
 /* Integrator CP-specific configuration */
-#define CONFIG_ARCH_CINTEGRATOR
 #define CONFIG_SYS_HZ_CLOCK		1000000	/* Timer 1 is clocked at 1Mhz */
 
 /*