Merge "Neoverse N1: Introduce workaround for Neoverse N1 erratum 1315703" into integr...

diff --cc lib/cpus/aarch64/neoverse_n1.S
index dadaf98b42aede5bf23791508be5676963a90d6f,3b8e8afb7af84d55e96adaeff2a491aeb33b127b..d685b7e9b1d825af27783086e7d08fe05d5257bd
--- 1/lib/cpus/aarch64/neoverse_n1.S
--- 2/lib/cpus/aarch64/neoverse_n1.S
+++ b/lib/cpus/aarch64/neoverse_n1.S
@@@ -15,13 -15,8 +15,13 @@@
  #error "Neoverse N1 must be compiled with HW_ASSISTED_COHERENCY enabled"
  #endif
  
 +/* 64-bit only core */
 +#if CTX_INCLUDE_AARCH32_REGS == 1
 +#error "Neoverse-N1 supports only AArch64. Compile with CTX_INCLUDE_AARCH32_REGS=0"
 +#endif
 +
  /* --------------------------------------------------
-  * Errata Workaround for Neoverse N1 Errata
+  * Errata Workaround for Neoverse N1 Erratum 1043202.
   * This applies to revision r0p0 and r1p0 of Neoverse N1.
   * Inputs:
   * x0: variant[4:7] and revision[0:3] of current cpu.