xen: arm: use new 64-bit zImage magic numbers for Xen binary

Upstream commit 4370eec05a88 "arm64: Expand arm64 image header" ended up
changing the zImage magic (which was actually the initial branch instructio
encoding!). The new header has a proper magic number at a fixed location.

Switch Xen itself to using this format. Neither the bootwrapper nor the
models care about this header themselves and real bootloaders are not widely
used, so now is as good a time as any to switch (as upstream have proven)

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Tim Deegan <tim@xen.org>

diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S
index e0831b6fd7abb53cd7d8f4657f0378fad7d434aa..4495f72c32a037436f4e63e72c77897181c1b6cf 100644 (file)
--- a/xen/arch/arm/arm64/head.S
+++ b/xen/arch/arm/arm64/head.S
@@ -73,6 +73,14 @@ start:
         .quad   0                    /* Image load offset from start of RAM */
         .quad   0                    /* reserved */
         .quad   0                    /* reserved */
+        .quad   0                    /* reserved */
+        .quad   0                    /* reserved */
+        .quad   0                    /* reserved */
+        .byte   0x41                 /* Magic number, "ARM\x64" */
+        .byte   0x52
+        .byte   0x4d
+        .byte   0x64
+        .word   0                    /* reserved */
 
 real_start:
         msr   DAIFSet, 0xf           /* Disable all interrupts */