Add CURRENTEL_EL3 #define

Add a CURRENTEL_EL3 #define to make tests against the value of CurrentEL
clearer.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>

diff --git a/boot.S b/boot.S
index 9cc382b08ba53a085f593d58f0f7bf48ae933c07..69d1714981bfad4cf6addf043f22b4554b1b42f4 100644 (file)
--- a/boot.S
+++ b/boot.S
@@ -17,7 +17,7 @@ _start:
         * EL3 initialisation
         */
        mrs     x0, CurrentEL
-       cmp     x0, #0xc                        // EL3?
+       cmp     x0, #CURRENTEL_EL3
        b.ne    start_ns                        // skip EL3 initialisation
 
        mov     x0, #0x30                       // RES1

diff --git a/common.S b/common.S
index d82d11b8b7ce2eb5f1ba9f344729545a6dc8cc65..bbe005bf013bbef33713822c48b987bd07f57cb0 100644 (file)
--- a/common.S
+++ b/common.S
@@ -7,6 +7,8 @@
  * found in the LICENSE.txt file.
  */
 
+#define        CURRENTEL_EL3   (3 << 2)
+
 #define SPSR_A         (1 << 8)        /* System Error masked */
 #define SPSR_D         (1 << 9)        /* Debug masked */
 #define SPSR_I         (1 << 7)        /* IRQ masked */