From f836e14695827b2667804bc1058e08ec7b297921 Mon Sep 17 00:00:00 2001 From: "Ronald G. Minnich" Date: Tue, 12 Nov 2013 09:03:33 -0800 Subject: [PATCH] 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). BUG=None TEST=It builds an image for nyan, and no new code is added. BRANCH=None Change-Id: Ib4900900d99c9aae6eef858d8ee097709368c4d4 Reviewed-on: https://chromium-review.googlesource.com/180221 Reviewed-by: Stefan Reinauer Commit-Queue: Ronald Minnich Tested-by: Ronald Minnich --- 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 82cbfb3e44..c1f10b2df4 100644 --- a/util/cbfstool/cbfs.h +++ b/util/cbfstool/cbfs.h @@ -41,6 +41,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 dceca9f535..33f4cf41b0 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -520,7 +520,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 10faffd335..e6bf5555c3 100644 --- a/util/cbfstool/common.c +++ b/util/cbfstool/common.c @@ -113,6 +113,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" }