uboot-mediatek: fixes build when nmbm enabled
authorChukun Pan <amadeus@jmu.edu.cn>
Thu, 20 Apr 2023 15:03:08 +0000 (23:03 +0800)
committerDaniel Golle <daniel@makrotopia.org>
Tue, 2 May 2023 17:17:09 +0000 (18:17 +0100)
The image_header_t typedef has been removed from
uboot v2023.01 [1], replaced with legacy struct.

[1] https://github.com/u-boot/u-boot/commit/f3543e69442ca393e52df253d9c5d45bc189d471

Fixes: 3d5c542 ("uboot-mediatek: update to U-Boot 2023.01")
Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
package/boot/uboot-mediatek/patches/100-09-cmd-add-nmbm-command.patch

index c1188c62a58c81107845f3f4949a229910f62dc8..6b319384d516a8f88d9940be8575f41e26a3f324 100644 (file)
@@ -205,9 +205,9 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +#endif
 +      }
 +
-+      ret = mtd_read(mtd, off, sizeof(image_header_t), &retlen,
++      ret = mtd_read(mtd, off, sizeof(struct legacy_img_hdr), &retlen,
 +                     (void *)loadaddr);
-+      if (ret || retlen != sizeof(image_header_t)) {
++      if (ret || retlen != sizeof(struct legacy_img_hdr)) {
 +              printf("Failed to read NMBM at offset 0x%08llx\n", off);
 +              return CMD_RET_FAILURE;
 +      }
@@ -215,7 +215,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 +      switch (genimg_get_format((void *)loadaddr)) {
 +#if defined(CONFIG_LEGACY_IMAGE_FORMAT)
 +      case IMAGE_FORMAT_LEGACY:
-+              size = image_get_image_size((image_header_t *)loadaddr);
++              size = image_get_image_size((struct legacy_img_hdr *)loadaddr);
 +              image_name = "legacy";
 +              break;
 +#endif