[Xen-changelog] [xen master] xen: arm: use new 64-bit zImage magic numbers for Xen binary

[patchbot@xxxxxxx]

commit 856107eca87d85c7138ca01eeefd8e6402f7ecb4
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Wed Sep 25 12:21:51 2013 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Thu Sep 26 15:47:17 2013 +0100

    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@xxxxxxxxxx>
    Acked-by: Tim Deegan <tim@xxxxxxx>
---
 xen/arch/arm/arm64/head.S |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S
index e0831b6..4495f72 100644
--- 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 */
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog