diff options
author | Stephen Warren <swarren@wwwdotorg.org> | 2016-03-24 22:15:16 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-04-01 17:17:41 -0400 |
commit | adb91ec72b85e1e50e5593828732174576e19d44 (patch) | |
tree | 4f2f002a95f56809869b818ef660a83a5355a199 | |
parent | 4c1d5c29b5dec31f838dbe860ea682debaf27efe (diff) |
ARM: bcm2835: move CONFIG_BCM283* to Kconfig
Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
-rw-r--r-- | arch/arm/mach-bcm283x/Kconfig | 12 | ||||
-rw-r--r-- | include/configs/rpi.h | 1 | ||||
-rw-r--r-- | 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 1a7baf69e59..dc6770437ec 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 a788ce42e44..86422e390da 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 13dc8de1431..0917e865086 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" |