| Message ID | 1584541927-32664-1-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | image-fit: Allow loading FIT image for VxWorks | expand |
Hi Tom, On Wed, Mar 18, 2020 at 10:32 PM Bin Meng <bmeng.cn at gmail.com> wrote: > > From: Lihua Zhao <lihua.zhao at windriver.com> > > 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 at windriver.com> > Signed-off-by: Bin Meng <bmeng.cn at gmail.com> > Reviewed-by: Bin Meng <bmeng.cn at gmail.com> > --- > > common/image-fit.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > It will be good if we get this in v2020.04 release. Thanks! Regards, Bin
Hi Tom, On Wed, Mar 25, 2020 at 2:38 PM Bin Meng <bmeng.cn at gmail.com> wrote: > > Hi Tom, > > On Wed, Mar 18, 2020 at 10:32 PM Bin Meng <bmeng.cn at gmail.com> wrote: > > > > From: Lihua Zhao <lihua.zhao at windriver.com> > > > > 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 at windriver.com> > > Signed-off-by: Bin Meng <bmeng.cn at gmail.com> > > Reviewed-by: Bin Meng <bmeng.cn at gmail.com> > > --- > > > > common/image-fit.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > It will be good if we get this in v2020.04 release. Thanks! > Ping? Regards, Bin
On Wed, Mar 18, 2020 at 07:32:07AM -0700, Bin Meng wrote: > From: Lihua Zhao <lihua.zhao at windriver.com> > > 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 at windriver.com> > Signed-off-by: Bin Meng <bmeng.cn at gmail.com> > Reviewed-by: Bin Meng <bmeng.cn at gmail.com> Applied to u-boot/master, thanks!
diff --git a/common/image-fit.c b/common/image-fit.c index 4435bc4..6da69d2 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -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