From a7055c5828fecaba80054348cc469b7e5d025937 Mon Sep 17 00:00:00 2001
From: Jeenu Viswambharan <jeenu.viswambharan@arm.com>
Date: Fri, 8 Jun 2018 08:44:36 +0100
Subject: [PATCH] Arm platforms: Remove common RAS configuration source
The file arm_ras.c intended to provide common platform-specific RAS
configuration for Arm platforms. Because this file has symbol
definitions, it's proving difficult to provide a common definition.
This patch therefore renames and makes the file specific to FVP. Other
platforms shall provide their own configuration in similar fashion.
Change-Id: I766fd238946e3e49cdb659680e1b45f41b237901
Signed-off-by: Jeenu Viswambharan <jeenu.viswambharan@arm.com>
---
plat/arm/board/fvp/aarch64/fvp_ras.c | 16 ++++++++++++++++
plat/arm/board/fvp/platform.mk | 4 ++++
plat/arm/common/aarch64/arm_ras.c | 16 ----------------
plat/arm/common/arm_common.mk | 3 +--
4 files changed, 21 insertions(+), 18 deletions(-)
create mode 100644 plat/arm/board/fvp/aarch64/fvp_ras.c
delete mode 100644 plat/arm/common/aarch64/arm_ras.c
diff --git a/plat/arm/board/fvp/aarch64/fvp_ras.c b/plat/arm/board/fvp/aarch64/fvp_ras.c
new file mode 100644
index 000000000..fb80a8a0b
--- /dev/null
+++ b/plat/arm/board/fvp/aarch64/fvp_ras.c
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <ras.h>
+
+struct ras_interrupt fvp_ras_interrupts[] = {
+};
+
+struct err_record_info fvp_err_records[] = {
+};
+
+REGISTER_ERR_RECORD_INFO(fvp_err_records);
+REGISTER_RAS_INTERRUPTS(fvp_ras_interrupts);
diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk
index 3a2873339..ed41d4cb8 100644
--- a/plat/arm/board/fvp/platform.mk
+++ b/plat/arm/board/fvp/platform.mk
@@ -216,6 +216,10 @@ BL31_SOURCES += lib/cpus/aarch64/cortex_a75_pubsub.c \
lib/cpus/aarch64/cpuamu_helpers.S
endif
+ifeq (${RAS_EXTENSION},1)
+BL31_SOURCES += plat/arm/board/fvp/aarch64/fvp_ras.c
+endif
+
ifneq (${ENABLE_STACK_PROTECTOR},0)
PLAT_BL_COMMON_SOURCES += plat/arm/board/fvp/fvp_stack_protector.c
endif
diff --git a/plat/arm/common/aarch64/arm_ras.c b/plat/arm/common/aarch64/arm_ras.c
deleted file mode 100644
index 80dfaf1b7..000000000
--- a/plat/arm/common/aarch64/arm_ras.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <ras.h>
-
-struct ras_interrupt arm_ras_interrupts[] = {
-};
-
-struct err_record_info arm_err_records[] = {
-};
-
-REGISTER_ERR_RECORD_INFO(arm_err_records);
-REGISTER_RAS_INTERRUPTS(arm_ras_interrupts);
diff --git a/plat/arm/common/arm_common.mk b/plat/arm/common/arm_common.mk
index 76a75d3b9..533084708 100644
--- a/plat/arm/common/arm_common.mk
+++ b/plat/arm/common/arm_common.mk
@@ -236,8 +236,7 @@ endif
# RAS sources
ifeq (${RAS_EXTENSION},1)
BL31_SOURCES += lib/extensions/ras/std_err_record.c \
- lib/extensions/ras/ras_common.c \
- plat/arm/common/aarch64/arm_ras.c
+ lib/extensions/ras/ras_common.c
endif
ifneq (${TRUSTED_BOARD_BOOT},0)
--
GitLab