diff options
Diffstat (limited to 'common/spl')
| -rw-r--r-- | common/spl/spl_nor.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c index 0f8afa6f92..7df708de9b 100644 --- a/common/spl/spl_nor.c +++ b/common/spl/spl_nor.c @@ -6,7 +6,6 @@ #include <common.h> #include <spl.h> -#ifdef CONFIG_SPL_LOAD_FIT static ulong spl_nor_load_read(struct spl_load_info *load, ulong sector, ulong count, void *buf) { @@ -16,7 +15,6 @@ static ulong spl_nor_load_read(struct spl_load_info *load, ulong sector, return count; } -#endif unsigned long __weak spl_nor_get_uboot_base(void) { @@ -97,6 +95,13 @@ static int spl_nor_load_image(struct spl_image_info *spl_image, return ret; } #endif + if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER)) { + load.bl_len = 1; + load.read = spl_nor_load_read; + return spl_load_imx_container(spl_image, &load, + spl_nor_get_uboot_base()); + } + ret = spl_parse_image_header(spl_image, (const struct image_header *)spl_nor_get_uboot_base()); if (ret) |