diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig
index 6794660dac28011ca894f33b22e3a15416e4bd8d..8ffc5441fc69786a6b65ab346ff27744ed75482f 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 7c1ef2483ea24da88bf9450314102efe80f894fb..7518b60fb2b1e75d653c62747b18994153d096aa 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 */
 
 /*