Merge changes I826ff15a,If9b22e08,I0d0c46b0,I09560475,I69d13bd8 into integration

* changes:
  fix(aarch32): remove unused macro
  fix: remove stale references to ENABLE_PLAT_COMPAT
  fix(el3-runtime): correctly detect a trap of a sysreg read
  docs(el3-runtime): have a more precise pseudocode link
  chore(cpus): update developer.arm.com links to support.arm.com

53 files changed, 92 insertions, 120 deletions

diff --git a/bl31/bl31_traps.c b/bl31/bl31_traps.c
index e4cad2f3e..940ec8834 100644
--- a/bl31/bl31_traps.c
+++ b/bl31/bl31_traps.c
@@ -26,7 +26,7 @@ int handle_sysreg_trap(uint64_t esr_el3, cpu_context_t *ctx, u_register_t flags)
 {
 	uint64_t opcode = EXTRACT(ESR_ISS, esr_el3) & ~(MASK(ISS_SYS64_DIR) | MASK(ISS_SYS64_RT));
 	uint8_t rt = EXTRACT(ISS_SYS64_RT, esr_el3);
-	bool is_read = EXTRACT(ISS_SYS64_DIR, opcode);
+	bool is_read = EXTRACT(ISS_SYS64_DIR, esr_el3);
 
 	if (is_feat_idte3_supported() &&
 	    ((opcode >= ISS_SYSREG_OPCODE_IDREG_MIN &&
@@ -113,7 +113,7 @@ int handle_sysreg_trap(uint64_t esr_el3, cpu_context_t *ctx, u_register_t flags)
  * The code here is based on pseudocode described in the Arm ARM (DDI0487). They
  * can also be found in the Arm A-profile A64 Instruction Set Architecture
  * document (DDI0602) available at
- * https://developer.arm.com/documentation/ddi0602/latest/.
+ * https://support.arm.com/documentation/ddi0602/latest/Shared-Pseudocode.
  *
  * NOTE: This piece of code must be reviewed every release against the latest
  * sequence to ensure that we keep up with new arch features.
diff --git a/include/arch/aarch32/asm_macros.S b/include/arch/aarch32/asm_macros.S
index 4faa13abe..e9f7b1628 100644
--- a/include/arch/aarch32/asm_macros.S
+++ b/include/arch/aarch32/asm_macros.S
@@ -121,14 +121,6 @@
 	.endm
 #endif
 
-	/* Macro for error synchronization */
-	.macro synchronize_errors
-	/* Complete any stores that may return an abort */
-	dsb	sy
-	/* Synchronise the CPU context with the completion of the dsb */
-	isb
-	.endm
-
 	/*
 	 * Helper macro to generate the best mov/movw/movt combinations
 	 * according to the value to be moved.
diff --git a/lib/cpus/aarch64/c1_nano.S b/lib/cpus/aarch64/c1_nano.S
index 26828ceb8..491f016c8 100644
--- a/lib/cpus/aarch64/c1_nano.S
+++ b/lib/cpus/aarch64/c1_nano.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/107753/latest
- * SDEN: https://developer.arm.com/documentation/SDEN-3273788/latest
+ * TRM: https://support.arm.com/documentation/107753/latest
+ * SDEN: https://support.arm.com/documentation/SDEN-3273788/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/c1_premium.S b/lib/cpus/aarch64/c1_premium.S
index 4444574d1..06cf1fae5 100644
--- a/lib/cpus/aarch64/c1_premium.S
+++ b/lib/cpus/aarch64/c1_premium.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/109416/latest
- * SDEN: https://developer.arm.com/documentation/111078/latest
+ * TRM: https://support.arm.com/documentation/109416/latest
+ * SDEN: https://support.arm.com/documentation/111078/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/c1_pro.S b/lib/cpus/aarch64/c1_pro.S
index 782e3cc4d..44b3c758e 100644
--- a/lib/cpus/aarch64/c1_pro.S
+++ b/lib/cpus/aarch64/c1_pro.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/107771/latest
- * SDEN: https://developer.arm.com/documentation/SDEN-3273080/latest
+ * TRM: https://support.arm.com/documentation/107771/latest
+ * SDEN: https://support.arm.com/documentation/SDEN-3273080/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/c1_ultra.S b/lib/cpus/aarch64/c1_ultra.S
index fcef72e0f..2a1beea1e 100644
--- a/lib/cpus/aarch64/c1_ultra.S
+++ b/lib/cpus/aarch64/c1_ultra.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/108014/latest
- * SDEN: https://developer.arm.com/documentation/111077/latest
+ * TRM: https://support.arm.com/documentation/108014/latest
+ * SDEN: https://support.arm.com/documentation/111077/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/cortex_a320.S b/lib/cpus/aarch64/cortex_a320.S
index f5dad5459..21e4f7d87 100644
--- a/lib/cpus/aarch64/cortex_a320.S
+++ b/lib/cpus/aarch64/cortex_a320.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/109551/latest
- * SDEN: https://developer.arm.com/documentation/SDEN-2877630/latest
+ * TRM: https://support.arm.com/documentation/109551/latest
+ * SDEN: https://support.arm.com/documentation/SDEN-2877630/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/cortex_a35.S b/lib/cpus/aarch64/cortex_a35.S
index cb560031e..7fc51853a 100644
--- a/lib/cpus/aarch64/cortex_a35.S
+++ b/lib/cpus/aarch64/cortex_a35.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/100236/latest
- * SDEN: https://developer.arm.com/documentation/SDEN843627/latest
+ * TRM: https://support.arm.com/documentation/100236/latest
+ * SDEN: https://support.arm.com/documentation/SDEN843627/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/cortex_a510.S b/lib/cpus/aarch64/cortex_a510.S
index 491ee64cf..9813172ff 100644
--- a/lib/cpus/aarch64/cortex_a510.S
+++ b/lib/cpus/aarch64/cortex_a510.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/101604/latest
- * SDEN: https://developer.arm.com/documentation/SDEN1873351/latest
+ * TRM: https://support.arm.com/documentation/101604/latest
+ * SDEN: https://support.arm.com/documentation/SDEN1873351/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/cortex_a520.S b/lib/cpus/aarch64/cortex_a520.S
index b62622e22..a0a65abcf 100644
--- a/lib/cpus/aarch64/cortex_a520.S
+++ b/lib/cpus/aarch64/cortex_a520.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/102517/latest
- * SDEN: https://developer.arm.com/documentation/SDEN-2444153/latest
+ * TRM: https://support.arm.com/documentation/102517/latest
+ * SDEN: https://support.arm.com/documentation/SDEN-2444153/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/cortex_a520ae.S b/lib/cpus/aarch64/cortex_a520ae.S
index abc1a1e20..7af7a6c82 100644
--- a/lib/cpus/aarch64/cortex_a520ae.S
+++ b/lib/cpus/aarch64/cortex_a520ae.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/107726/latest
- * SDEN: https://developer.arm.com/documentation/SDEN-2343003/latest
+ * TRM: https://support.arm.com/documentation/107726/latest
+ * SDEN: https://support.arm.com/documentation/SDEN-2343003/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/cortex_a53.S b/lib/cpus/aarch64/cortex_a53.S
index ccda4c4d8..095c14611 100644
--- a/lib/cpus/aarch64/cortex_a53.S
+++ b/lib/cpus/aarch64/cortex_a53.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/ddi0500/latest
- * SDEN: https://developer.arm.com/documentation/epm048406/latest
+ * TRM: https://support.arm.com/documentation/ddi0500/latest
+ * SDEN: https://support.arm.com/documentation/epm048406/latest
  */
 #include <arch.h>
 #include <asm_macros.S>
diff --git a/lib/cpus/aarch64/cortex_a55.S b/lib/cpus/aarch64/cortex_a55.S
index 70b710719..30bc61703 100644
--- a/lib/cpus/aarch64/cortex_a55.S
+++ b/lib/cpus/aarch64/cortex_a55.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/100442/latest
- * SDEN: https://developer.arm.com/documentation/SDEN-859338/latest
+ * TRM: https://support.arm.com/documentation/100442/latest
+ * SDEN: https://support.arm.com/documentation/SDEN-859338/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/cortex_a57.S b/lib/cpus/aarch64/cortex_a57.S
index c386c7a9b..bdde84da9 100644
--- a/lib/cpus/aarch64/cortex_a57.S
+++ b/lib/cpus/aarch64/cortex_a57.S
@@ -4,8 +4,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/ddi0488/latest
- * SDEN: https://developer.arm.com/documentation/epm049219/latest
+ * TRM: https://support.arm.com/documentation/ddi0488/latest
+ * SDEN: https://support.arm.com/documentation/epm049219/latest
  */
 #include <arch.h>
 #include <asm_macros.S>
diff --git a/lib/cpus/aarch64/cortex_a65.S b/lib/cpus/aarch64/cortex_a65.S
index 0eee1946c..650a4623b 100644
--- a/lib/cpus/aarch64/cortex_a65.S
+++ b/lib/cpus/aarch64/cortex_a65.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/100439/latest
- * SDEN: https://developer.arm.com/documentation/SDEN1065159/latest/
+ * TRM: https://support.arm.com/documentation/100439/latest
+ * SDEN: https://support.arm.com/documentation/SDEN1065159/latest/
  */
 #include <arch.h>
 
diff --git a/lib/cpus/aarch64/cortex_a65ae.S b/lib/cpus/aarch64/cortex_a65ae.S
index fef56b8e2..ad6945004 100644
--- a/lib/cpus/aarch64/cortex_a65ae.S
+++ b/lib/cpus/aarch64/cortex_a65ae.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/101385/latest
- * SDEN: https://developer.arm.com/documentation/SDEN1344564/latest
+ * TRM: https://support.arm.com/documentation/101385/latest
+ * SDEN: https://support.arm.com/documentation/SDEN1344564/latest
  */
 #include <arch.h>
 
diff --git a/lib/cpus/aarch64/cortex_a710.S b/lib/cpus/aarch64/cortex_a710.S
index 7b430aea9..016f0b108 100644
--- a/lib/cpus/aarch64/cortex_a710.S
+++ b/lib/cpus/aarch64/cortex_a710.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/101800/latest
- * SDEN: https://developer.arm.com/documentation/SDEN-1775101/latest
+ * TRM: https://support.arm.com/documentation/101800/latest
+ * SDEN: https://support.arm.com/documentation/SDEN-1775101/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/cortex_a715.S b/lib/cpus/aarch64/cortex_a715.S
index 4fcdb9cee..acf35607d 100644
--- a/lib/cpus/aarch64/cortex_a715.S
+++ b/lib/cpus/aarch64/cortex_a715.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/101590/latest
- * SDEN: https://developer.arm.com/documentation/SDEN2148827/latest
+ * TRM: https://support.arm.com/documentation/101590/latest
+ * SDEN: https://support.arm.com/documentation/SDEN2148827/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/cortex_a72.S b/lib/cpus/aarch64/cortex_a72.S
index 2effc666e..7b45e5989 100644
--- a/lib/cpus/aarch64/cortex_a72.S
+++ b/lib/cpus/aarch64/cortex_a72.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/100095/latest
- * SDEN: https://developer.arm.com/documentation/epm012079/latest
+ * TRM: https://support.arm.com/documentation/100095/latest
+ * SDEN: https://support.arm.com/documentation/epm012079/latest
  */
 #include <arch.h>
 #include <asm_macros.S>
diff --git a/lib/cpus/aarch64/cortex_a720.S b/lib/cpus/aarch64/cortex_a720.S
index a7c5ffe4e..f73ff3ea4 100644
--- a/lib/cpus/aarch64/cortex_a720.S
+++ b/lib/cpus/aarch64/cortex_a720.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/102530/latest
- * SDEN: https://developer.arm.com/documentation/SDEN-2439421/latest
+ * TRM: https://support.arm.com/documentation/102530/latest
+ * SDEN: https://support.arm.com/documentation/SDEN-2439421/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/cortex_a720ae.S b/lib/cpus/aarch64/cortex_a720ae.S
index 7d96b3483..cfce9f9d4 100644
--- a/lib/cpus/aarch64/cortex_a720ae.S
+++ b/lib/cpus/aarch64/cortex_a720ae.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/102828/latest
- * SDEN: https://developer.arm.com/documentation/SDEN-3090091/latest
+ * TRM: https://support.arm.com/documentation/102828/latest
+ * SDEN: https://support.arm.com/documentation/SDEN-3090091/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/cortex_a725.S b/lib/cpus/aarch64/cortex_a725.S
index f1577c130..bf63bfa3a 100644
--- a/lib/cpus/aarch64/cortex_a725.S
+++ b/lib/cpus/aarch64/cortex_a725.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/107652/latest
- * SDEN: https://developer.arm.com/documentation/SDEN-2832921/latest
+ * TRM: https://support.arm.com/documentation/107652/latest
+ * SDEN: https://support.arm.com/documentation/SDEN-2832921/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/cortex_a73.S b/lib/cpus/aarch64/cortex_a73.S
index 9d9d282aa..b309be19d 100644
--- a/lib/cpus/aarch64/cortex_a73.S
+++ b/lib/cpus/aarch64/cortex_a73.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/100048/latest
- * SDEN: https://developer.arm.com/documentation/epm086451/latest
+ * TRM: https://support.arm.com/documentation/100048/latest
+ * SDEN: https://support.arm.com/documentation/epm086451/latest
  */
 #include <arch.h>
 #include <asm_macros.S>
diff --git a/lib/cpus/aarch64/cortex_a75.S b/lib/cpus/aarch64/cortex_a75.S
index e24d5de85..be3dd17b7 100644
--- a/lib/cpus/aarch64/cortex_a75.S
+++ b/lib/cpus/aarch64/cortex_a75.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/100403/latest
- * SDEN: https://developer.arm.com/documentation/SDEN859515/latest
+ * TRM: https://support.arm.com/documentation/100403/latest
+ * SDEN: https://support.arm.com/documentation/SDEN859515/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/cortex_a76.S b/lib/cpus/aarch64/cortex_a76.S
index 6d2619cfb..1b3b563e7 100644
--- a/lib/cpus/aarch64/cortex_a76.S
+++ b/lib/cpus/aarch64/cortex_a76.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/100798/latest
- * SDEN: https://developer.arm.com/documentation/SDEN-885749/latest
+ * TRM: https://support.arm.com/documentation/100798/latest
+ * SDEN: https://support.arm.com/documentation/SDEN-885749/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/cortex_a76ae.S b/lib/cpus/aarch64/cortex_a76ae.S
index 053579a02..14b8954a7 100644
--- a/lib/cpus/aarch64/cortex_a76ae.S
+++ b/lib/cpus/aarch64/cortex_a76ae.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/101392/latest
- * SDEN: https://developer.arm.com/documentation/SDEN-1277541/latest
+ * TRM: https://support.arm.com/documentation/101392/latest
+ * SDEN: https://support.arm.com/documentation/SDEN-1277541/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/cortex_a77.S b/lib/cpus/aarch64/cortex_a77.S
index 24372b14c..2b5dec8e9 100644
--- a/lib/cpus/aarch64/cortex_a77.S
+++ b/lib/cpus/aarch64/cortex_a77.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/101111/latest
- * SDEN: https://developer.arm.com/documentation/SDEN-1152370/latest
+ * TRM: https://support.arm.com/documentation/101111/latest
+ * SDEN: https://support.arm.com/documentation/SDEN-1152370/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/cortex_a78.S b/lib/cpus/aarch64/cortex_a78.S
index 1f617bb53..6a014780f 100644
--- a/lib/cpus/aarch64/cortex_a78.S
+++ b/lib/cpus/aarch64/cortex_a78.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/101430/latest
- * SDEN: https://developer.arm.com/documentation/SDEN-1401784/latest
+ * TRM: https://support.arm.com/documentation/101430/latest
+ * SDEN: https://support.arm.com/documentation/SDEN-1401784/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/cortex_a78ae.S b/lib/cpus/aarch64/cortex_a78ae.S
index cb63a8f36..d159a2bee 100644
--- a/lib/cpus/aarch64/cortex_a78ae.S
+++ b/lib/cpus/aarch64/cortex_a78ae.S
@@ -4,8 +4,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/101779/latest
- * SDEN: https://developer.arm.com/documentation/SDEN-1707912/latest
+ * TRM: https://support.arm.com/documentation/101779/latest
+ * SDEN: https://support.arm.com/documentation/SDEN-1707912/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/cortex_a78c.S b/lib/cpus/aarch64/cortex_a78c.S
index 989675c77..dc0b9ec26 100644
--- a/lib/cpus/aarch64/cortex_a78c.S
+++ b/lib/cpus/aarch64/cortex_a78c.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/102226/latest
- * SDEN: https://developer.arm.com/documentation/SDEN-1707916/latest
+ * TRM: https://support.arm.com/documentation/102226/latest
+ * SDEN: https://support.arm.com/documentation/SDEN-1707916/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/cortex_x1.S b/lib/cpus/aarch64/cortex_x1.S
index 9ad9c5f66..1c011fc00 100644
--- a/lib/cpus/aarch64/cortex_x1.S
+++ b/lib/cpus/aarch64/cortex_x1.S
@@ -4,8 +4,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/101433/latest
- * SDEN: https://developer.arm.com/documentation/SDEN-1401782/latest
+ * TRM: https://support.arm.com/documentation/101433/latest
+ * SDEN: https://support.arm.com/documentation/SDEN-1401782/latest
  */
 
 #include <asm_macros.S>
diff --git a/lib/cpus/aarch64/cortex_x1c.S b/lib/cpus/aarch64/cortex_x1c.S
index 26d9baf7e..268852539 100644
--- a/lib/cpus/aarch64/cortex_x1c.S
+++ b/lib/cpus/aarch64/cortex_x1c.S
@@ -4,8 +4,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/101968/latest
- * SDEN: https://developer.arm.com/documentation/SDEN-1707914/latest
+ * TRM: https://support.arm.com/documentation/101968/latest
+ * SDEN: https://support.arm.com/documentation/SDEN-1707914/latest
  */
 
 #include <asm_macros.S>
diff --git a/lib/cpus/aarch64/cortex_x2.S b/lib/cpus/aarch64/cortex_x2.S
index 1d6d5d08d..e89ebf96a 100644
--- a/lib/cpus/aarch64/cortex_x2.S
+++ b/lib/cpus/aarch64/cortex_x2.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/101803/latest
- * SDEN: https://developer.arm.com/documentation/SDEN-1775100/latest
+ * TRM: https://support.arm.com/documentation/101803/latest
+ * SDEN: https://support.arm.com/documentation/SDEN-1775100/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/cortex_x3.S b/lib/cpus/aarch64/cortex_x3.S
index 3333a54a0..8e0295bb3 100644
--- a/lib/cpus/aarch64/cortex_x3.S
+++ b/lib/cpus/aarch64/cortex_x3.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/101593/latest
- * SDEN: https://developer.arm.com/documentation/SDEN-2055130/latest
+ * TRM: https://support.arm.com/documentation/101593/latest
+ * SDEN: https://support.arm.com/documentation/SDEN-2055130/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/cortex_x4.S b/lib/cpus/aarch64/cortex_x4.S
index da68caf63..3117630d7 100644
--- a/lib/cpus/aarch64/cortex_x4.S
+++ b/lib/cpus/aarch64/cortex_x4.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/102484/latest
- * SDEN: https://developer.arm.com/documentation/109148/latest
+ * TRM: https://support.arm.com/documentation/102484/latest
+ * SDEN: https://support.arm.com/documentation/109148/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/cortex_x925.S b/lib/cpus/aarch64/cortex_x925.S
index 3d1574246..6c477a10f 100644
--- a/lib/cpus/aarch64/cortex_x925.S
+++ b/lib/cpus/aarch64/cortex_x925.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/102807/latest
- * SDEN: https://developer.arm.com/documentation/109180/latest/
+ * TRM: https://support.arm.com/documentation/102807/latest
+ * SDEN: https://support.arm.com/documentation/109180/latest/
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/neoverse_e1.S b/lib/cpus/aarch64/neoverse_e1.S
index e38ebb9f9..335fff211 100644
--- a/lib/cpus/aarch64/neoverse_e1.S
+++ b/lib/cpus/aarch64/neoverse_e1.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/101560/latest
- * SDEN: https://developer.arm.com/documentation/SDEN1402034/latest
+ * TRM: https://support.arm.com/documentation/101560/latest
+ * SDEN: https://support.arm.com/documentation/SDEN1402034/latest
  */
 #include <arch.h>
 #include <asm_macros.S>
diff --git a/lib/cpus/aarch64/neoverse_n1.S b/lib/cpus/aarch64/neoverse_n1.S
index 8019f35e4..545fb5f0c 100644
--- a/lib/cpus/aarch64/neoverse_n1.S
+++ b/lib/cpus/aarch64/neoverse_n1.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/100616/latest
- * SDEN: https://developer.arm.com/documentation/SDEN-885747/latest
+ * TRM: https://support.arm.com/documentation/100616/latest
+ * SDEN: https://support.arm.com/documentation/SDEN-885747/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/neoverse_n2.S b/lib/cpus/aarch64/neoverse_n2.S
index 249a393a0..9b09035e4 100644
--- a/lib/cpus/aarch64/neoverse_n2.S
+++ b/lib/cpus/aarch64/neoverse_n2.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/102099/latest
- * SDEN: https://developer.arm.com/documentation/SDEN-1982442/latest
+ * TRM: https://support.arm.com/documentation/102099/latest
+ * SDEN: https://support.arm.com/documentation/SDEN-1982442/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/neoverse_n3.S b/lib/cpus/aarch64/neoverse_n3.S
index 19a4c4236..632512350 100644
--- a/lib/cpus/aarch64/neoverse_n3.S
+++ b/lib/cpus/aarch64/neoverse_n3.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/107997/latest
- * SDEN: https://developer.arm.com/documentation/SDEN-3050973/latest
+ * TRM: https://support.arm.com/documentation/107997/latest
+ * SDEN: https://support.arm.com/documentation/SDEN-3050973/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/neoverse_v1.S b/lib/cpus/aarch64/neoverse_v1.S
index 2509bdc1c..63b369082 100644
--- a/lib/cpus/aarch64/neoverse_v1.S
+++ b/lib/cpus/aarch64/neoverse_v1.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/101427/latest
- * SDEN: https://developer.arm.com/documentation/SDEN-1401781/latest
+ * TRM: https://support.arm.com/documentation/101427/latest
+ * SDEN: https://support.arm.com/documentation/SDEN-1401781/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/neoverse_v2.S b/lib/cpus/aarch64/neoverse_v2.S
index 314d4d2aa..599af6529 100644
--- a/lib/cpus/aarch64/neoverse_v2.S
+++ b/lib/cpus/aarch64/neoverse_v2.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/102375/latest
- * SDEN: https://developer.arm.com/documentation/SDEN-2332927/latest
+ * TRM: https://support.arm.com/documentation/102375/latest
+ * SDEN: https://support.arm.com/documentation/SDEN-2332927/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/neoverse_v3.S b/lib/cpus/aarch64/neoverse_v3.S
index 12f64621a..4ab3a3528 100644
--- a/lib/cpus/aarch64/neoverse_v3.S
+++ b/lib/cpus/aarch64/neoverse_v3.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/107734/latest
- * SDEN: https://developer.arm.com/documentation/109231/latest
+ * TRM: https://support.arm.com/documentation/107734/latest
+ * SDEN: https://support.arm.com/documentation/109231/latest
  */
 
 #include <arch.h>
diff --git a/lib/cpus/aarch64/neoverse_v3ae.S b/lib/cpus/aarch64/neoverse_v3ae.S
index 06080cd7e..f5d8858f1 100644
--- a/lib/cpus/aarch64/neoverse_v3ae.S
+++ b/lib/cpus/aarch64/neoverse_v3ae.S
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * TRM: https://developer.arm.com/documentation/101595/latest
- * SDEN: https://developer.arm.com/documentation/109704/latest
+ * TRM: https://support.arm.com/documentation/101595/latest
+ * SDEN: https://support.arm.com/documentation/109704/latest
  */
 
 #include <arch.h>
diff --git a/plat/qemu/qemu_sbsa/platform.mk b/plat/qemu/qemu_sbsa/platform.mk
index b0bbbc9ae..646503d6c 100644
--- a/plat/qemu/qemu_sbsa/platform.mk
+++ b/plat/qemu/qemu_sbsa/platform.mk
@@ -9,9 +9,6 @@ PLAT_QEMU_COMMON_PATH	:=	plat/qemu/common
 
 CRASH_REPORTING		:= 1
 
-# Disable the PSCI platform compatibility layer
-ENABLE_PLAT_COMPAT	:= 0
-
 SEPARATE_CODE_AND_RODATA := 1
 ENABLE_STACK_PROTECTOR	 := 0
 
diff --git a/plat/qti/hoya/kodiak/sc7280_chrome/platform.mk b/plat/qti/hoya/kodiak/sc7280_chrome/platform.mk
index 22a794c20..fa2d50b4c 100644
--- a/plat/qti/hoya/kodiak/sc7280_chrome/platform.mk
+++ b/plat/qti/hoya/kodiak/sc7280_chrome/platform.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017-2025, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2017-2026, Arm Limited and Contributors. All rights reserved.
 # Copyright (c) 2018-2021, The Linux Foundation. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
@@ -22,9 +22,6 @@ ERRATA_A78_1941498 		:=	1
 ERRATA_A78_1951500 		:=	1
 WORKAROUND_CVE_2025_10263	:=	1
 
-# Disable the PSCI platform compatibility layer
-ENABLE_PLAT_COMPAT		:=	0
-
 # Enable PSCI v1.0 extended state ID format
 PSCI_EXTENDED_STATE_ID	:=  1
 ARM_RECOM_STATE_ID_ENC  :=  1
diff --git a/plat/qti/hoya/qcs615/platform.mk b/plat/qti/hoya/qcs615/platform.mk
index 432a21e52..173cdc288 100644
--- a/plat/qti/hoya/qcs615/platform.mk
+++ b/plat/qti/hoya/qcs615/platform.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2024-2025, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2024-2026, Arm Limited and Contributors. All rights reserved.
 # Copyright (c) 2024, The Linux Foundation. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
@@ -34,9 +34,6 @@ ERRATA_A76_1946160				:=	1
 ERRATA_A76_2743102				:=	1
 WORKAROUND_CVE_2025_10263			:=	1
 
-# Disable the PSCI platform compatibility layer
-ENABLE_PLAT_COMPAT				:=	0
-
 # Enable PSCI v1.0 extended state ID format
 PSCI_EXTENDED_STATE_ID			:=	1
 ARM_RECOM_STATE_ID_ENC			:=	1
@@ -154,4 +151,3 @@ else
 # use library provided by QTISECLIB_PATH
 LDLIBS += $(QTISECLIB_PATH)
 endif
-
diff --git a/plat/qti/hoya/sc7180/platform.mk b/plat/qti/hoya/sc7180/platform.mk
index 617e90692..442e8f213 100644
--- a/plat/qti/hoya/sc7180/platform.mk
+++ b/plat/qti/hoya/sc7180/platform.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017-2025, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2017-2026, Arm Limited and Contributors. All rights reserved.
 # Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
@@ -16,9 +16,6 @@ USE_COHERENT_MEM		:=	0
 WARMBOOT_ENABLE_DCACHE_EARLY	:=	1
 HW_ASSISTED_COHERENCY		:=	1
 
-# Disable the PSCI platform compatibility layer
-ENABLE_PLAT_COMPAT		:=	0
-
 #Enable errata for cortex_a55 and cortex_a76
 ERRATA_A55_1530923 		:= 	1
 ERRATA_A76_1165522 		:= 	1
@@ -138,4 +135,3 @@ else
 # use library provided by QTISECLIB_PATH
 LDLIBS += $(QTISECLIB_PATH)
 endif
-
diff --git a/plat/rockchip/px30/platform.mk b/plat/rockchip/px30/platform.mk
index 2fdbec580..aaaec73c2 100644
--- a/plat/rockchip/px30/platform.mk
+++ b/plat/rockchip/px30/platform.mk
@@ -1,5 +1,5 @@
 #
-#Copyright (c) 2019-2025, Arm Limited and Contributors. All rights reserved.
+#Copyright (c) 2019-2026, Arm Limited and Contributors. All rights reserved.
 #
 #SPDX-License-Identifier: BSD-3-Clause
 #
@@ -63,8 +63,6 @@ ifdef PLAT_RK_SECURE_DDR_MINILOADER
 BL31_SOURCES		+=	${RK_PLAT_COMMON}/drivers/parameter/ddr_parameter.c
 endif
 
-ENABLE_PLAT_COMPAT	:=	0
-
 include lib/libfdt/libfdt.mk
 
 PLAT_EXTRA_LD_SCRIPT	:=	1
diff --git a/plat/rockchip/rk3568/platform.mk b/plat/rockchip/rk3568/platform.mk
index 1e130c7ee..8b49c7627 100644
--- a/plat/rockchip/rk3568/platform.mk
+++ b/plat/rockchip/rk3568/platform.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023-2025, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2023-2026, Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -94,7 +94,6 @@ BL31_SOURCES		+=	${RK_GIC_SOURCES}				\
 				${RK_PLAT_SOC}/drivers/pmu/pmu.c		\
 				${RK_PLAT_SOC}/plat_sip_calls.c
 
-ENABLE_PLAT_COMPAT	:=	0
 MULTI_CONSOLE_API	:=	1
 # System coherency is managed in hardware
 HW_ASSISTED_COHERENCY	:=	1
diff --git a/plat/rockchip/rk3576/platform.mk b/plat/rockchip/rk3576/platform.mk
index da7eae136..9d33f8a03 100644
--- a/plat/rockchip/rk3576/platform.mk
+++ b/plat/rockchip/rk3576/platform.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2025, ARM Limited and Contributors. All rights reserved.
+# Copyright (c) 2025-2026, Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -101,7 +101,6 @@ ERRATA_A53_1530924		:=	1
 
 ERRATA_A72_1319367		:=	1
 
-ENABLE_PLAT_COMPAT		:=	0
 MULTI_CONSOLE_API		:=	1
 CTX_INCLUDE_EL2_REGS		:=	0
 CTX_INCLUDE_AARCH32_REGS	:=	0
diff --git a/plat/rockchip/rk3588/platform.mk b/plat/rockchip/rk3588/platform.mk
index 413a20c16..5c351f32f 100644
--- a/plat/rockchip/rk3588/platform.mk
+++ b/plat/rockchip/rk3588/platform.mk
@@ -81,7 +81,6 @@ BL31_SOURCES		+=	${RK_GIC_SOURCES}				\
 				${RK_PLAT_SOC}/drivers/scmi/rk3588_rstd.c
 
 CTX_INCLUDE_AARCH32_REGS :=     0
-ENABLE_PLAT_COMPAT	:=	0
 MULTI_CONSOLE_API	:=	1
 ERRATA_A55_1530923	:=	1
 WORKAROUND_CVE_2025_10263 :=	1
diff --git a/plat/rockchip/rv1126b/platform.mk b/plat/rockchip/rv1126b/platform.mk
index 46bb5e6b2..810852c08 100644
--- a/plat/rockchip/rv1126b/platform.mk
+++ b/plat/rockchip/rv1126b/platform.mk
@@ -100,7 +100,6 @@ ERRATA_A53_843419		:=	1
 ERRATA_A53_855873		:=	1
 ERRATA_A53_1530924		:=	1
 
-ENABLE_PLAT_COMPAT		:=	0
 MULTI_CONSOLE_API		:=	1
 CTX_INCLUDE_EL2_REGS		:=	0
 CTX_INCLUDE_AARCH32_REGS	:=	0