diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig
index 1a7baf6..dc67704 100644
--- a/arch/arm/mach-bcm283x/Kconfig
+++ b/arch/arm/mach-bcm283x/Kconfig
@@ -1,3 +1,11 @@
+config BCM2835
+	bool "Broadcom BCM2835 SoC support"
+	depends on ARCH_BCM283X
+
+config BCM2836
+	bool "Broadcom BCM2836 SoC support"
+	depends on ARCH_BCM283X
+
 menu "Broadcom BCM283X family"
 	depends on ARCH_BCM283X
 
@@ -7,12 +15,14 @@ choice
 
 config TARGET_RPI
 	bool "Raspberry Pi"
+	select BCM2835
 	select CPU_ARM1176
 
 config TARGET_RPI_2
 	bool "Raspberry Pi 2"
-	select CPU_V7
 	select ARMV7_LPAE
+	select BCM2836
+	select CPU_V7
 
 endchoice
 
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index a788ce4..86422e3 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -7,7 +7,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_BCM2835
 #define CONFIG_SYS_CACHELINE_SIZE		32
 
 #include "rpi-common.h"
diff --git a/include/configs/rpi_2.h b/include/configs/rpi_2.h
index 13dc8de..0917e86 100644
--- a/include/configs/rpi_2.h
+++ b/include/configs/rpi_2.h
@@ -8,7 +8,6 @@
 #define __CONFIG_H
 
 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_BCM2836
 #define CONFIG_SYS_CACHELINE_SIZE		64
 
 #include "rpi-common.h"