u-boot/tools
Marek Vasut 3463314125 mkimage: Fix warning from fix for generating multi and script images again
Seems 6ae6e160 broke creating images in certain cases, there
are two problems with that patch.

First is that the expression "!x == 4 || !x == 6" is ambiguous.  The
intention here was "!(x == 4) || !(x == 6)" based on reading further in
the file, where this was borrowed from.  This however is interpreted by
gcc as "(!x) == 4 || (!x) == 6" and always false.  gcc-5.x will warn
about this case.

The second problem is that we do not want to test for the case of "(NOT x
is 4) OR (NOT x is 6)" but instead "(x is not equal to 4) AND (x is not
equal to 6)".  This is because in those two cases we already execute the
code question in another part of the file.  Rewrite the expression and
add parenthesis for clarity.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Tom Rini <trini@konsulko.com>
Cc: Philippe De Swert <philippedeswert@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
[trini: Re-word Marek's explanation]
2015-12-07 13:28:09 -05:00
..
buildman buildman: Improve the config comparison feature 2015-09-09 07:48:03 -06:00
easylogo Various Makefiles: Add SPDX-License-Identifier tags 2015-11-10 09:19:52 -05:00
env Allow fw env tools to be available as library 2015-11-18 08:47:03 -05:00
gdb Makefile: move BFD_ROOT_DIR to tools/gdb/Makefile 2014-02-19 11:07:50 -05:00
kermit tools: move kermit files to tools/kermit directory 2014-01-24 16:59:07 -05:00
logos logos: add Toradex logo 2015-08-13 07:19:37 -04:00
omap Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
palmtreo680 pxa: palmtreo680 flash programming utility 2013-06-22 15:25:28 +02:00
patman Revert "patman: use -D option for git format-patch" 2015-09-09 07:48:03 -06:00
scripts kbuild: move asm-offsets.h rules to ./Kbuild 2014-02-25 11:01:28 -05:00
.gitignore gitignore: Add defconfig and fdtgrep 2015-08-05 08:42:39 -06:00
aisimage.c imagetool: replace image registration function by linker_lists feature 2015-01-29 13:38:41 -05:00
aisimage.h Coding Style cleanup: remove trailing white space 2013-10-14 16:06:53 -04:00
atmel_pmecc_params.c arm:at91: enable ROM loadable atmel image 2014-05-27 00:10:49 +02:00
atmelimage.c tools/atmelimage.c: Fix warning when debug is enabled 2015-08-28 14:01:11 -04:00
bin2header.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
bmp_logo.c tools, bmp_logo: fix index from uint16_t to int to allow bigger logos 2013-08-10 10:48:00 +02:00
default_image.c Fix variation in timestamps caused by timezone differences. 2015-10-11 17:12:12 -04:00
dumpimage.c dumpimage: replace the term "datafile" by "subimage" 2015-01-29 13:38:41 -05:00
dumpimage.h includes: move openssl headers to include/u-boot 2014-06-19 11:19:04 -04:00
envcrc.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
fdt_host.h tools, fit_check_sign: verify a signed fit image 2014-03-21 16:40:38 -04:00
fdtgrep.c fdtgrep: Simplify the alias generation code 2015-11-04 14:49:51 +01:00
fit_check_sign.c Fix bad return value checks (detected with Coccinelle) 2015-10-24 13:50:30 -04:00
fit_common.c mkimage: Automatically make space in FDT when full 2014-06-11 16:25:46 -04:00
fit_common.h mkimage: Automatically make space in FDT when full 2014-06-11 16:25:46 -04:00
fit_image.c dumpimage: fit: extract FIT images 2015-01-29 13:38:41 -05:00
fit_info.c tools, fit_info: increase buffer for command name 2014-08-14 11:20:24 +02:00
gen_eth_addr.c tools: gen_eth_addr: add getpid() to time(0) to avoid duplicated seed 2015-09-28 10:48:25 -04:00
genboardscfg.py tools/genboardscfg.py: pick up also commented maitainers 2014-09-24 18:30:28 -04:00
getline.c Add GPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:44:38 -04:00
getline.h getline: split out for darwin systems 2010-01-26 00:07:13 +01:00
gpheader.h tools: mkimage: add support for gpimage format 2014-04-17 17:24:38 -04:00
gpimage-common.c dumpimage: add 'T' option to explicitly set the image type 2015-01-29 13:38:41 -05:00
gpimage.c imagetool: replace image registration function by linker_lists feature 2015-01-29 13:38:41 -05:00
ifdtool.c x86: ifdtool: Support checking region overlap before U-Boot 2015-09-09 07:48:03 -06:00
ifdtool.h tools/ifdtool: Support writing multiple files (-w) simultaneously 2014-12-13 22:32:04 -07:00
image-host.c tools: fix typo in tools/image-host.c 2014-08-14 11:20:01 +02:00
imagetool.c tools/imagetool: remove linker script 2015-02-16 12:41:41 -05:00
imagetool.h mkimage: Allow the original file size to be recorded 2015-09-02 21:28:23 -06:00
img2brec.sh Coding Style cleanup: replace leading SPACEs by TABs 2013-10-14 16:06:54 -04:00
img2srec.c img2srec: use standard types 2009-11-24 23:43:18 +01:00
imximage.c imximage: fix commands other than write_data 2015-10-07 13:43:15 +02:00
imximage.h imximage: fix commands other than write_data 2015-10-07 13:43:15 +02:00
jtagconsole Blackfin: jtagconsole: disable output processing 2010-07-25 15:17:23 -04:00
kwbimage.c tools/kwbimage: fix size computations for v1 images 2015-11-29 16:02:44 +01:00
kwbimage.h tools/kwbimage: fix endianess issue 2015-11-29 16:02:44 +01:00
kwboot.c tools: kwboot: Add support for UART boot mode patching for Armada XP/38x 2015-10-01 02:02:06 +02:00
lpc32xximage.c lpc32xx: add lpc32xx-spl.bin boot image target 2015-04-10 14:23:26 +02:00
Makefile rockchip: Add max spl size & spl header configs 2015-12-01 08:07:22 -07:00
microcode-tool x86: Add a script to process Intel microcode files 2014-12-18 17:26:08 -07:00
microcode-tool.py x86: Enhance the microcode tool to support header files as input 2015-02-05 22:16:42 -07:00
mingw_support.c Add LGPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:45:01 -04:00
mingw_support.h Add LGPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:45:01 -04:00
mkenvimage.c Patch to mkenvimage to handle text files with length that exceed env size 2015-03-28 12:07:47 -04:00
mkexynosspl.c Fix bad return value checks (detected with Coccinelle) 2015-10-24 13:50:30 -04:00
mkimage.c mkimage: Fix warning from fix for generating multi and script images again 2015-12-07 13:28:09 -05:00
mkimage.h includes: move openssl headers to include/u-boot 2014-06-19 11:19:04 -04:00
mksunxiboot.c sunxi: (mksunxiboot) signature to indicate "sunxi" SPL variant 2015-09-29 11:50:07 +02:00
moveconfig.py tools: moveconfig: Update the URL for nds32 toolchain 2015-09-28 11:03:55 -04:00
mxsboot.c mxs: mxsboot: fix endianess for sd boot images 2015-09-13 10:19:40 +02:00
mxsimage.c imagetool: replace image registration function by linker_lists feature 2015-01-29 13:38:41 -05:00
mxsimage.h ARM: mxs: tools: Add support for boot progress display flag 2014-11-20 10:13:45 +01:00
ncb.c ncb: Check return value of write() 2009-04-28 01:16:46 +02:00
netconsole net: Make netconsole src and dest ports configurable 2012-09-24 13:17:24 -05:00
omapimage.c imagetool: replace image registration function by linker_lists feature 2015-01-29 13:38:41 -05:00
omapimage.h tools: mkimage: add support for gpimage format 2014-04-17 17:24:38 -04:00
os_support.c Add LGPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:45:01 -04:00
os_support.h Add LGPL-2.0+ SPDX-License-Identifier to source files 2013-07-24 09:45:01 -04:00
pbl_crc32.c mkimage : Split out and clean pbl_crc32 for use by other image types 2014-06-05 14:38:38 -04:00
pbl_crc32.h mkimage : Split out and clean pbl_crc32 for use by other image types 2014-06-05 14:38:38 -04:00
pblimage.c imagetool: replace image registration function by linker_lists feature 2015-01-29 13:38:41 -05:00
pblimage.h Coding Style cleanup: remove trailing white space 2013-10-14 16:06:53 -04:00
proftool.c tools/proftool: fix use-after-free 2015-11-16 17:22:18 -05:00
relocate-rela.c relocate-rela: replace a magic number with sizeof(Elf64_Rela) 2014-02-13 15:16:47 +01:00
rkcommon.c rockchip: Add support for rk's second level loader 2015-12-01 08:07:22 -07:00
rkcommon.h rockchip: Add support for rk's second level loader 2015-12-01 08:07:22 -07:00
rkimage.c rockchip: Add max spl size & spl header configs 2015-12-01 08:07:22 -07:00
rksd.c rockchip: Add support for rk's second level loader 2015-12-01 08:07:22 -07:00
rkspi.c rockchip: Add support for rk's second level loader 2015-12-01 08:07:22 -07:00
socfpgaimage.c tools: do not print error messages in verify_header() functions 2015-01-29 13:38:41 -05:00
ublimage.c imagetool: replace image registration function by linker_lists feature 2015-01-29 13:38:41 -05:00
ublimage.h Coding Style cleanup: remove trailing white space 2013-10-14 16:06:53 -04:00
ubsha1.c includes: move openssl headers to include/u-boot 2014-06-19 11:19:04 -04:00
xway-swap-bytes.c MIPS: INCA-IP: rename inca-swap-bytes host tool 2011-07-31 23:25:41 +09:00
zynqimage.c tools: zynqimage: Add Xilinx Zynq boot header generation to mkimage 2015-11-19 13:09:21 +01:00