Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05e2a3de authored by Rob Herring's avatar Rob Herring
Browse files

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: default avatarRob Herring <robh@kernel.org>
Cc: Russell King <linux@arm.linux.org.uk>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 1e011145

arch/arm/Kconfig

+6 −2
Original line number Diff line number Diff line
@@ -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"

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-virt/Kconfig

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
config ARCH_VIRT

	bool "Dummy Virtual Machine" if ARCH_MULTI_V7

	select ARM_GIC

	select HAVE_ARM_ARCH_TIMER

	select ARM_PSCI

	select HAVE_SMP

arch/arm/mach-virt/Makefile

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
#

# Makefile for the linux kernel.

#



obj-y					:= virt.o

arch/arm/mach-virt/virt.c

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
/*

 * Dummy Virtual Machine - does what it says on the tin.

 *

 * Copyright (C) 2012 ARM Ltd

 * Authors: Will Deacon <will.deacon@arm.com>,

 *          Marc Zyngier <marc.zyngier@arm.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/smp.h>



#include <asm/mach/arch.h>



static void __init virt_init(void)

{

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}



static const char *virt_dt_match[] = {

	"linux,dummy-virt",

	"xen,xenvm",

	NULL

};



DT_MACHINE_START(VIRT, "Dummy Virtual Machine")

	.init_machine	= virt_init,

	.dt_compat	= virt_dt_match,

MACHINE_END