summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-04-21 21:59:39 +0900
committerTom Rini <trini@konsulko.com>2015-04-23 08:52:27 -0400
commitf39ff195af12d10b508d76830ab0db531dce863e (patch)
tree505ee75daeaf945670c827876d91d58e761c2869
parente702146ee5738c49355bce4f5c35cb080f71e6f5 (diff)
downloadu-boot-imx-f39ff195af12d10b508d76830ab0db531dce863e.zip
u-boot-imx-f39ff195af12d10b508d76830ab0db531dce863e.tar.gz
u-boot-imx-f39ff195af12d10b508d76830ab0db531dce863e.tar.bz2
ARM: integrator: move CONFIG_ARCH_CINTEGRATOR to Kconfig
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Cc: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--arch/arm/mach-integrator/Kconfig4
-rw-r--r--include/configs/integratorcp.h1
2 files changed, 4 insertions, 1 deletions
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_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 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 */
/*