diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2019-09-13 14:18:36 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-09-13 14:18:36 +0000 |
| commit | 035db88ed48463e6c001bfe96671abcb540e0e9e (patch) | |
| tree | 0a7578dfc863c1714af057484f7a6c4197a39615 | |
| parent | 1ac928ce41ec86df3b5b62d007cace35c309e85a (diff) | |
| parent | cd3c5b4cd765d6a56924fc80e98721441fe99b27 (diff) | |
Merge "Modify FVP makefile for cores that support both AArch64/32" into integration
| -rw-r--r-- | plat/arm/board/fvp/platform.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk index 617da2d6..1e7cfce5 100644 --- a/plat/arm/board/fvp/platform.mk +++ b/plat/arm/board/fvp/platform.mk @@ -99,14 +99,16 @@ ifeq (${ARCH}, aarch64) # select a different set of CPU files, depending on whether we compile for # hardware assisted coherency cores or not ifeq (${HW_ASSISTED_COHERENCY}, 0) +# Cores used without DSU FVP_CPU_LIBS += lib/cpus/aarch64/cortex_a35.S \ lib/cpus/aarch64/cortex_a53.S \ lib/cpus/aarch64/cortex_a57.S \ lib/cpus/aarch64/cortex_a72.S \ lib/cpus/aarch64/cortex_a73.S else - # AArch64-only cores +# Cores used with DSU only ifeq (${CTX_INCLUDE_AARCH32_REGS}, 0) + # AArch64-only cores FVP_CPU_LIBS += lib/cpus/aarch64/cortex_a76.S \ lib/cpus/aarch64/cortex_a76ae.S \ lib/cpus/aarch64/cortex_a77.S \ @@ -114,11 +116,10 @@ else lib/cpus/aarch64/neoverse_e1.S \ lib/cpus/aarch64/neoverse_zeus.S \ lib/cpus/aarch64/cortex_hercules.S - # AArch64/AArch32 - else - FVP_CPU_LIBS += lib/cpus/aarch64/cortex_a55.S \ - lib/cpus/aarch64/cortex_a75.S endif + # AArch64/AArch32 cores + FVP_CPU_LIBS += lib/cpus/aarch64/cortex_a55.S \ + lib/cpus/aarch64/cortex_a75.S endif else |