]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
image-fit: Allow loading FIT image for VxWorks
authorLihua Zhao <lihua.zhao@windriver.com>
Wed, 18 Mar 2020 14:32:07 +0000 (07:32 -0700)
committerTom Rini <trini@konsulko.com>
Tue, 31 Mar 2020 14:06:52 +0000 (10:06 -0400)
This adds the check against IH_OS_VXWORKS during FIT image load,
to allow loading FIT image for VxWorks.

Signed-off-by: Lihua Zhao <lihua.zhao@windriver.com>
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
common/image-fit.c

index 4435bc4f1d9389a34154ad5b835e2d67b656c364..6da69d25ffe234f3c774bc37f58626d473cecaf3 100644 (file)
@@ -2007,7 +2007,8 @@ int fit_image_load(bootm_headers_t *images, ulong addr,
                fit_image_check_os(fit, noffset, IH_OS_LINUX) ||
                fit_image_check_os(fit, noffset, IH_OS_U_BOOT) ||
                fit_image_check_os(fit, noffset, IH_OS_OPENRTOS) ||
-               fit_image_check_os(fit, noffset, IH_OS_EFI);
+               fit_image_check_os(fit, noffset, IH_OS_EFI) ||
+               fit_image_check_os(fit, noffset, IH_OS_VXWORKS);
 
        /*
         * If either of the checks fail, we should report an error, but