diff options
| author | Linhui Liu <liulinhui36@gmail.com> | 2023-01-12 18:10:02 +0800 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2023-01-13 14:49:52 +0000 |
| commit | 1909a3d69be15b34430f8c30b9ec7c8ef07c9650 (patch) | |
| tree | 9ceefb4d9607290b8cf48c2e8f6d3d881f2f3bec /tools/mkimage/patches/030-allow-to-use-different-magic.patch | |
| parent | c83dbcdf8f1a045437e91fe7c022c990ea9b83ff (diff) | |
| download | upstream-1909a3d69be15b34430f8c30b9ec7c8ef07c9650.tar.gz upstream-1909a3d69be15b34430f8c30b9ec7c8ef07c9650.tar.bz2 upstream-1909a3d69be15b34430f8c30b9ec7c8ef07c9650.zip | |
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 <liulinhui36@gmail.com>
Diffstat (limited to 'tools/mkimage/patches/030-allow-to-use-different-magic.patch')
| -rw-r--r-- | tools/mkimage/patches/030-allow-to-use-different-magic.patch | 4 |
1 files changed, 2 insertions, 2 deletions
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 */ |