[coreboot-gerrit] New patch to review for coreboot: 99abc22 aarch64: Add ELF support

[Marc Jones (marc.jones@se-eng.com)]

Marc Jones (marc.jones at se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7659

-gerrit

commit 99abc229c9a87e31c7abe11dcda0f2cce9006e84
Author: Marcelo Povoa <marcelogp at chromium.org>
Date:   Thu Feb 6 15:17:33 2014 -0800

    aarch64: Add ELF support
    
    BUG=None
    BRANCH=none
    TEST=Build coreboot
    Signed-off-by: Marcelo Povoa <marcelogp at chromium.org>
    
    Original-Change-Id: I38684794fdf5bd95a32f157128434a13f5e2a2d5
    Original-Reviewed-on: https://chromium-review.googlesource.com/185271
    Original-Reviewed-by: Stefan Reinauer <reinauer at chromium.org>
    Original-Reviewed-by: David Hendricks <dhendrix at chromium.org>
    Original-Tested-by: Marcelo Póvoa <marcelogp at chromium.org>
    Original-Commit-Queue: Marcelo Póvoa <marcelogp at chromium.org>
    (cherry picked from commit 67b74d3dc98a773c3d82b141af178b13e9bb6c06)
    Signed-off-by: Marc Jones <marc.jones at se-eng.com>
    
    Change-Id: Id82a31dc94bb181f2d24eddcbfbfb6d6cdc99643
---
 util/cbfstool/elf.h        | 2 ++
 util/cbfstool/elfheaders.c | 1 +
 2 files changed, 3 insertions(+)

diff --git a/util/cbfstool/elf.h b/util/cbfstool/elf.h
index 8b56a71..c48589b 100644
--- a/util/cbfstool/elf.h
+++ b/util/cbfstool/elf.h
@@ -245,6 +245,8 @@ typedef struct
 #define EM_NUM		95
 #define EM_AARCH64	183		/* ARM AARCH64 */
 
+#define EM_AARCH64	183 /* ARM Aarch64 Architecture */
+
 /* If it is necessary to assign new unofficial EM_* values, please
    pick large random numbers (0x8523, 0xa7f2, etc.) to minimize the
    chances of collision with official or non-GNU unofficial values.  */
diff --git a/util/cbfstool/elfheaders.c b/util/cbfstool/elfheaders.c
index 634e76a..bee44d8 100644
--- a/util/cbfstool/elfheaders.c
+++ b/util/cbfstool/elfheaders.c
@@ -610,6 +610,7 @@ elf_headers(const struct buffer *pinput,
 
 	// The tool may work in architecture-independent way.
 	if (arch != CBFS_ARCHITECTURE_UNKNOWN &&
+	    !((ehdr->e_machine == EM_AARCH64) && (arch == CBFS_ARCHITECTURE_AARCH64)) &&
 	    !((ehdr->e_machine == EM_ARM) && (arch == CBFS_ARCHITECTURE_ARM)) &&
 	    !((ehdr->e_machine == EM_RISCV) && (arch == CBFS_ARCHITECTURE_RISCV)) &&
 	    !((ehdr->e_machine == EM_386) && (arch == CBFS_ARCHITECTURE_X86))) {