From: Alison Wang <b18965@freescale.com>
Date: Tue, 6 Jun 2017 07:32:40 +0000 (+0800)
Subject: armv8: Support loading 32-bit OS which is not in the form of FIT
X-Git-Tag: v2017.07-rc2~60
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4ac0a32e2448f52ce02a57e23836b3b34b2db378;p=u-boot

armv8: Support loading 32-bit OS which is not in the form of FIT

As only FIT image is supported now, this patch is to support loading
32-bit uImage, dtb and rootfs separately.

Signed-off-by: Alison Wang <alison.wang@nxp.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
---

diff --git a/include/image.h b/include/image.h
index 8d380e0e84..fcfe730204 100644
--- a/include/image.h
+++ b/include/image.h
@@ -785,7 +785,8 @@ static inline int image_check_type(const image_header_t *hdr, uint8_t type)
 }
 static inline int image_check_arch(const image_header_t *hdr, uint8_t arch)
 {
-	return (image_get_arch(hdr) == arch);
+	return (image_get_arch(hdr) == arch) ||
+		(image_get_arch(hdr) == IH_ARCH_ARM && arch == IH_ARCH_ARM64);
 }
 static inline int image_check_os(const image_header_t *hdr, uint8_t os)
 {