Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-05 02:23:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

xen: move the xenvm machine to mach-virt

Browse Source 
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
This commit is contained in:
Stefano Stabellini 2013-04-23 14:51:11 +00:00
parent 9a9ab3cc00
commit cc3d7f70c3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/Makefile
View File

@ -168,8 +168,8 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \ dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \
vexpress-v2p-ca9.dtb \ vexpress-v2p-ca9.dtb \
vexpress-v2p-ca15-tc1.dtb \ vexpress-v2p-ca15-tc1.dtb \
vexpress-v2p-ca15_a7.dtb \ vexpress-v2p-ca15_a7.dtb
xenvm-4.2.dtb dtb-$(CONFIG_ARCH_VIRT) += xenvm-4.2.dtb
dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \ dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \
wm8505-ref.dtb \ wm8505-ref.dtb \
wm8650-mid.dtb \ wm8650-mid.dtb \

1
arch/arm/mach-vexpress/v2m.c
View File

@ -469,7 +469,6 @@ static void __init v2m_dt_init(void)
static const char * const v2m_dt_match[] __initconst = { static const char * const v2m_dt_match[] __initconst = {
"arm,vexpress", "arm,vexpress",
"xen,xenvm",
NULL, NULL,
}; };

1
arch/arm/mach-virt/virt.c
View File

@ -40,6 +40,7 @@ static void __init virt_timer_init(void)
static const char *virt_dt_match[] = { static const char *virt_dt_match[] = {
"linux,dummy-virt", "linux,dummy-virt",
"xen,xenvm",
NULL NULL
}; };