[coreboot-gerrit] New patch to review for coreboot: b7d3da7 cbfstool: add aarch64 as a name

[Isaac Christensen]

Isaac Christensen ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6896

-gerrit

commit b7d3da7278655ae46f65e16420f035f86f09dd3c
Author: Ronald G. Minnich 
Date:   Tue Nov 12 09:03:33 2013 -0800

cbfstool: add aarch64 as a name

The aarch64 is not really an arm variant, it's sufficiently
    different that it can be considered (for purposes of cbfs, certainly)
    to be a new architecture.

Add a constant in cbfs.h and strings to correspond to it.
    Note that with the new cbfstool support that we added earlier,
    the actual use of aarch64 ELF files actually "just works" (at
    least when tested earlier).

Change-Id: Ib4900900d99c9aae6eef858d8ee097709368c4d4
    Reviewed-on: https://chromium-review.googlesource.com/180221
    Reviewed-by: Stefan Reinauer 
    Commit-Queue: Ronald Minnich 
    Tested-by: Ronald Minnich 
    (cherry picked from commit f836e14695827b2667804bc1058e08ec7b297921)
    Signed-off-by: Isaac Christensen 
---
 util/cbfstool/cbfs.h     | 1 +
 util/cbfstool/cbfstool.c | 2 +-
 util/cbfstool/common.c   | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h
index 6a54bc8..348a4da 100644
--- a/util/cbfstool/cbfs.h
+++ b/util/cbfstool/cbfs.h
@@ -52,6 +52,7 @@ struct cbfs_header {
 #define CBFS_ARCHITECTURE_UNKNOWN  0xFFFFFFFF
 #define CBFS_ARCHITECTURE_X86      0x00000001
 #define CBFS_ARCHITECTURE_ARM      0x00000010
+#define CBFS_ARCHITECTURE_AARCH64  0x0000aa64

#define CBFS_FILE_MAGIC "LARCHIVE"

diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index 937b610..5281ebc 100644
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -586,7 +586,7 @@ static void usage(char *name)
    		"Updates the FIT table with microcode entries\n"
         "\n"
         "ARCHes:\n"
-	     "  arm, x86\n"
+	     "  aarch64, arm, x86\n"
         "TYPEs:\n", name, name
        );
    print_supported_filetypes();
diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c
index a28e741..d05ad0d 100644
--- a/util/cbfstool/common.c
+++ b/util/cbfstool/common.c
@@ -130,6 +130,7 @@ static struct {
    uint32_t arch;
    const char *name;
 } arch_names[] = {
+	{ CBFS_ARCHITECTURE_AARCH64, "aarch64" },
    { CBFS_ARCHITECTURE_ARM, "arm" },
    { CBFS_ARCHITECTURE_X86, "x86" },
    { CBFS_ARCHITECTURE_UNKNOWN, "unknown" }