tools/mkimage: update to 2023.04

[openwrt/staging/nbd.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 d88f1cf9496ed2bf00ca18b7af208d9c933455eb..c33b0f4327ad71722085f9916c8000b9dcfdb42c 100644 (file)
--- a/tools/mkimage/patches/030-allow-to-use-different-magic.patch
+++ b/tools/mkimage/patches/030-allow-to-use-different-magic.patch
@@ -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' },
-@@ -298,6 +300,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;
@@ -50,7 +50,7 @@ This patch makes it possible to set a custom image magic.
                        break;
 --- a/tools/default_image.c
 +++ b/tools/default_image.c
-@@ -56,7 +56,7 @@ static int image_verify_header(unsigned
+@@ -63,7 +63,7 @@ static int image_verify_header(unsigned
         */
        memcpy(hdr, ptr, sizeof(struct legacy_img_hdr));
  
@@ -59,7 +59,7 @@ This patch makes it possible to set a custom image magic.
                debug("%s: Bad Magic Number: \"%s\" is no valid image\n",
                      params->cmdname, params->imagefile);
                return -FDT_ERR_BADMAGIC;
-@@ -119,7 +119,7 @@ static void image_set_header(void *ptr,
+@@ -142,7 +142,7 @@ static void image_set_header(void *ptr,
        }
  
        /* Build new header */
@@ -70,7 +70,7 @@ This patch makes it possible to set a custom image magic.
        image_set_load(hdr, addr);
 --- a/tools/imagetool.h
 +++ b/tools/imagetool.h
-@@ -59,6 +59,7 @@ struct image_tool_params {
+@@ -67,6 +67,7 @@ struct image_tool_params {
        int arch;
        int type;
        int comp;