summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaphael Poggi <poggi.raph@gmail.com>2016-07-04 13:52:56 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2016-07-06 11:23:50 +0200
commit940511012af5b2e522b0caff50897e129b46f849 (patch)
tree2e6b4008925362d121142846a598d2f8649c6947
parent10bf671754cbf7780f5fff19a987644e305c647f (diff)
downloadbarebox-940511012af5b2e522b0caff50897e129b46f849.tar.gz
barebox-940511012af5b2e522b0caff50897e129b46f849.tar.xz
uimage: add define for ARM64 architecture
Signed-off-by: Raphael Poggi <poggi.raph@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--common/image.c1
-rw-r--r--include/image.h5
2 files changed, 6 insertions, 0 deletions
diff --git a/common/image.c b/common/image.c
index f3ec071ee1..04cd86bf9a 100644
--- a/common/image.c
+++ b/common/image.c
@@ -59,6 +59,7 @@ static table_entry_t arch_name[] = {
{ IH_ARCH_AVR32, "avr32", "AVR32", },
{ IH_ARCH_NDS32, "nds32", "NDS32", },
{ IH_ARCH_OPENRISC, "or1k", "OpenRISC 1000",},
+ { IH_ARCH_ARM64, "arm64", "AArch64", },
{ -1, "", "", },
};
diff --git a/include/image.h b/include/image.h
index 07ab0f14d5..3e75d49b88 100644
--- a/include/image.h
+++ b/include/image.h
@@ -84,11 +84,16 @@
#define IH_ARCH_SANDBOX 19 /* Sandbox architecture (test only) */
#define IH_ARCH_NDS32 20 /* ANDES Technology - NDS32 */
#define IH_ARCH_OPENRISC 21 /* OpenRISC 1000 */
+#define IH_ARCH_ARM64 22 /* ARM64 */
#if defined(__PPC__)
#define IH_ARCH IH_ARCH_PPC
#elif defined(__ARM__)
+#ifdef CONFIG_CPU_64v8
+#define IH_ARCH IH_ARCH_ARM64
+#else
#define IH_ARCH IH_ARCH_ARM
+#endif
#elif defined(__I386__) || defined(__x86_64__) || defined(__i386__)
#define IH_ARCH IH_ARCH_I386
#elif defined(__mips__)