andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1254 from masahir0y/bl2-at-el3 

Fix zero_normalmem() for BL2_AT_EL3
This commit is contained in:
davidcunado-arm 2018-02-08 13:33:11 +08:00 committed by GitHub
parent 5b75b4a725 79c7e72829
commit cc40f7fe01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/aarch64/misc_helpers.S
View File

@ -198,7 +198,7 @@ func zeromem_dczva
* Check for M bit (MMU enabled) of the current SCTLR_EL(1|3)
* register value and panic if the MMU is disabled.
*/
#if defined(IMAGE_BL1) || defined(IMAGE_BL31)
#if defined(IMAGE_BL1) || defined(IMAGE_BL31) || (defined(IMAGE_BL2) && BL2_AT_EL3)
mrs tmp1, sctlr_el3
#else
mrs tmp1, sctlr_el1