In preparation for the qemu virt image, move the KConfig options from
MACH_VEXPRESS to ARCH_VEXPRESS. Also remove the choice, since we allow
multiple boards to be selected with HAVE_PBL_MULTI_IMAGES.

Signed-off-by: Rouven Czerwinski <[email protected]>
---
 arch/arm/Kconfig               | 4 ++++
 arch/arm/mach-vexpress/Kconfig | 8 --------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ea6d459dfe..91da0e4ff3 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -223,6 +223,10 @@ config ARCH_VEXPRESS
        select AMBA_SP804
        select CLKDEV_LOOKUP
        select COMMON_CLK
+       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..4058177b3a 100644
--- a/arch/arm/mach-vexpress/Kconfig
+++ b/arch/arm/mach-vexpress/Kconfig
@@ -4,17 +4,9 @@ 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
-- 
2.28.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

Reply via email to