Commit a1f5a9e5 authored by Roberto Vargas's avatar Roberto Vargas
Browse files

Don't use zero_normalmem in bl2_platform_setup



zero_normalmem only can zero memory when caches are enabled
and the target memory is a normal memory, otherwise an abort is
generated. In the case of EL3_PAYLOAD_BASE bl2_platform_setup was
calling zero_normalmem with device memory and it generated an abort.

Change-Id: If013603f209a12af488a9c54481f97a8f395b26a
Signed-off-by: default avatarRoberto Vargas <roberto.vargas@arm.com>
parent 77544efb
......@@ -74,11 +74,12 @@ void bl2_platform_setup(void)
* at the beginning of the Trusted SRAM. It is is overwritten before
* reaching this function. We need to restore this data, as if the
* target had just come out of reset. This implies:
* - zeroing the first 128 bytes of Trusted SRAM;
* - zeroing the first 128 bytes of Trusted SRAM using zeromem instead
* of zero_normalmem since this is device memory.
* - restoring the SCP boot configuration.
*/
VERBOSE("BL2: Restoring SCP reset data in Trusted SRAM\n");
zero_normalmem((void *)ARM_TRUSTED_SRAM_BASE, 128);
zeromem((void *) ARM_SHARED_RAM_BASE, 128);
mmio_write_32(SCP_BOOT_CFG_ADDR, scp_boot_config);
}
#endif /* EL3_PAYLOAD_BASE */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment