From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Tue, 21 Apr 2015 12:59:39 +0000 (+0900)
Subject: ARM: integrator: move CONFIG_ARCH_CINTEGRATOR to Kconfig
X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fu-boot.git;a=commitdiff_plain;h=f39ff195af12d10b508d76830ab0db531dce863e

ARM: integrator: move CONFIG_ARCH_CINTEGRATOR to Kconfig

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

diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig
index 6794660dac..8ffc5441fc 100644
--- a/arch/arm/mach-integrator/Kconfig
+++ b/arch/arm/mach-integrator/Kconfig
@@ -9,9 +9,13 @@ config ARCH_INTEGRATOR_AP
 
 config ARCH_INTEGRATOR_CP
 	bool "Support Integrator/CP platform"
+	select ARCH_CINTEGRATOR
 
 endchoice
 
+config ARCH_CINTEGRATOR
+	bool
+
 choice
 	prompt "Integrator core module select"
 
diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index 7c1ef2483e..7518b60fb2 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 */
 
 /*