mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2025-07-24 13:01:36 +00:00
9dc4128e03
Update to the latest version. Remove upstreamed patches: 010-image-fit-sig-skip-in-tools-build-if-key-is-missing.patch[1] 011-tools-fit_check_sign-make-key-optional.patch[2] 012-tools-fit_check_sign-no-libcrypto.patch[2] [1]40dcd5088b[2]9c79c8fe70Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Link: https://github.com/openwrt/openwrt/pull/19342 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
41 lines
1.1 KiB
Diff
41 lines
1.1 KiB
Diff
--- a/boot/bootm.c
|
|
+++ b/boot/bootm.c
|
|
@@ -1191,10 +1191,6 @@ static int bootm_host_load_image(const v
|
|
ulong data, len;
|
|
struct bootm_headers images;
|
|
int noffset;
|
|
- ulong load_end, buf_size;
|
|
- uint8_t image_type;
|
|
- uint8_t image_comp;
|
|
- void *load_buf;
|
|
int ret;
|
|
|
|
fit_uname_config = fdt_get_name(fit, cfg_noffset, NULL);
|
|
@@ -1206,26 +1202,6 @@ static int bootm_host_load_image(const v
|
|
FIT_LOAD_IGNORED, &data, &len);
|
|
if (noffset < 0)
|
|
return noffset;
|
|
- if (fit_image_get_type(fit, noffset, &image_type)) {
|
|
- puts("Can't get image type!\n");
|
|
- return -EINVAL;
|
|
- }
|
|
-
|
|
- if (fit_image_get_comp(fit, noffset, &image_comp))
|
|
- image_comp = IH_COMP_NONE;
|
|
-
|
|
- /* Allow the image to expand by a factor of 4, should be safe */
|
|
- buf_size = (1 << 20) + len * 4;
|
|
- load_buf = malloc(buf_size);
|
|
- ret = image_decomp(image_comp, 0, data, image_type, load_buf,
|
|
- (void *)data, len, buf_size, &load_end);
|
|
- free(load_buf);
|
|
-
|
|
- if (ret) {
|
|
- ret = handle_decomp_error(image_comp, load_end - 0, buf_size, ret);
|
|
- if (ret != BOOTM_ERR_UNIMPLEMENTED)
|
|
- return ret;
|
|
- }
|
|
|
|
return 0;
|
|
}
|