Commit Graph

48 Commits

Author SHA1 Message Date
Linhui Liu
1909a3d69b tools/mkimage: update to 2023.01
Remove upstreamed patches:
- 020-tools-mtk_image-split-gfh-header-verification-into-a.patch
- 021-tools-mtk_image-split-the-code-of-generating-NAND-he.patch
- 022-tools-mtk_image-add-support-for-nand-headers-used-by.patch

Signed-off-by: Linhui Liu <liulinhui36@gmail.com>
2023-01-13 14:49:52 +00:00
Daniel Golle
e3706bf497
tools/mkimage: bring back removed patches
Patches for mtk_image supporting newer SoCs have been dropped in the
process of updating mkimage to U-Boot 2022.10. While it is true that
the patches have been merged upstream a while ago, they were not merged
in time to be part of the U-Boot 2022.10 release.
See also commit 537b423d9f ("uboot-mediatek: update to U-Boot 2022.10")
which explicitly mentions that.

Fixes: 6e245777bd ("tools/mkimage: update to 2022.10")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2022-10-23 16:29:59 +01:00
Nick Hainke
6e245777bd tools/mkimage: update to 2022.10
Remove upstreamed patches:
- 020-tools-mtk_image-split-gfh-header-verification-into-a.patch
- 021-tools-mtk_image-split-the-code-of-generating-NAND-he.patch
- 022-tools-mtk_image-add-support-for-nand-headers-used-by.patch

Refreshed manually:
- 030-allow-to-use-different-magic.patch

Signed-off-by: Nick Hainke <vincent@systemli.org>
2022-10-22 22:50:36 +02:00
Daniel Golle
8686a9a085 tools: mkimage: Add support for MediaTek MT798x
Import pending patches for mtk_image to support BootROM headers of
newer MediaTek SoCs.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2022-08-28 19:01:55 +01:00
Daniel Golle
68cd4dc3ed mkimage: fix validation of legacy images with custom magic
All images generated by mkimage are now always validated.
This change broke our downstream support for setting a custom value for
IH_MAGIC (mkimage -M ...). Make sure also plain legacy kernel images
with custom value set for IH_MAGIC validate correctly.

Fixes: fa9895ee5b ("tools: mkimage: update to U-Boot release 2022.07")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2022-08-12 12:02:41 +02:00
Daniel Golle
fa9895ee5b tools: mkimage: update to U-Boot release 2022.07
Removed patch 090-macos-arm64-builing-fix.patch as an equivalent
solution was applied upstream:
 3b142045e8 Support building on macOS/arm64

To not add new host dependencies (libuuid, gnuTLS) don't build the
anyway unused mkeficapsule tool which would otherwise now be built
by default.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2022-08-11 17:11:54 +02:00
Daniel Golle
3fbf9689b6
tools/mkimage: increase tmpfile name length limit
mkimage limits the length of the file paths in can deal with to 256
characters. Turns out that in automated builds by asu we break this
limit, so increase it to 1024 characters.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2022-06-05 11:32:58 +01:00
Huangbin Zhan
4a19cf3bc7 tools/mkimage: update to 2022.01
- enable dot config
- enable openwrt verbose
- add bison as dependency to avoid failure
```
  bison -oscripts/kconfig/zconf.tab.c -t -l scripts/kconfig/zconf.y
bison: /builder/shared-workdir/build/staging_dir/host/share/bison/m4sugar/m4sugar.m4: cannot open: No such file or directory
```

Signed-off-by: Huangbin Zhan <zhanhb88@gmail.com>
2022-03-01 00:08:08 +01:00
Huangbin Zhan
b6385a3668 tools/mkimage: update to 2021.10
Changelog:

 - upstream now needs OpenSSL in order to be able to sign FITs. See:
commit cb9faa6f98ae ("tools: Use a single target-independent config to enable OpenSSL")

 - removes upstream patches.

Link: cb9faa6f98
Tested-by: Sergey V. Lobanov <sergey@lobanov.in>
Signed-off-by: Huangbin Zhan <zhanhb88@gmail.com>
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
2021-12-27 13:51:41 +01:00
Sergey V. Lobanov
8261b85844 tools/mkimage: fix build on MacOS arm64
Fixed -no-pie compilation warning on MacOS
Fixed errors related to using absolute addressing on MacOS arm64

Based on upstream patch from Jessica Clarke and suggestions from Ronny Kotzschmar

Link to original patch and discussion:
3b142045e8

Signed-off-by: Sergey V. Lobanov <sergey@lobanov.in>
2021-12-06 23:36:35 +01:00
Andre Heider
e37dffbf35 tools/mkimage: pass --static via PKG_CONFIG_EXTRAARGS
Remove the then unnecessary patch doing exactly that individually.

See also 09465d80 "u-boot.mk: always link host libraries static".

Signed-off-by: Andre Heider <a.heider@gmail.com>
2021-11-06 14:22:26 +01:00
Daniel Golle
ce19e8fa43
tools: mkimage: add patches for 64-bit MediaTek BootROM
Add patches for mkimage to allow using it instead of the binary-only
'bromimage' tool to generate bl2 for MT7622.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-03-11 16:24:20 +00:00
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
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
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
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
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
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
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
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
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
Jo-Philipp Wich
4ad8aa543d mkimage: fix compilation on FreeBSD
SVN-Revision: 22344
2010-07-22 02:43:44 +00:00
Felix Fietkau
43d56d9b56 mkimage: fix compile errors on non-glibc systems
SVN-Revision: 19095
2010-01-10 18:42:12 +00:00