summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/Kconfig5
-rw-r--r--arch/arm/mach-vexpress/Kconfig9
2 files changed, 5 insertions, 9 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ea6d459dfe..a8ebfecd9b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -223,6 +223,11 @@ config ARCH_VEXPRESS
select AMBA_SP804
select CLKDEV_LOOKUP
select COMMON_CLK
+ select COMMON_CLK_OF_PROVIDER
+ select OFTREE
+ select OFDEVICE
+ select RELOCATABLE
+ select HAVE_PBL_MULTI_IMAGES
config ARCH_TEGRA
bool "NVIDIA Tegra"
diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig
index aaa535f073..38b9dffb17 100644
--- a/arch/arm/mach-vexpress/Kconfig
+++ b/arch/arm/mach-vexpress/Kconfig
@@ -4,17 +4,8 @@ config ARCH_TEXT_BASE
hex
default 0x0
-choice
- prompt "ARM Board type"
-
config MACH_VEXPRESS
bool "ARM Vexpress"
- select RELOCATABLE
- select HAVE_PBL_MULTI_IMAGES
- select OFTREE
- select OFDEVICE
- select COMMON_CLK_OF_PROVIDER
-endchoice
endif