refactor(fvp_r): tidy up platform port [1]
Following changes done:
1. Remove "fvp_r" specific check from bl1.mk
2. Override BL1_SOURCES in fvp_r platform.mk
3. Regroup source files
4. Remove platform specific change from arm_common
Signed-off-by: Manish Pandey <manish.pandey2@arm.com>
Change-Id: I74d0b1f317853ab1333744d8da5c59f937789547
diff --git a/bl1/bl1.mk b/bl1/bl1.mk
index 8f44151..9f63fd5 100644
--- a/bl1/bl1.mk
+++ b/bl1/bl1.mk
@@ -4,14 +4,12 @@
# SPDX-License-Identifier: BSD-3-Clause
#
-ifneq (${PLAT},fvp_r)
BL1_SOURCES += bl1/${ARCH}/bl1_arch_setup.c \
bl1/${ARCH}/bl1_context_mgmt.c \
bl1/${ARCH}/bl1_entrypoint.S \
bl1/${ARCH}/bl1_exceptions.S \
- bl1/bl1_main.c
-endif
-BL1_SOURCES += lib/cpus/${ARCH}/cpu_helpers.S \
+ bl1/bl1_main.c \
+ lib/cpus/${ARCH}/cpu_helpers.S \
lib/cpus/errata_report.c \
lib/el3_runtime/${ARCH}/context_mgmt.c \
plat/common/plat_bl1_common.c \