[U-Boot] [PATCH] image.h Allow booting Aarch64 from arm

Ramon Fried ramon.fried at gmail.com
Mon May 14 21:43:55 UTC 2018


Snapdragon bootloader needs to jump from 32bit to 64bit
Allow booting in these cases when CONFIG_AARCH32_SUPPORT_ARM64 is
defined.

Signed-off-by: Ramon Fried <ramon.fried at gmail.com>
---
 include/image.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/include/image.h b/include/image.h
index df701e3470..598c66177d 100644
--- a/include/image.h
+++ b/include/image.h
@@ -817,7 +817,13 @@ 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) ||
+#ifndef CONFIG_AARCH32_SUPPORT_ARM64
 		(image_get_arch(hdr) == IH_ARCH_ARM && arch == IH_ARCH_ARM64);
+#else
+		(image_get_arch(hdr) == IH_ARCH_ARM && arch == IH_ARCH_ARM64) ||
+		(image_get_arch(hdr) == IH_ARCH_ARM64 && arch == IH_ARCH_ARM);
+#endif
+
 }
 static inline int image_check_os(const image_header_t *hdr, uint8_t os)
 {
-- 
2.17.0



More information about the U-Boot mailing list