Skip to contentSkip to conversation

image.h Allow booting Aarch64 from arm

PATCH New Ramon Fried 2 participants 2 messages May 14, 2018 – May 15, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 image.h Allow booting Aarch64 from arm

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

---
 include/image.h | 6 ++++++
 1 file changed, 6 insertions(+)
include/image.h +6 -0
index df701e3470..598c66177d 100644
@@ -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)
 {
Signature · 1 line
2.17.0