xen: move the xenvm machine to mach-virt
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>
Tue, 23 Apr 2013 14:51:11 +0000 (14:51 +0000)
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>
Thu, 25 Apr 2013 16:46:08 +0000 (16:46 +0000)
xenvm is based on mach-vexpress, move it to mach-virt.

Changes in v4:
- update the dts Makefile too.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
CC: Marc Zyngier <marc.zyngier@arm.com>
CC: will.deacon@arm.com
CC: arnd@arndb.de
CC: rob.herring@calxeda.com
arch/arm/boot/dts/Makefile
arch/arm/mach-vexpress/v2m.c
arch/arm/mach-virt/virt.c

index 9c62558..b6289b7 100644 (file)
@@ -168,8 +168,8 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
 dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \
        vexpress-v2p-ca9.dtb \
        vexpress-v2p-ca15-tc1.dtb \
-       vexpress-v2p-ca15_a7.dtb \
-       xenvm-4.2.dtb
+       vexpress-v2p-ca15_a7.dtb
+dtb-$(CONFIG_ARCH_VIRT) += xenvm-4.2.dtb
 dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \
        wm8505-ref.dtb \
        wm8650-mid.dtb \
index 915683c..c43ec78 100644 (file)
@@ -469,7 +469,6 @@ static void __init v2m_dt_init(void)
 
 static const char * const v2m_dt_match[] __initconst = {
        "arm,vexpress",
-       "xen,xenvm",
        NULL,
 };
 
index 31666f6..528c05e 100644 (file)
@@ -40,6 +40,7 @@ static void __init virt_timer_init(void)
 
 static const char *virt_dt_match[] = {
        "linux,dummy-virt",
+       "xen,xenvm",
        NULL
 };