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

Commit cc3d7f70 authored by Stefano Stabellini's avatar Stefano Stabellini
Browse files

xen: move the xenvm machine to mach-virt 



xenvm is based on mach-vexpress, move it to mach-virt.

Changes in v4:
- update the dts Makefile too.

Signed-off-by: default avatarStefano 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
parent 9a9ab3cc

arch/arm/boot/dts/Makefile

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

arch/arm/mach-vexpress/v2m.c

+0 −1
Original line number Diff line number Diff line
@@ -469,7 +469,6 @@ static void __init v2m_dt_init(void) 


static const char * const v2m_dt_match[] __initconst = {

	"arm,vexpress",

	"xen,xenvm",

	NULL,

};

arch/arm/mach-virt/virt.c

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ static void __init virt_timer_init(void) 


static const char *virt_dt_match[] = {

	"linux,dummy-virt",

	"xen,xenvm",

	NULL

};