diff options
| author | Rob Herring <robh@kernel.org> | 2013-12-05 10:04:54 -0600 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2014-02-19 16:47:16 -0600 |
| commit | 05e2a3decbcda03ed16043e3db7535a6036c5b7a (patch) | |
| tree | 3721c2b4450444226f23d5ca45b2bd503545a598 /arch/arm/Kconfig | |
| parent | 1e0111455766f562b9977178ff3ffcc7672cef7c (diff) | |
ARM: virt: make mach-virt just a kconfig option
The mach code for mach-virt is no longer needed, so we can remove all of
mach-virt except the kconfig entry.
Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Russell King <linux@arm.linux.org.uk>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f350ca5d051b..9790c5d9abd9 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -929,6 +929,12 @@ config ARCH_MULTI_CPU_AUTO endmenu +config ARCH_VIRT + bool "Dummy Virtual Machine" if ARCH_MULTI_V7 + select ARM_GIC + select HAVE_ARM_ARCH_TIMER + select ARM_PSCI + # # This is sorted alphabetically by mach-* pathname. However, plat-* # Kconfigs may be included either alphabetically (according to the @@ -1052,8 +1058,6 @@ source "arch/arm/mach-versatile/Kconfig" source "arch/arm/mach-vexpress/Kconfig" source "arch/arm/plat-versatile/Kconfig" -source "arch/arm/mach-virt/Kconfig" - source "arch/arm/mach-vt8500/Kconfig" source "arch/arm/mach-w90x900/Kconfig" |