]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
armv8: Support loading 32-bit OS which is not in the form of FIT
authorAlison Wang <b18965@freescale.com>
Tue, 6 Jun 2017 07:32:40 +0000 (15:32 +0800)
committerTom Rini <trini@konsulko.com>
Sat, 10 Jun 2017 00:34:56 +0000 (20:34 -0400)
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>
include/image.h

index 8d380e0e848009cbfbe37c9799707f81ced3a88a..fcfe730204a63e54f9063ad270050e84a0d1d540 100644 (file)
@@ -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)
 {