Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-20 03:24:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "refactor(imx8mm): cleanup the mmap region settings" into integration

Browse source
This commit is contained in:
Madhukar Pappireddy 2022-11-01 15:15:45 +01:00 • committed by TrustedFirmware Code Review
commit a213c27ba7
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c
View file

@ -184,20 +184,30 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
bl31_tzc380_setup(); bl31_tzc380_setup();
} }
#define MAP_BL31_TOTAL \
MAP_REGION_FLAT(BL31_BASE, BL31_LIMIT - BL31_BASE, MT_MEMORY | MT_RW | MT_SECURE)
#define MAP_BL31_RO \
MAP_REGION_FLAT(BL_CODE_BASE, BL_CODE_END - BL_CODE_BASE, MT_MEMORY | MT_RO | MT_SECURE)
#define MAP_COHERENT_MEM \
MAP_REGION_FLAT(BL_COHERENT_RAM_BASE, BL_COHERENT_RAM_END - BL_COHERENT_RAM_BASE, \
MT_DEVICE | MT_RW | MT_SECURE)
#define MAP_BL32_TOTAL \
MAP_REGION_FLAT(BL32_BASE, BL32_SIZE, MT_MEMORY | MT_RW)
void bl31_plat_arch_setup(void) void bl31_plat_arch_setup(void)
{ {
mmap_add_region(BL31_BASE, BL31_BASE, (BL31_LIMIT - BL31_BASE), const mmap_region_t bl_regions[] = {
MT_MEMORY | MT_RW | MT_SECURE); MAP_BL31_TOTAL,
mmap_add_region(BL_CODE_BASE, BL_CODE_BASE, (BL_CODE_END - BL_CODE_BASE), MAP_BL31_RO,
MT_MEMORY | MT_RO | MT_SECURE);
#if USE_COHERENT_MEM #if USE_COHERENT_MEM
mmap_add_region(BL_COHERENT_RAM_BASE, BL_COHERENT_RAM_BASE, MAP_COHERENT_MEM,
(BL_COHERENT_RAM_END - BL_COHERENT_RAM_BASE),
MT_DEVICE | MT_RW | MT_SECURE);
#endif #endif
/* Map TEE memory */ /* Map TEE memory */
mmap_add_region(BL32_BASE, BL32_BASE, BL32_SIZE, MT_MEMORY | MT_RW); MAP_BL32_TOTAL,
{0}
};
mmap_add(bl_regions);
mmap_add(imx_mmap); mmap_add(imx_mmap);
init_xlat_tables(); init_xlat_tables();