aboutsummaryrefslogtreecommitdiffstats
path: root/tools/mkimage
Commit message (Collapse)AuthorAgeFilesLines
* tools: mkimage: fix __u64 typedef conflict with new glibcYousong Zhou2019-09-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Including "sys/stat.h" from newer glibc will cause __u64 from linux uapi header to be included, causing compilation failure for u-boot tools USE_HOSTCC Remove typedef for __u64 in include/compiler.h to fix the issue. It should be safe because as of u-boot-2018.03, no ref to __u64 is found under u-boot tools/ directory Error message snippet follows HOSTCC tools/mkenvimage.o In file included from /usr/include/asm-generic/types.h:7, from /usr/include/asm/types.h:5, from /usr/include/linux/types.h:5, from /usr/include/linux/stat.h:5, from /usr/include/bits/statx.h:30, from /usr/include/sys/stat.h:446, from tools/mkenvimage.c:21: /usr/include/asm-generic/int-ll64.h:31:42: error: conflicting types for '__u64' 31 | __extension__ typedef unsigned long long __u64; | ^~~~~ In file included from <command-line>: ././include/compiler.h:69:18: note: previous declaration of '__u64' was here 69 | typedef uint64_t __u64; | ^~~~~ make[5]: *** [scripts/Makefile.host:116: tools/mkenvimage.o] Error 1 Ref: https://forum.openwrt.org/t/compile-error-19-07/44423 Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1699194 Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
* tools: mkimage: provide dtc path during buildJo-Philipp Wich2018-04-191-0/+1
| | | | | | | | | | | | | | | | | The new mkimage version requires a CONFIG_MKIMAGE_DTC_PATH variable to be provided during build, in order to hardcode a path to a suitable DT compiler executable. Failure to do so will result in stray "sh: 1: -I: not found" errors when invoking mkimage for FIT image generation. Fix the issue by supplying "dtc" as CONFIG_MKIMAGE_DTC_PATH value during build. As we intend our host utilities to be relocatable and since we're already overriding PATH when invoking mkimage, an absolute path is not required. Fixes: b13e981d72 ("tools/mkimage: update to version 2018.03") Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* tools/mkimage: update to version 2018.03Hauke Mehrtens2018-04-1815-1071/+147
| | | | | | | | This activates support for fit images and some other new mkimage features. Some of the patches were applied upstream and could be removed. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* tools/mkimage: copy mkenvimage to bin directoryEvgeniy Didin2018-02-131-0/+2
| | | | | | | | | | | | | | For some boards u-boot binary environment file is required, which is generated by mkenvimage utility. But in OpenWrt there is no separate support for mkenvimage, which is a part of u-boot tools. mkenvimage gets built in u-boot/tools as well as mkimage anyways. So lets just copy mkenvimage to the $(STAGING_DIR_HOST)/bin/ directory. Signed-off-by: Evgeniy Didin <Evgeniy.Didin@synopsys.com> CC: Alexey Brodkin <abrodkin@synopsys.com> CC: Hauke Mehrtens <hauke@hauke-m.de> CC: John Crispin <john@phrozen.org>
* tools/mkimage: fix musl buildMarty Plummer2017-08-231-0/+67
| | | | | | Taken from: http://git.denx.de/?p=u-boot.git;a=commit;h=26e355d131a6b56ea78a156c1cee4f6ba0500b37 Signed-off-by: Marty Plummer <ntzrmtthihu777@gmail.com>
* tools: mkimage: pass crypto libraries through HOST_LOADLIBES (FS#381)Jo-Philipp Wich2017-01-111-2/+2
| | | | | | | | Since linker argument order is significant on modern host compilers, pass the required libcrypto libraries through the HOST_LOADLIBES variable in order to ensure proper order of the final linker command line. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* tools: mkimage: use pkg-config to discover libcrypto linker flagsJo-Philipp Wich2017-01-051-2/+2
| | | | | | | | | LibreSSL's libcrypto.so has an indirect dependency to librt for clock_gettime() on Linux. Use pkg-config to portably discover the required linker flags. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* treewide: clean up download hashesFelix Fietkau2016-12-161-1/+1
| | | | | | Replace *MD5SUM with *HASH, replace MD5 hashes with SHA256 Signed-off-by: Felix Fietkau <nbd@nbd.name>
* mkimage: fix openssl 1.1.x compat fix with libresslFelix Fietkau2016-11-301-1/+1
| | | | | | | libressl sets OPENSSL_VERSION_NUMBER to 0x20000000L, which breaks API checks based on it. Signed-off-by: Felix Fietkau <nbd@nbd.name>
* tools: mkimage: fix build with OpenSSL 1.1.x (FS#182)Jo-Philipp Wich2016-11-301-0/+97
| | | | | | | | The OpenSSL 1.1.x version series undergone some major API changes which made the RSA structure opaque and deprecated a number of methods, so add some conditional compat code to make the u-boot source build again. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* tools: mkimage: sync include/linux/compiler*.h with u-boot masterMatthias Schiffer2016-05-082-87/+702
| | | | | | Fixes build with GCC 6. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
* tools/mkimage: backport SOURCE_DATE_EPOCH for reproducible buildsFelix Fietkau2016-01-284-12/+88
| | | | | | | | | | | | | | | | This pulls in Paul Kocialkowski's SOURCE_DATE_EPOCH support patch for u-boot, which landed upstream circa July 2015. Note that this "host" u-boot repo is only used to compile the 'mkimage' utility, and isn't used to actually compile a bootloader for any target. This patch could be removed if/when the host u-boot package is updated to a contemporary version (but there doesn't seem to be any motivation/need to do so). Signed-off-by: bryan newbold <bnewbold@robocracy.org> Signed-off-by: Felix Fietkau <nbd@openwrt.org> [fix portability error, refresh patches] SVN-Revision: 48542
* mkimage: cross compile fix: pass HOST_*FLAGS in to uboot's makefileFelix Fietkau2015-07-191-2/+2
| | | | | | | | | | The HOST_*FLAGS are for compiling programs which will run on the machine that is running the build. Setting these flags is frequently required for unusual cross-compiles. Signed-off-by: Lawrence D'Anna <larry@elder-gods.org> SVN-Revision: 46424
* tools/mkimage: backport gcc5 compatibility, patchHauke Mehrtens2015-05-191-0/+93
| | | | | | | | | | | | | | | | | | | | | Fedora 22 includes gcc5 by default build leads to error: include/linux/compiler-gcc.h:114:30: fatal error: linux/compiler-gcc5.h: No such file or directory backport upstream patch: "Add linux/compiler-gcc5.h to fix builds with gcc5" id: 478b02f1a7043b673565075ea5016376f3293b23 Issue was reported at https://forum.openwrt.org/viewtopic.php?id=56853 & replicated in a VM created, flashed and tested ar71xx image successfully as test Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 45703
* tools: remove static linking supportJo-Philipp Wich2015-02-061-3/+1
| | | | | | Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 44285
* tools: Fix mkimage build on FreeBSD 10.1Jo-Philipp Wich2015-02-051-0/+14
| | | | | | Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 44280
* mkimage: remove check for miscompiled __weakFelix Fietkau2014-12-011-0/+16
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43458
* tools/mkimage: fix build errors (#18445)Felix Fietkau2014-11-301-0/+52
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43441
* mkimage: update to 2014.10Luka Perkov2014-11-296-26/+21
| | | | | | Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 43428
* mkimage: update to 2014.07Luka Perkov2014-08-084-5/+5
| | | | | | Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 42082
* mkimage: update to 2014.04Luka Perkov2014-05-218-46/+35
| | | | | | Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 40807
* tools/mkimage: avoid a linux specific return codeFelix Fietkau2013-07-161-0/+11
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 37368
* mkimage: fix md5sum after r37361Luka Perkov2013-07-161-1/+1
| | | | | | Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 37366
* mkimage: update to 2013.07-rc1Luka Perkov2013-07-157-99/+13
| | | | | | | | also remove 100-dtc-binary.patch which was not accepted upstream Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 37361
* tools/mkimage: add back a fixed version of 040-include_order.patch to fix ↵Felix Fietkau2013-06-181-0/+14
| | | | | | | | build errors on some systems (#12232) Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 36967
* tools/mkimage: unbreak non-linux build againFelix Fietkau2013-05-061-0/+35
| | | | | | Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 36556
* mkimage: update to 2013.04Luka Perkov2013-05-056-24/+96
| | | | | | Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 36550
* mkimage: unbreak build on non-linux systemsFelix Fietkau2013-03-091-0/+31
| | | | SVN-Revision: 35909
* mkimage: upgrade to version 2013.01.01Luka Perkov2013-03-085-19/+18
| | | | SVN-Revision: 35905
* build: BSD compile fixesFelix Fietkau2013-03-071-0/+19
| | | | | | | | | | | | | | | | following patch allows to build images for Qemu ARM on OpenBSD 5.2 amd64 and FreeBSD 9.1 amd64. Mostly small pieces of code changes to get things right on the specific platform. Updated the README to describe better, which tools on the host are required. Added some kind of prepare scripts to install needed tools on BSD via packages. Signed-off-by: Waldemar Brodkorb <mail@waldemar-brodkorb.de> SVN-Revision: 35900
* tools/mkimage: avoid picking up unrelated /usr/include headers with the same ↵Felix Fietkau2012-09-232-0/+21
| | | | | | name as internal header files (e.g. image.h), fixes #12232 SVN-Revision: 33519
* convert remaining tools to $(HOST_STATIC_LINKING) (#12012)Jo-Philipp Wich2012-08-121-1/+1
| | | | SVN-Revision: 33148
* mkimage: link staticallyJo-Philipp Wich2012-08-101-1/+1
| | | | SVN-Revision: 33096
* mkimage: update to 2012.04.01Luka Perkov2012-06-092-3/+3
| | | | SVN-Revision: 32143
* mkimage: update to 2011.12Florian Fainelli2012-04-023-34/+12
| | | | | | Signed-off-by: Luka Perkov <openwrt@lukaperkov.net> SVN-Revision: 31171
* tools/mkimage: allow to use different magic in uImagesGabor Juhos2011-12-051-0/+63
| | | | SVN-Revision: 29442
* mkimage/getline.h - Mac OS X 10.7 (Lion) fixLars-Peter Clausen2011-08-051-0/+22
| | | | | | | | This mends mkimage for getline() in Mac OS X 10.7. Signed-off-by: Joe Roback <openwrt-devel at roback.cc> SVN-Revision: 27917
* use u-boot 2011.06 as sourceImre Kaloz2011-07-011-3/+3
| | | | SVN-Revision: 27336
* tools/mkimage: fix r24887Alexandros C. Couloumbis2011-01-031-46/+0
| | | | SVN-Revision: 24890
* tools/mkimage: fix compilation on FreeBSDAlexandros C. Couloumbis2011-01-032-0/+59
| | | | SVN-Revision: 24887
* tools/mkimage: remove the broken portability patch, it is no longer ↵Felix Fietkau2010-12-301-46/+0
| | | | | | necessary with the new version SVN-Revision: 24857
* use u-boot v2010.12Imre Kaloz2010-12-232-7/+7
| | | | SVN-Revision: 24809
* ensure an empty BUILD_DIR variable is passed down u-boot's makefileMichael Büsch2010-11-031-1/+1
| | | | SVN-Revision: 23832
* mkimage: fix compilation on FreeBSDJo-Philipp Wich2010-07-221-1/+16
| | | | SVN-Revision: 22344
* mkimage: fix spurious build errors caused by its braindead build systemFelix Fietkau2010-03-081-0/+1
| | | | SVN-Revision: 20065
* mkimage: fix compile errors on non-glibc systemsFelix Fietkau2010-01-101-0/+31
| | | | SVN-Revision: 19095
* upgrade and build from the u-boot sourceImre Kaloz2010-01-104-1122/+13
| | | | SVN-Revision: 19091
* build system refactoring in preparation for allowing packages to do ↵Felix Fietkau2009-02-221-7/+7
| | | | | | host-build steps SVN-Revision: 14610
* tools/mkimage: Include sys/types.h on Darwin/BSD.Felix Fietkau2007-12-051-1/+1
| | | | | | Signed-off-by: Andy Boyett <agb-openwrt@padded-cell.net> SVN-Revision: 9658
* build system cleanup/restructuring as described in ↵Felix Fietkau2007-08-071-7/+5
| | | | | | http://lists.openwrt.org/pipermail/openwrt-devel/2007-August/001159.html SVN-Revision: 8362