Commit Graph

61 Commits

Author SHA1 Message Date
Hauke Mehrtens
e6ccb40ba5 tools: mkimage: Update U-Boot to version 2021.01
* The fit image is now created with 0666 permission in upstream U-Boot
  remove our patch switch creates it with 0744
* The generated/autoconf.h file is created now as an empty file, it is
  not needed to remove this include any more.
* Upstream lib/rsa/rsa-sign.c now includes stdlib.h instead of malloc.h
* ALIGN_MASK was moved to imagetool.h, own patch should not be needed
  any more.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2021-02-08 22:46:27 +01:00
Ted Hess
600416d5c1 tools/mkimage: create .itb file with read-access for group,other not just owner.
This patch will fix the source of 403 errors on these files
from downloads.openwrt.org.

Signed-off-by: Ted Hess <thess@kitschensync.net>
2020-07-23 14:25:10 -04:00
Lucian Cristian
042917f1c4 tools/mkimage: update to 2020.04
also change the download source to https and add a mirror
drop merged patches

Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>
[Add extra changes to compile on FreeBSD, merge two patches]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2020-04-26 21:20:47 +02:00
Hauke Mehrtens
169152c8d1 tools/mkimage: Update U-Boot to version 2019.07
This updates the U-Boot which provides the host tools like mkimage to
version 2019.07.
The patches were cleaned up and it was checked if this still compiles
on Linux and FreeBSD.

CONFIG_FIT_SIGNATURE_MAX_SIZE is set to the default value.

