diff options
| author | Tom Rini <[email protected]> | 2026-05-15 17:32:13 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-05-15 17:32:13 -0600 |
| commit | dc4dd589269d0c3fbaee6be41241b66d685686b2 (patch) | |
| tree | 5b7489ec0f9d6abc28466d06de30f32e424493b5 /common | |
| parent | a6f6947e43fba91de3ec5d0390eee7eb1a6a80f7 (diff) | |
| parent | 9e46861a01dd0a011616bf219f393303580dcd8b (diff) | |
Merge tag 'u-boot-imx-next-20260515' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx into next
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/30134
- Several conversions to OF_UPSTREAM.
- Added i.MX9 Quickboot support.
- Added support for i.MX952 in the fsl_enetc driver.
- Update i.MX91 part number detection.
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/spl_imx_container.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/common/spl/spl_imx_container.c b/common/spl/spl_imx_container.c index 79d021f81dc..57cd75b9b5e 100644 --- a/common/spl/spl_imx_container.c +++ b/common/spl/spl_imx_container.c @@ -88,6 +88,7 @@ static int read_auth_container(struct spl_image_info *spl_image, struct spl_load_info *info, ulong offset) { struct container_hdr *container = NULL; + struct container_hdr *authhdr; u16 length; int i, size, ret = 0; @@ -140,15 +141,19 @@ static int read_auth_container(struct spl_image_info *spl_image, } } + authhdr = container; + #ifdef CONFIG_AHAB_BOOT - ret = ahab_auth_cntr_hdr(container, length); - if (ret) + authhdr = ahab_auth_cntr_hdr(authhdr, length); + if (!authhdr) { + ret = -EINVAL; goto end_auth; + } #endif - for (i = 0; i < container->num_images; i++) { + for (i = 0; i < authhdr->num_images; i++) { struct boot_img_t *image = read_auth_image(spl_image, info, - container, i, + authhdr, i, offset); if (!image) { |