diff options
| -rw-r--r-- | libgloss/ChangeLog | 5 | ||||
| -rw-r--r-- | libgloss/aarch64/cpu-init/rdimon-aem-el3.S | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog index 3c0c02d9a..8e75fe0d6 100644 --- a/libgloss/ChangeLog +++ b/libgloss/ChangeLog @@ -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 diff --git a/libgloss/aarch64/cpu-init/rdimon-aem-el3.S b/libgloss/aarch64/cpu-init/rdimon-aem-el3.S index 463762703..41db8f90c 100644 --- a/libgloss/aarch64/cpu-init/rdimon-aem-el3.S +++ b/libgloss/aarch64/cpu-init/rdimon-aem-el3.S @@ -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 |