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>
This commit is contained in:
Linhui Liu
2023-01-12 18:10:02 +08:00
committed by Daniel Golle
parent c83dbcdf8f
commit 1909a3d69b
5 changed files with 4 additions and 1616 deletions

View File

@@ -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 */