Skip to content

GitLab

Unverified Commit cc40f7fe authored by davidcunado-arm's avatar davidcunado-arm Committed by GitHub
Browse files

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

Fix zero_normalmem() for BL2_AT_EL3
parents 5b75b4a7 79c7e728
Show whitespace changes
Inline Side-by-side
lib/aarch64/misc_helpers.S
View file @ cc40f7fe
...@@ -198,7 +198,7 @@ func zeromem_dczva ...@@ -198,7 +198,7 @@ func zeromem_dczva
* Check for M bit (MMU enabled) of the current SCTLR_EL(1|3) * Check for M bit (MMU enabled) of the current SCTLR_EL(1|3)
* register value and panic if the MMU is disabled. * 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 mrs tmp1, sctlr_el3
#else #else
mrs tmp1, sctlr_el1 mrs tmp1, sctlr_el1
......
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