Merge "feat(plat/st): improve FIP image loading from MMC" into integration
This commit is contained in:
commit
4b431230e5
|
@ -9,6 +9,7 @@
|
|||
|
||||
#include <arch_helpers.h>
|
||||
#include <common/debug.h>
|
||||
#include <common/desc_image_load.h>
|
||||
#include <drivers/io/io_block.h>
|
||||
#include <drivers/io/io_driver.h>
|
||||
#include <drivers/io/io_fip.h>
|
||||
|
@ -45,7 +46,7 @@ static io_block_spec_t gpt_block_spec = {
|
|||
|
||||
static uint32_t block_buffer[MMC_BLOCK_SIZE] __aligned(MMC_BLOCK_SIZE);
|
||||
|
||||
static const io_block_dev_spec_t mmc_block_dev_spec = {
|
||||
static io_block_dev_spec_t mmc_block_dev_spec = {
|
||||
/* It's used as temp buffer in block driver */
|
||||
.buffer = {
|
||||
.offset = (size_t)&block_buffer,
|
||||
|
@ -423,6 +424,11 @@ int bl2_plat_handle_pre_image_load(unsigned int image_id)
|
|||
image_block_spec.length = entry->length;
|
||||
|
||||
gpt_init_done = true;
|
||||
} else {
|
||||
bl_mem_params_node_t *bl_mem_params = get_bl_mem_params_node(image_id);
|
||||
|
||||
mmc_block_dev_spec.buffer.offset = bl_mem_params->image_info.image_base;
|
||||
mmc_block_dev_spec.buffer.length = bl_mem_params->image_info.image_max_size;
|
||||
}
|
||||
|
||||
break;
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
#include <common/desc_image_load.h>
|
||||
#include <drivers/delay_timer.h>
|
||||
#include <drivers/generic_delay_timer.h>
|
||||
#include <drivers/mmc.h>
|
||||
#include <drivers/st/bsec.h>
|
||||
#include <drivers/st/stm32_console.h>
|
||||
#include <drivers/st/stm32_iwdg.h>
|
||||
|
@ -395,6 +396,19 @@ int bl2_plat_handle_post_image_load(unsigned int image_id)
|
|||
break;
|
||||
}
|
||||
|
||||
#if STM32MP_SDMMC || STM32MP_EMMC
|
||||
/*
|
||||
* Invalidate remaining data read from MMC but not flushed by load_image_flush().
|
||||
* We take the worst case which is 2 MMC blocks.
|
||||
*/
|
||||
if ((image_id != FW_CONFIG_ID) &&
|
||||
((bl_mem_params->image_info.h.attr & IMAGE_ATTRIB_SKIP_LOADING) == 0U)) {
|
||||
inv_dcache_range(bl_mem_params->image_info.image_base +
|
||||
bl_mem_params->image_info.image_size,
|
||||
2U * MMC_BLOCK_SIZE);
|
||||
}
|
||||
#endif /* STM32MP_SDMMC || STM32MP_EMMC */
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue