LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MLK-20442 imx8qm/qxp: Fix SPL crash when authentication is failed 

When booting SPL from SD/MMC, the codes load and parse container image
first, if its authentication is failed, the flow continues to load and parse
for FIT image and cause crash in SPL.

The correct way should stop the booting if authentication is failed, avoid
trying the FIT image since FIT does not support AHAB on 8QM/QXP.

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit 7843ab1b61)
This commit is contained in:
Ye Li 2018-11-21 22:17:08 -08:00
parent 53e60095df
commit ad4ca1a49d
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/spl/spl_mmc.c
View File

@ -185,7 +185,7 @@ static int mmc_load_image_raw_partition(struct spl_image_info *spl_image,
err = part_get_info(mmc_get_blk_desc(mmc), type_part, &info);
if (err)
continue;
if (info.sys_ind ==
if (info.sys_ind ==
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_TYPE) {
partition = type_part;
break;
@ -400,12 +400,10 @@ int spl_mmc_load_image(struct spl_image_info *spl_image,
#ifdef CONFIG_PARSE_CONTAINER
err = mmc_load_image_parse_container(spl_image, mmc,
spl_mmc_get_uboot_raw_sector(mmc));
if (!err)
return err;
#endif
#else
err = mmc_load_image_raw_sector(spl_image, mmc,
spl_mmc_get_uboot_raw_sector(mmc));
#endif
#endif
if (!err)
return err;