andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "fix(st): don't try to read boot partition on SD cards" into integration

This commit is contained in:
Madhukar Pappireddy 2022-03-11 18:00:38 +01:00 committed by TrustedFirmware Code Review
parent 7d00e72a39 9492b391a3
commit c5f9d99a7e
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plat/st/common/bl2_stm32_io_storage.c
View File

@ -379,19 +379,21 @@ static void boot_mmc(enum mmc_device_type mmc_dev_type,
stm32_sdmmc2_mmc_get_device_size(); stm32_sdmmc2_mmc_get_device_size();
#if STM32MP_EMMC_BOOT #if STM32MP_EMMC_BOOT
magic = get_boot_part_ssbl_header(); if (mmc_dev_type == MMC_IS_EMMC) {
magic = get_boot_part_ssbl_header();
if (magic == BOOT_API_IMAGE_HEADER_MAGIC_NB) { if (magic == BOOT_API_IMAGE_HEADER_MAGIC_NB) {
VERBOSE("%s, header found, jump to emmc load\n", __func__); VERBOSE("%s, header found, jump to emmc load\n", __func__);
idx = IMG_IDX_BL33; idx = IMG_IDX_BL33;
part = &stm32image_dev_info_spec.part_info[idx]; part = &stm32image_dev_info_spec.part_info[idx];
part->part_offset = PLAT_EMMC_BOOT_SSBL_OFFSET; part->part_offset = PLAT_EMMC_BOOT_SSBL_OFFSET;
part->bkp_offset = 0U; part->bkp_offset = 0U;
mmc_device_spec.use_boot_part = true; mmc_device_spec.use_boot_part = true;
goto emmc_boot; goto emmc_boot;
} else { } else {
WARN("%s: Can't find STM32 header on a boot partition\n", __func__); WARN("%s: Can't find STM32 header on a boot partition\n", __func__);
}
} }
#endif #endif