mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 08:21:14 +00:00
68cd4dc3ed
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>
81 lines
2.6 KiB
Diff
81 lines
2.6 KiB
Diff
This patch makes it possible to set a custom image magic.
|
|
|
|
--- a/tools/mkimage.c
|
|
+++ b/tools/mkimage.c
|
|
@@ -25,6 +25,7 @@ static struct image_tool_params params =
|
|
.arch = IH_ARCH_PPC,
|
|
.type = IH_TYPE_KERNEL,
|
|
.comp = IH_COMP_GZIP,
|
|
+ .magic = IH_MAGIC,
|
|
.dtc = MKIMAGE_DEFAULT_DTC_OPTIONS,
|
|
.imagename = "",
|
|
.imagename2 = "",
|
|
@@ -88,11 +89,12 @@ static void usage(const char *msg)
|
|
" -q ==> quiet\n",
|
|
params.cmdname);
|
|
fprintf(stderr,
|
|
- " %s [-x] -A arch -O os -T type -C comp -a addr -e ep -n name -d data_file[:data_file...] image\n"
|
|
+ " %s [-x] -A arch -O os -T type -C comp -M magic -a addr -e ep -n name -d data_file[:data_file...] image\n"
|
|
" -A ==> set architecture to 'arch'\n"
|
|
" -O ==> set operating system to 'os'\n"
|
|
" -T ==> set image type to 'type'\n"
|
|
" -C ==> set compression type 'comp'\n"
|
|
+ " -M ==> set image magic to 'magic'\n"
|
|
" -a ==> set load address to 'addr' (hex)\n"
|
|
" -e ==> set entry point to 'ep' (hex)\n"
|
|
" -n ==> set image name to 'name'\n"
|
|
@@ -163,7 +165,7 @@ static void process_args(int argc, char
|
|
int opt;
|
|
|
|
while ((opt = getopt(argc, argv,
|
|
- "a:A:b:B:c:C:d:D:e:Ef:FG:k:i:K:ln:N:p:o:O:rR:qstT:vVx")) != -1) {
|
|
+ "a:A:b:B:c:C:d:D:e:Ef:FG:k:i:K:lM:n:N:p:o:O:rR:qstT:vVx")) != -1) {
|
|
switch (opt) {
|
|
case 'a':
|
|
params.addr = strtoull(optarg, &ptr, 16);
|
|
@@ -254,6 +256,14 @@ static void process_args(int argc, char
|
|
case 'l':
|
|
params.lflag = 1;
|
|
break;
|
|
+ case 'M':
|
|
+ params.magic = strtoull(optarg, &ptr, 16);
|
|
+ if (*ptr) {
|
|
+ fprintf(stderr, "%s: invalid magic %s\n",
|
|
+ params.cmdname, optarg);
|
|
+ exit(EXIT_FAILURE);
|
|
+ }
|
|
+ break;
|
|
case 'n':
|
|
params.imagename = optarg;
|
|
break;
|
|
--- a/tools/default_image.c
|
|
+++ b/tools/default_image.c
|
|
@@ -56,7 +56,7 @@ static int image_verify_header(unsigned
|
|
*/
|
|
memcpy(hdr, ptr, sizeof(image_header_t));
|
|
|
|
- if (be32_to_cpu(hdr->ih_magic) != IH_MAGIC) {
|
|
+ if (be32_to_cpu(hdr->ih_magic) != params->magic) {
|
|
debug("%s: Bad Magic Number: \"%s\" is no valid image\n",
|
|
params->cmdname, params->imagefile);
|
|
return -FDT_ERR_BADMAGIC;
|
|
@@ -120,7 +120,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, addr);
|
|
--- a/tools/imagetool.h
|
|
+++ b/tools/imagetool.h
|
|
@@ -59,6 +59,7 @@ struct image_tool_params {
|
|
int arch;
|
|
int type;
|
|
int comp;
|
|
+ unsigned int magic;
|
|
char *dtc;
|
|
unsigned int addr;
|
|
unsigned int ep;
|