summaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2017-03-13 08:16:44 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2017-03-13 08:16:44 +0100
commita2e3bad25f6033e35e7a0f729cbd164d2d079c17 (patch)
tree672c3249ae6505d252011184072a04debd591964 /arch/arm/Kconfig
parent6134116686ea7ecd3e29db3ab40e4eac837680c3 (diff)
parente8fab18835a1ba23c5c71c35c76effcd9d4d7f56 (diff)
downloadbarebox-a2e3bad25f6033e35e7a0f729cbd164d2d079c17.tar.gz
barebox-a2e3bad25f6033e35e7a0f729cbd164d2d079c17.tar.xz
Merge branch 'for-next/rpi'
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig29
1 files changed, 12 insertions, 17 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b6a9f9358f..4d952698fc 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -19,15 +19,6 @@ config ARM_USE_COMPRESSED_DTB
select UNCOMPRESS
select LZO_DECOMPRESS
-config ARCH_BCM283X
- bool
- select GPIOLIB
- select CLKDEV_LOOKUP
- select COMMON_CLK
- select CLOCKSOURCE_BCM283X
- select ARM_AMBA
- select HAS_DEBUG_LL
-
menu "System Type"
config BUILTIN_DTB
@@ -56,15 +47,19 @@ config ARCH_AT91
select HAVE_CLK
select PINCTRL_AT91
-config ARCH_BCM2835
- bool "Broadcom BCM2835 boards"
- select ARCH_BCM283X
- select CPU_ARM1176
-config ARCH_BCM2836
- bool "Broadcom BCM2836 boards"
- select ARCH_BCM283X
- select CPU_V7
+config ARCH_BCM283X
+ bool "Broadcom BCM283x based boards"
+ select GPIOLIB
+ select CLKDEV_LOOKUP
+ select COMMON_CLK
+ select CLOCKSOURCE_BCM283X
+ select ARM_AMBA
+ select HAS_DEBUG_LL
+ select RELOCATABLE
+ select OFTREE
+ select OFDEVICE
+ select HAVE_PBL_MULTI_IMAGES
config ARCH_CLPS711X
bool "Cirrus Logic EP711x/EP721x/EP731x"