diff options
| author | Andreas Bießmann <andreas@biessmann.org> | 2016-08-14 20:31:24 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-09-06 13:18:19 -0400 |
| commit | 950fe26de9d6e7355b96c6f5dcc8455398216b9f (patch) | |
| tree | 04d635087e881a5e0d7f99cddf73f6e1ff247d2b | |
| parent | 601147b06a708900c5352dc3dcc5d64271bf0d62 (diff) | |
| download | u-boot-imx-950fe26de9d6e7355b96c6f5dcc8455398216b9f.zip u-boot-imx-950fe26de9d6e7355b96c6f5dcc8455398216b9f.tar.gz u-boot-imx-950fe26de9d6e7355b96c6f5dcc8455398216b9f.tar.bz2 | |
image-fit: fix fit_image_load() OS check
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 <andreas@biessmann.org>
Cc: Michal Simek <michal.simek@xilinx.com>
Acked-by: Michal Simek <michal.simek@xilinx.com>
| -rw-r--r-- | common/image-fit.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |