build(psci): move `runtime_errata.S` to PSCI

Move the runtime errata source file into the PSCI library, as PSCI is
the only component directly dependent on it, and it doesn't require
internal access to the CPUs library.

Change-Id: I92826714d49b1b0131f62c158543b4c167ab9aa8
Signed-off-by: Chris Kay <chris.kay@arm.com>

diff --git a/lib/cpus/aarch64/runtime_errata.S b/lib/cpus/aarch64/runtime_errata.S
deleted file mode 100644 (file)
index 8d46691..0000000
--- a/lib/cpus/aarch64/runtime_errata.S
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2023, Arm Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <asm_macros.S>
-#include <cortex_a510.h>
-#include <cpu_macros.S>
-
-/*
- * void apply_cpu_pwr_dwn_errata(void);
- *
- * This function applies various CPU errata during power down.
- */
-       .globl apply_cpu_pwr_dwn_errata
-func apply_cpu_pwr_dwn_errata
-       mov     x19, x30
-       bl      cpu_get_rev_var
-       mov     x18, x0
-
-#if ERRATA_A510_2684597
-       bl errata_cortex_a510_2684597_wa
-#endif
-
-       ret     x19
-endfunc apply_cpu_pwr_dwn_errata

diff --git a/lib/psci/aarch64/runtime_errata.S b/lib/psci/aarch64/runtime_errata.S
new file mode 100644 (file)
index 0000000..8d46691
--- /dev/null
+++ b/lib/psci/aarch64/runtime_errata.S
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2023, Arm Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <asm_macros.S>
+#include <cortex_a510.h>
+#include <cpu_macros.S>
+
+/*
+ * void apply_cpu_pwr_dwn_errata(void);
+ *
+ * This function applies various CPU errata during power down.
+ */
+       .globl apply_cpu_pwr_dwn_errata
+func apply_cpu_pwr_dwn_errata
+       mov     x19, x30
+       bl      cpu_get_rev_var
+       mov     x18, x0
+
+#if ERRATA_A510_2684597
+       bl errata_cortex_a510_2684597_wa
+#endif
+
+       ret     x19
+endfunc apply_cpu_pwr_dwn_errata

diff --git a/lib/psci/psci_lib.mk b/lib/psci/psci_lib.mk
index 6864202d81570bdee8dff9d3a5865fc085133973..c71580f950ddfacfb12c9bda1bc7002e757aa6d7 100644 (file)
--- a/lib/psci/psci_lib.mk
+++ b/lib/psci/psci_lib.mk
@@ -22,7 +22,7 @@ PSCI_LIB_SOURCES      :=      lib/el3_runtime/cpu_data_array.c        \
 
 ifeq (${ARCH}, aarch64)
 PSCI_LIB_SOURCES       +=      lib/el3_runtime/aarch64/context.S       \
-                               lib/cpus/aarch64/runtime_errata.S
+                               lib/psci/aarch64/runtime_errata.S
 endif
 
 ifeq (${USE_COHERENT_MEM}, 1)