On 14.8.2016 20:31, Andreas Bießmann wrote: > Commit 62afc601883e788f3f22291202d5b2a23c1a8b06 introduced fpga image load via > bootm but broke the OS check in fit_image_load(). > > This commit removes following compiler warning: > > ---8<--- > In file included from tools/common/image-fit.c:1: > /Volumes/devel/u-boot/tools/../common/image-fit.c:1715:39: warning: use of > logical '||' with constant operand [-Wconstant-logical-operand] > os_ok = image_type == IH_TYPE_FLATDT || IH_TYPE_FPGA || > ^ ~~~~~~~~~~~~ > /Volumes/devel/u-boot/tools/../common/image-fit.c:1715:39: note: use '|' for > a bitwise operation > os_ok = image_type == IH_TYPE_FLATDT || IH_TYPE_FPGA || > ^~ > | > 1 warning generated. > --->8--- > > Signed-off-by: Andreas Bießmann <andr...@biessmann.org> > Cc: Michal Simek <michal.si...@xilinx.com> > --- > common/image-fit.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/common/image-fit.c b/common/image-fit.c > index d8d4e95..f833fe3 100644 > --- a/common/image-fit.c > +++ b/common/image-fit.c > @@ -1712,7 +1712,8 @@ int fit_image_load(bootm_headers_t *images, ulong addr, > (image_type == IH_TYPE_KERNEL && > fit_image_check_type(fit, noffset, IH_TYPE_KERNEL_NOLOAD)); > > - os_ok = image_type == IH_TYPE_FLATDT || IH_TYPE_FPGA || > + os_ok = image_type == IH_TYPE_FLATDT || > + image_type == IH_TYPE_FPGA || > 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); >
hm. Interesting. I didn't see that compilation warning. Acked-by: Michal Simek <michal.si...@xilinx.com> Thanks, Michal _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
