Merge branch 'master' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / common / image-fit.c

diff --git a/common/image-fit.c b/common/image-fit.c
index a272ea2e83456d9a50018ffb1752b0e2016ddcf7..4ffc5aaa512cd10528f176dda4f764a8fd85150d 100644 (file)
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -1114,7 +1114,8 @@ int fit_image_check_arch(const void *fit, int noffset, uint8_t arch)
 
        if (fit_image_get_arch(fit, noffset, &image_arch))
                return 0;
-       return (arch == image_arch);
+       return (arch == image_arch) ||
+               (arch == IH_ARCH_I386 && image_arch == IH_ARCH_X86_64);
 }
 
 /**