From adb91ec72b85e1e50e5593828732174576e19d44 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Thu, 24 Mar 2016 22:15:16 -0600 Subject: [PATCH] ARM: bcm2835: move CONFIG_BCM283* to Kconfig Signed-off-by: Stephen Warren Reviewed-by: Tom Rini --- arch/arm/mach-bcm283x/Kconfig | 12 +++++++++++- include/configs/rpi.h | 1 - include/configs/rpi_2.h | 1 - 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig index 1a7baf69e5..dc6770437e 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 a788ce42e4..86422e390d 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 13dc8de143..0917e86508 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" -- 2.30.2