diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2018-02-08 13:33:11 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-08 13:33:11 +0800 |
| commit | cc40f7fe017ad15884d7b7b93f9f9a702443f80b (patch) | |
| tree | 0b45a38f2aca3206d8bbef890e38bc09263ec0ab /lib | |
| parent | 5b75b4a725d062bd593856a665bfda0e1b23a04b (diff) | |
| parent | 79c7e72829115117d0cdca50c0e1a789623d8ee9 (diff) | |
Merge pull request #1254 from masahir0y/bl2-at-el3
Fix zero_normalmem() for BL2_AT_EL3
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/aarch64/misc_helpers.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/aarch64/misc_helpers.S b/lib/aarch64/misc_helpers.S index 9dfe46a2..3c64d3ca 100644 --- a/lib/aarch64/misc_helpers.S +++ b/lib/aarch64/misc_helpers.S @@ -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 |