From e28f7b8f95338fdb155b9649b6f3f7511b041b22 Mon Sep 17 00:00:00 2001
From: Fredrik Holmqvist <fredrik.holmqvist@gmail.com>
Date: Fri, 20 Aug 2021 17:57:02 +0200
Subject: [PATCH] Fixup dtb.cpp: For ARM64 we use official __aarch64__ define

It is easier if we switch compiler and reduces confusion,
other than the confusing name itself.
---
 src/system/boot/platform/efi/dtb.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/system/boot/platform/efi/dtb.cpp b/src/system/boot/platform/efi/dtb.cpp
index d97205b047..9e1f05e8e2 100644
--- a/src/system/boot/platform/efi/dtb.cpp
+++ b/src/system/boot/platform/efi/dtb.cpp
@@ -11,7 +11,7 @@
 #include <arch/generic/debug_uart_8250.h>
 #if defined(__riscv)
 #	include <arch/riscv64/arch_uart_sifive.h>
-#elif defined(__ARM__) || defined(__ARM64__)
+#elif defined(__ARM__) || defined(__aarch64__)
 #	include <arch/arm/arch_uart_pl011.h>
 #endif
 #include <boot/addr_range.h>
@@ -67,7 +67,7 @@ const struct supported_uarts {
 	{ "ns16550", UART_KIND_8250, &get_uart<DebugUART8250> },
 #if defined(__riscv)
 	{ "sifive,uart0", UART_KIND_SIFIVE, &get_uart<ArchUARTSifive> },
-#elif defined(__ARM__) || defined(__ARM64__)
+#elif defined(__ARM__) || defined(__aarch64__)
 	{ "arm,pl011", UART_KIND_PL011, &get_uart<ArchUARTPL011> },
 	{ "arm,primecell", UART_KIND_PL011, &get_uart<ArchUARTPL011> },
 #endif