From 1909a3d69be15b34430f8c30b9ec7c8ef07c9650 Mon Sep 17 00:00:00 2001 From: Linhui Liu Date: Thu, 12 Jan 2023 18:10:02 +0800 Subject: tools/mkimage: update to 2023.01 Remove upstreamed patches: - 020-tools-mtk_image-split-gfh-header-verification-into-a.patch - 021-tools-mtk_image-split-the-code-of-generating-NAND-he.patch - 022-tools-mtk_image-add-support-for-nand-headers-used-by.patch Signed-off-by: Linhui Liu --- tools/mkimage/patches/030-allow-to-use-different-magic.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '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 591edf24ea..d88f1cf949 100644 --- a/tools/mkimage/patches/030-allow-to-use-different-magic.patch +++ b/tools/mkimage/patches/030-allow-to-use-different-magic.patch @@ -52,14 +52,14 @@ This patch makes it possible to set a custom image magic. +++ b/tools/default_image.c @@ -56,7 +56,7 @@ static int image_verify_header(unsigned */ - memcpy(hdr, ptr, sizeof(image_header_t)); + 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; -@@ -120,7 +120,7 @@ static void image_set_header(void *ptr, +@@ -119,7 +119,7 @@ static void image_set_header(void *ptr, } /* Build new header */ -- cgit v1.2.3