From 927360595da06dd88103ed8fb9733cea2451dc44 Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Mon, 9 Nov 2020 14:44:28 +0100 Subject: ARM: vexpress: move Options to ARCH_VEXPRESS 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 Signed-off-by: Sascha Hauer --- arch/arm/Kconfig | 5 +++++ arch/arm/mach-vexpress/Kconfig | 9 --------- 2 files changed, 5 insertions(+), 9 deletions(-) (limited to 'arch/arm') 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 -- cgit v1.2.3