Skip to content

Commit

Permalink
Revert "tools/mkimage: update to v2024.04"
Browse files Browse the repository at this point in the history
This reverts commit 8d934c1.

The update seems to be causing issues that need to be further
explored [0]. Let's revert it.

[0] - openwrt/openwrt#15078

Signed-off-by: Nick Hainke <[email protected]>
  • Loading branch information
PolynomialDivision committed Apr 6, 2024
1 parent 076e860 commit 0a0d892
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions tools/mkimage/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=mkimage
PKG_VERSION:=2024.04
PKG_VERSION:=2024.01

PKG_SOURCE:=u-boot-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:= \
https://mirror.cyberbits.eu/u-boot \
https://ftp.denx.de/pub/u-boot \
ftp://ftp.denx.de/pub/u-boot
PKG_HASH:=18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a
PKG_HASH:=b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3

HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/u-boot-$(PKG_VERSION)

Expand Down
4 changes: 2 additions & 2 deletions tools/mkimage/patches/030-allow-to-use-different-magic.patch
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ This patch makes it possible to set a custom image magic.
" -a ==> set load address to 'addr' (hex)\n"
" -e ==> set entry point to 'ep' (hex)\n"
" -n ==> set image name to 'name'\n"
@@ -160,7 +162,7 @@ static int add_content(int type, const c
@@ -159,7 +161,7 @@ static int add_content(int type, const c
}

static const char optstring[] =
Expand All @@ -33,7 +33,7 @@ This patch makes it possible to set a custom image magic.

static const struct option longopts[] = {
{ "load-address", required_argument, NULL, 'a' },
@@ -303,6 +305,14 @@ static void process_args(int argc, char
@@ -302,6 +304,14 @@ static void process_args(int argc, char
case 'l':
params.lflag = 1;
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ https://github.com/u-boot/u-boot/commit/3f04db891a353f4b127ed57279279f851c6b4917

--- a/tools/Kconfig
+++ b/tools/Kconfig
@@ -36,7 +36,7 @@ config TOOLS_FIT
@@ -31,7 +31,7 @@ config TOOLS_FIT
Enable FIT support in the tools builds.

config TOOLS_FIT_FULL_CHECK
Expand Down

0 comments on commit 0a0d892

Please sign in to comment.