tools/mkimage: update to v2024.04

[openwrt/openwrt.git] / tools / mkimage / patches / 030-allow-to-use-different-magic.patch

diff --git a/tools/mkimage/patches/030-allow-to-use-different-magic.patch b/tools/mkimage/patches/030-allow-to-use-different-magic.patch
index afc3f21a81e64d8ede42ec1d3497584e75b61337..bcbdc4d6cd12e7b7f4ff7a48a731825d90d43b81 100644 (file)
--- a/tools/mkimage/patches/030-allow-to-use-different-magic.patch
+++ b/tools/mkimage/patches/030-allow-to-use-different-magic.patch
@@ -1,6 +1,8 @@
+This patch makes it possible to set a custom image magic.
+
 --- a/tools/mkimage.c
 +++ b/tools/mkimage.c
-@@ -37,6 +37,7 @@
+@@ -26,6 +26,7 @@ static struct image_tool_params params =
        .arch = IH_ARCH_PPC,
        .type = IH_TYPE_KERNEL,
        .comp = IH_COMP_GZIP,
@@ -8,41 +10,67 @@
        .dtc = MKIMAGE_DEFAULT_DTC_OPTIONS,
        .imagename = "",
        .imagename2 = "",
-@@ -189,6 +190,16 @@
-                                       genimg_get_comp_id (*++argv)) < 0)
-                                       usage ();
-                               goto NXTARG;
-+                      case 'M':
-+                              if (--argc <=0)
-+                                      usage ();
-+                              params.magic = strtoul (*++argv, &ptr, 16);
-+                              if (*ptr) {
-+                                      fprintf (stderr,
-+                                              "%s: invalid magic %s\n",
-+                                              params.cmdname, *argv);
-+                              }
-+                              goto NXTARG;
-                       case 'D':
-                               if (--argc <= 0)
-                                       usage ();
-@@ -613,12 +624,13 @@
-       fprintf (stderr, "Usage: %s -l image\n"
-                        "          -l ==> list image header information\n",
+@@ -89,11 +90,12 @@ static void usage(const char *msg)
+                        "          -q ==> quiet\n",
                params.cmdname);
--      fprintf (stderr, "       %s [-x] -A arch -O os -T type -C comp "
-+      fprintf (stderr, "       %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"
---- a/tools/mkimage.h
-+++ b/tools/mkimage.h
-@@ -79,6 +79,7 @@
+       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"
+@@ -160,7 +162,7 @@ static int add_content(int type, const c
+ }
+ 
+ static const char optstring[] =
+-      "a:A:b:B:c:C:d:D:e:Ef:Fg:G:i:k:K:ln:N:o:O:p:qrR:stT:vVx";
++      "a:A:b:B:c:C:d:D:e:Ef:Fg:G:i:k:K:lM:n:N:o:O:p:qrR:stT:vVx";
+ 
+ static const struct option longopts[] = {
+       { "load-address", required_argument, NULL, 'a' },
+@@ -303,6 +305,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
+@@ -67,7 +67,7 @@ static int image_verify_header(unsigned
+        */
+       memcpy(hdr, ptr, sizeof(struct legacy_img_hdr));
+ 
+-      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;
+@@ -146,7 +146,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
+@@ -67,6 +67,7 @@ struct image_tool_params {
        int arch;
        int type;
        int comp;
@@ -50,14 +78,3 @@
        char *dtc;
        unsigned int addr;
        unsigned int ep;
---- a/tools/default_image.c
-+++ b/tools/default_image.c
-@@ -111,7 +111,7 @@
-                       sbuf->st_size - sizeof(image_header_t));
- 
-       /* Build new header */
--      image_set_magic(hdr, IH_MAGIC);
-+      image_set_magic(hdr, params->magic);
-       image_set_time(hdr, sbuf->st_mtime);
-       image_set_size(hdr, sbuf->st_size - sizeof(image_header_t));
-       image_set_load(hdr, params->addr);