From: Ian Campbell Date: Thu, 11 Sep 2014 12:55:08 +0000 (+0100) Subject: xen: arm: fix boot on arndale. X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4422 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6baa3b58a1b066977ddc29c56b9b3cda123e70c6;p=xen.git xen: arm: fix boot on arndale. The differences between Arndale and the Odoid-XU are more interesting than first though, which results in 0bf8ddecb4df "xen/arm: Add support for the Odroid-XU board." breaking boot on arndale. Revert back to arndale compatible behaviour while we sort this out. Specifically we must (counterintuitively) use the regular (!ns) sysram and the correct offset is 0x0 and 0x1c. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- diff --git a/xen/arch/arm/platforms/exynos5.c b/xen/arch/arm/platforms/exynos5.c index bc9ae157e0..22a38f09b1 100644 --- a/xen/arch/arm/platforms/exynos5.c +++ b/xen/arch/arm/platforms/exynos5.c @@ -99,7 +99,7 @@ static int __init exynos5_smp_init(void) u64 size; int rc; - node = dt_find_compatible_node(NULL, NULL, "samsung,exynos4210-sysram-ns"); + node = dt_find_compatible_node(NULL, NULL, "samsung,exynos4210-sysram"); if ( !node ) { dprintk(XENLOG_ERR, "samsung,exynos4210-sysram-ns missing in DT\n"); @@ -125,7 +125,7 @@ static int __init exynos5_smp_init(void) printk("Set SYSRAM to %"PRIpaddr" (%p)\n", __pa(init_secondary), init_secondary); - writel(__pa(init_secondary), sysram + 0x1c); + writel(__pa(init_secondary), sysram); iounmap(sysram);