From f39ff195af12d10b508d76830ab0db531dce863e Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Tue, 21 Apr 2015 21:59:39 +0900 Subject: [PATCH] ARM: integrator: move CONFIG_ARCH_CINTEGRATOR to Kconfig Signed-off-by: Masahiro Yamada Cc: Linus Walleij --- arch/arm/mach-integrator/Kconfig | 4 ++++ include/configs/integratorcp.h | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) 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 */ /*