diff options
Diffstat (limited to 'plat/arm/common/arm_bl1_setup.c')
| -rw-r--r-- | plat/arm/common/arm_bl1_setup.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/plat/arm/common/arm_bl1_setup.c b/plat/arm/common/arm_bl1_setup.c index c94f0cd7..50d102af 100644 --- a/plat/arm/common/arm_bl1_setup.c +++ b/plat/arm/common/arm_bl1_setup.c @@ -73,7 +73,6 @@ meminfo_t *bl1_plat_sec_mem_layout(void) ******************************************************************************/ void arm_bl1_early_platform_setup(void) { - const size_t bl1_size = BL1_RAM_LIMIT - BL1_RAM_BASE; #if !ARM_DISABLE_TRUSTED_WDOG /* Enable watchdog */ @@ -88,13 +87,15 @@ void arm_bl1_early_platform_setup(void) bl1_tzram_layout.total_base = ARM_BL_RAM_BASE; bl1_tzram_layout.total_size = ARM_BL_RAM_SIZE; +#if !LOAD_IMAGE_V2 /* Calculate how much RAM BL1 is using and how much remains free */ bl1_tzram_layout.free_base = ARM_BL_RAM_BASE; bl1_tzram_layout.free_size = ARM_BL_RAM_SIZE; reserve_mem(&bl1_tzram_layout.free_base, &bl1_tzram_layout.free_size, BL1_RAM_BASE, - bl1_size); + BL1_RAM_LIMIT - BL1_RAM_BASE); +#endif /* LOAD_IMAGE_V2 */ } void bl1_early_platform_setup(void) @@ -131,7 +132,11 @@ void arm_bl1_plat_arch_setup(void) BL1_COHERENT_RAM_LIMIT #endif ); +#ifdef AARCH32 + enable_mmu_secure(0); +#else enable_mmu_el3(0); +#endif /* AARCH32 */ } void bl1_plat_arch_setup(void) |