From: Rob Herring Date: Thu, 5 Dec 2013 16:04:54 +0000 (-0600) Subject: ARM: virt: make mach-virt just a kconfig option X-Git-Tag: v3.15-rc1~76^2~5^2~1 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05e2a3decbcda03ed16043e3db7535a6036c5b7a;p=pandora-kernel.git 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 Cc: Russell King Acked-by: Marc Zyngier --- 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" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 08a9ef58d9c3..a3c06ddbe3e4 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -199,7 +199,6 @@ machine-$(CONFIG_ARCH_U300) += u300 machine-$(CONFIG_ARCH_U8500) += ux500 machine-$(CONFIG_ARCH_VERSATILE) += versatile machine-$(CONFIG_ARCH_VEXPRESS) += vexpress -machine-$(CONFIG_ARCH_VIRT) += virt machine-$(CONFIG_ARCH_VT8500) += vt8500 machine-$(CONFIG_ARCH_W90X900) += w90x900 machine-$(CONFIG_ARCH_ZYNQ) += zynq Reading git-diff-tree failed