domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools/mkimage: Update U-Boot to version 2019.07

Browse Source 
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>
This commit is contained in:
Hauke Mehrtens
2019-05-11 16:57:15 +02:00
parent 662394fb30
commit 169152c8d1
10 changed files with 212 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/mkimage/patches/030-allow-to-use-different-magic.patch
View File

@@ -1,6 +1,8 @@
This patch makes it possible to set a custom image magic.
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -21,6 +21,7 @@ static struct image_tool_params params =
@@ -20,6 +20,7 @@ static struct image_tool_params params =
.arch = IH_ARCH_PPC,
.type = IH_TYPE_KERNEL,
.comp = IH_COMP_GZIP,
@@ -8,7 +10,7 @@
.dtc = MKIMAGE_DEFAULT_DTC_OPTIONS,
.imagename = "",
.imagename2 = "",
@@ -77,11 +78,12 @@ static void usage(const char *msg)
@@ -76,11 +77,12 @@ static void usage(const char *msg)
" -l ==> list image header information\n",
params.cmdname);
fprintf(stderr,
@@ -22,7 +24,7 @@
" -a ==> set load address to 'addr' (hex)\n"
" -e ==> set entry point to 'ep' (hex)\n"
" -n ==> set image name to 'name'\n"
@@ -144,7 +146,7 @@ static void process_args(int argc, char
@@ -143,7 +145,7 @@ static void process_args(int argc, char
int opt;
while ((opt = getopt(argc, argv,
@@ -31,7 +33,7 @@
switch (opt) {
case 'a':
params.addr = strtoull(optarg, &ptr, 16);
@@ -222,6 +224,14 @@ static void process_args(int argc, char
@@ -221,6 +223,14 @@ static void process_args(int argc, char
case 'l':
params.lflag = 1;
break;
@@ -48,18 +50,18 @@
break;
--- a/tools/default_image.c
+++ b/tools/default_image.c
@@ -106,7 +106,7 @@ static void image_set_header(void *ptr,
imagesize = sbuf->st_size - sizeof(image_header_t);
@@ -116,7 +116,7 @@ static void image_set_header(void *ptr,
}
/* Build new header */
- image_set_magic(hdr, IH_MAGIC);
+ image_set_magic(hdr, params->magic);
image_set_time(hdr, time);
image_set_size(hdr, imagesize);
image_set_load(hdr, params->addr);
image_set_load(hdr, addr);
--- a/tools/imagetool.h
+++ b/tools/imagetool.h
@@ -54,6 +54,7 @@ struct image_tool_params {
@@ -53,6 +53,7 @@ struct image_tool_params {
int arch;
int type;
int comp;