* aarch64/cpu-init/rdimon-aem-el3.S (flat_map): Use bic-immediate

form to clear WXN bit.
This commit is contained in:
Corinna Vinschen 2014-01-28 11:16:19 +00:00
parent e5819caa0b
commit 645ec39159
2 changed files with 6 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2014-01-28 Kyrylo Tkachov <kyrylo.tkachov@arm.com>
* aarch64/cpu-init/rdimon-aem-el3.S (flat_map): Use bic-immediate
form to clear WXN bit.
2014-01-24 Kyrylo Tkachov <kyrylo.tkachov@arm.com>
* aarch64/cpu-init/rdimon-aem-el3.S (flat_map): Clear WXN bit

View File

@ -139,8 +139,7 @@ _flat_map:
mrs x0, sctlr_el3
ldr x1, =0x100d /* bits I(12) SA(3) C(2) M(0) */
bic x0, x0, #(1 << 1) /* clear bit A(1) */
mov x2, #(1 << 19) /* clear WXN */
bic x0, x0, x2
bic x0, x0, #(1 << 19) /* clear WXN */
orr x0, x0, x1 /* set bits */
dsb sy