Merge pull request #1075 from robertovargas-arm/fix_el3_payload

Don't use zero_normalmem in bl2_platform_setup
This commit is contained in:
danh-arm 2017-08-30 18:04:02 +01:00 committed by GitHub
commit 615cd166bd
1 changed files with 3 additions and 2 deletions

View File

@ -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 */