diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2019-05-03 13:35:38 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-05-03 13:35:38 +0000 |
| commit | 854ca7daf9bbf4762d698128bfe030e0cebea956 (patch) | |
| tree | 88258bb259ac6847ea95944add2f4c9ac0c832df /plat/arm | |
| parent | b9c1d185bbd8778835017560da916daa39709e78 (diff) | |
| parent | 076b5f02e2747ef1b5a55f1c5d368df16f046b1c (diff) | |
Merge "Add compile-time errors for HW_ASSISTED_COHERENCY flag" into integration
Diffstat (limited to 'plat/arm')
| -rw-r--r-- | plat/arm/board/fvp/platform.mk | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk index c11d848e..9b128a56 100644 --- a/plat/arm/board/fvp/platform.mk +++ b/plat/arm/board/fvp/platform.mk @@ -95,18 +95,25 @@ PLAT_BL_COMMON_SOURCES := plat/arm/board/fvp/fvp_common.c FVP_CPU_LIBS := lib/cpus/${ARCH}/aem_generic.S ifeq (${ARCH}, aarch64) -FVP_CPU_LIBS += lib/cpus/aarch64/cortex_a35.S \ + +# select a different set of CPU files, depending on whether we compile with +# hardware assisted coherency configurations or not +ifeq (${HW_ASSISTED_COHERENCY}, 0) + FVP_CPU_LIBS += lib/cpus/aarch64/cortex_a35.S \ lib/cpus/aarch64/cortex_a53.S \ - lib/cpus/aarch64/cortex_a55.S \ lib/cpus/aarch64/cortex_a57.S \ lib/cpus/aarch64/cortex_a72.S \ - lib/cpus/aarch64/cortex_a73.S \ + lib/cpus/aarch64/cortex_a73.S +else + FVP_CPU_LIBS += lib/cpus/aarch64/cortex_a55.S \ lib/cpus/aarch64/cortex_a75.S \ lib/cpus/aarch64/cortex_a76.S \ lib/cpus/aarch64/cortex_a76ae.S \ lib/cpus/aarch64/neoverse_n1.S \ + lib/cpus/aarch64/neoverse_e1.S \ lib/cpus/aarch64/cortex_deimos.S \ lib/cpus/aarch64/neoverse_zeus.S +endif else FVP_CPU_LIBS += lib/cpus/aarch32/cortex_a32.S @@ -217,10 +224,13 @@ ENABLE_PIE := 1 endif ifeq (${ENABLE_AMU},1) -BL31_SOURCES += lib/cpus/aarch64/cortex_a75_pubsub.c \ - lib/cpus/aarch64/neoverse_n1_pubsub.c \ - lib/cpus/aarch64/cpuamu.c \ +BL31_SOURCES += lib/cpus/aarch64/cpuamu.c \ lib/cpus/aarch64/cpuamu_helpers.S + +ifeq (${HW_ASSISTED_COHERENCY}, 1) +BL31_SOURCES += lib/cpus/aarch64/cortex_a75_pubsub.c \ + lib/cpus/aarch64/neoverse_n1_pubsub.c +endif endif ifeq (${RAS_EXTENSION},1) |