aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2013-02-15 13:32:08 +0000
committerIan Campbell <ian.campbell@citrix.com>2013-02-15 13:32:08 +0000
commit4308933102ae03cdc7782d8e8ed34fe455d7372d (patch)
tree7b1f317fdf2bd4dd70aa80853cb56503c4e67dfc
parent3501bec5ec0fad72a78b5fad8d2d11f2e64842a3 (diff)
downloadxen-4308933102ae03cdc7782d8e8ed34fe455d7372d.tar.gz
xen-4308933102ae03cdc7782d8e8ed34fe455d7372d.tar.bz2
xen-4308933102ae03cdc7782d8e8ed34fe455d7372d.zip
xen: arm: do not pass a machine ID to dom0
Xen relies on DTB and we pass in a suitable device-tree so we don't need to (and shouldn't) pretend to be a Versatile Express here. We already don't pass a machine ID to domU in the same way. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Tim Deegan <tim@xen.org> Committed-by: Ian Campbell <ian.campbell@citrix.com>
-rw-r--r--xen/arch/arm/domain_build.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 6abbb03df4..7403f1a097 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -349,7 +349,7 @@ int construct_dom0(struct domain *d)
*/
regs->r0 = 0; /* SBZ */
- regs->r1 = 2272; /* Machine NR: Versatile Express */
+ regs->r1 = 0xffffffff; /* We use DTB therefore no machine id */
regs->r2 = kinfo.dtb_paddr;
WRITE_CP32(SCTLR_BASE, SCTLR);