The patch for libressl was merged upstream.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2019-09-04 22:35:22 +02:00
Felix Fietkau
fd8705e635 tools/mkimage: use http download server (fixes FS#2052)
Fixes timeouts with trying to access the FTP site.
Also remove mirror2.openwrt.org, which does not keep current tarballs

Signed-off-by: Felix Fietkau <nbd@nbd.name>
2019-03-07 13:28:30 +01:00
Jo-Philipp Wich
a656ea0bdb tools: mkimage: provide dtc path during build
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>
2018-04-19 08:34:34 +02:00
Hauke Mehrtens
b13e981d72 tools/mkimage: update to version 2018.03
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>
2018-04-18 23:59:32 +02:00
Evgeniy Didin
063fa4cfa2 tools/mkimage: copy mkenvimage to bin directory
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>
2018-02-13 10:01:52 +01:00
Marty Plummer
9ebb23cf51 tools/mkimage: fix musl build
Taken from: http://git.denx.de/?p=u-boot.git;a=commit;h=26e355d131a6b56ea78a156c1cee4f6ba0500b37

Signed-off-by: Marty Plummer <ntzrmtthihu777@gmail.com>
2017-08-23 15:12:15 +02:00
Jo-Philipp Wich
69be65b594 tools: mkimage: pass crypto libraries through HOST_LOADLIBES (FS#381)
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>
2017-01-11 03:48:30 +01:00
Jo-Philipp Wich
0c03650160 tools: mkimage: use pkg-config to discover libcrypto linker flags
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>
2017-01-05 14:21:27 +01:00
Felix Fietkau
720b99215d treewide: clean up download hashes
Replace *MD5SUM with *HASH, replace MD5 hashes with SHA256

Signed-off-by: Felix Fietkau <nbd@nbd.name>
2016-12-16 22:39:22 +01:00
Felix Fietkau
e678c9f764 mkimage: fix openssl 1.1.x compat fix with libressl
libressl sets OPENSSL_VERSION_NUMBER to 0x20000000L, which breaks API
checks based on it.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
2016-11-30 20:24:33 +01:00
Jo-Philipp Wich
70b104f98c tools: mkimage: fix build with OpenSSL 1.1.x (FS#182)
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>
2016-11-30 18:20:32 +01:00
Matthias Schiffer
c7e2a89a4d
tools: mkimage: sync include/linux/compiler*.h with u-boot master
Fixes build with GCC 6.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2016-05-08 23:37:40 +02:00
Felix Fietkau
37f09b8129 tools/mkimage: backport SOURCE_DATE_EPOCH for reproducible builds
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
2016-01-28 22:42:44 +00:00
Felix Fietkau
0fc6755f66 mkimage: cross compile fix: pass HOST_*FLAGS in to uboot's makefile
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
2015-07-19 14:59:26 +00:00
Hauke Mehrtens
2ef739d258 tools/mkimage: backport gcc5 compatibility, patch
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
2015-05-19 22:17:16 +00:00
Jo-Philipp Wich
f7e56763e1 tools: remove static linking support
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 44285
2015-02-06 00:00:43 +00:00
Jo-Philipp Wich
d91e0a4df6 tools: Fix mkimage build on FreeBSD 10.1
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 44280
2015-02-05 16:58:16 +00:00
Felix Fietkau
c3a7057e43 mkimage: remove check for miscompiled __weak
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 43458
2014-12-01 11:07:30 +00:00
Felix Fietkau
eb41cee9e8 tools/mkimage: fix build errors (#18445)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 43441
2014-11-30 20:29:10 +00:00
Luka Perkov
25d8cb275e mkimage: update to 2014.10
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 43428
2014-11-29 22:43:59 +00:00
Luka Perkov
f170eacc88 mkimage: update to 2014.07
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 42082
2014-08-08 21:03:14 +00:00
Luka Perkov
5342a1a2ea mkimage: update to 2014.04
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 40807
2014-05-21 09:42:33 +00:00
Felix Fietkau
ccdd6e8215 tools/mkimage: avoid a linux specific return code
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37368
2013-07-16 09:43:31 +00:00
Luka Perkov
9823099718 mkimage: fix md5sum after r37361
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 37366
2013-07-16 07:56:42 +00:00
Luka Perkov
620739e0be mkimage: update to 2013.07-rc1
also remove 100-dtc-binary.patch which was not accepted upstream

Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 37361
2013-07-15 23:18:36 +00:00
Felix Fietkau
bfab82392a tools/mkimage: add back a fixed version of 040-include_order.patch to fix build errors on some systems (#12232)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 36967
2013-06-18 21:53:46 +00:00
Felix Fietkau
4053e50591 tools/mkimage: unbreak non-linux build again
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 36556
2013-05-06 10:30:29 +00:00
Luka Perkov
b693bfc710 mkimage: update to 2013.04
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 36550
2013-05-05 20:11:04 +00:00
Felix Fietkau
a23b6acbf5 mkimage: unbreak build on non-linux systems
SVN-Revision: 35909
2013-03-09 19:00:39 +00:00
Luka Perkov
9c8ee9c264 mkimage: upgrade to version 2013.01.01
SVN-Revision: 35905
2013-03-08 20:16:11 +00:00
Felix Fietkau
1f77bfff96 build: BSD compile fixes
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
2013-03-07 17:32:29 +00:00
Felix Fietkau
dcd3a74da0 tools/mkimage: avoid picking up unrelated /usr/include headers with the same name as internal header files (e.g. image.h), fixes #12232
SVN-Revision: 33519
2012-09-23 08:49:34 +00:00
Jo-Philipp Wich
7304953292 convert remaining tools to $(HOST_STATIC_LINKING) (#12012)
SVN-Revision: 33148
2012-08-12 13:27:49 +00:00
Jo-Philipp Wich
299762f190 mkimage: link statically
SVN-Revision: 33096
2012-08-10 19:26:34 +00:00
Luka Perkov
605c741c79 mkimage: update to 2012.04.01
SVN-Revision: 32143
2012-06-09 18:06:13 +00:00
Florian Fainelli
6d4358aed0 mkimage: update to 2011.12
Signed-off-by: Luka Perkov <openwrt@lukaperkov.net>

SVN-Revision: 31171
2012-04-02 16:25:23 +00:00
Gabor Juhos
f3d2056b81 tools/mkimage: allow to use different magic in uImages
SVN-Revision: 29442
2011-12-05 14:52:22 +00:00
Lars-Peter Clausen
b043b26b54 mkimage/getline.h - Mac OS X 10.7 (Lion) fix
This mends mkimage for getline() in Mac OS X 10.7.

Signed-off-by: Joe Roback <openwrt-devel at roback.cc>

SVN-Revision: 27917
2011-08-05 16:53:43 +00:00
Imre Kaloz
3d95ace099 use u-boot 2011.06 as source
SVN-Revision: 27336
2011-07-01 13:36:23 +00:00
Alexandros C. Couloumbis
d6b2ce5df5 tools/mkimage: fix r24887
SVN-Revision: 24890
2011-01-03 14:27:53 +00:00
Alexandros C. Couloumbis
4e83015c51 tools/mkimage: fix compilation on FreeBSD
SVN-Revision: 24887
2011-01-03 12:30:19 +00:00
Felix Fietkau
32510b4494 tools/mkimage: remove the broken portability patch, it is no longer necessary with the new version
SVN-Revision: 24857
2010-12-30 15:48:32 +00:00
Imre Kaloz
3d501f9403 use u-boot v2010.12
SVN-Revision: 24809
2010-12-23 00:07:58 +00:00
Michael Büsch
676520cf65 ensure an empty BUILD_DIR variable is passed down u-boot's makefile
SVN-Revision: 23832
2010-11-03 18:26:26 +00:00
Jo-Philipp Wich
4ad8aa543d mkimage: fix compilation on FreeBSD
SVN-Revision: 22344
2010-07-22 02:43:44 +00:00
Felix Fietkau
fe05a0887b mkimage: fix spurious build errors caused by its braindead build system
SVN-Revision: 20065
2010-03-08 17:17:46 +00:00
Felix Fietkau
43d56d9b56 mkimage: fix compile errors on non-glibc systems
SVN-Revision: 19095
2010-01-10 18:42:12 +00:00