Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-23 13:36:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "refactor(fvp): move cpus with nomodel" into integration

Browse source
This commit is contained in:
Olivier Deprez 2024-05-06 11:24:15 +02:00 • committed by TrustedFirmware Code Review
commit 58385f7d92
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
plat/arm/board/fvp/platform.mk
View file

@ -31,6 +31,9 @@ FVP_TRUSTED_SRAM_SIZE := 256
# Macro to enable helpers for running SPM tests. Disabled by default. # Macro to enable helpers for running SPM tests. Disabled by default.
PLAT_TEST_SPM := 0 PLAT_TEST_SPM := 0
# By default dont build CPUs with no FVP model.
BUILD_CPUS_WITH_NO_FVP_MODEL ?= 0
ENABLE_FEAT_AMU := 2 ENABLE_FEAT_AMU := 2
ENABLE_FEAT_AMUv1p1 := 2 ENABLE_FEAT_AMUv1p1 := 2
ENABLE_FEAT_HCX := 2 ENABLE_FEAT_HCX := 2
@ -190,16 +193,21 @@ else
lib/cpus/aarch64/neoverse_v1.S \ lib/cpus/aarch64/neoverse_v1.S \
lib/cpus/aarch64/neoverse_e1.S \ lib/cpus/aarch64/neoverse_e1.S \
lib/cpus/aarch64/cortex_x2.S \ lib/cpus/aarch64/cortex_x2.S \
lib/cpus/aarch64/cortex_x4.S \ lib/cpus/aarch64/cortex_x4.S
lib/cpus/aarch64/cortex_gelas.S \
lib/cpus/aarch64/nevis.S \
lib/cpus/aarch64/travis.S
endif endif
# AArch64/AArch32 cores # AArch64/AArch32 cores
FVP_CPU_LIBS += lib/cpus/aarch64/cortex_a55.S \ FVP_CPU_LIBS += lib/cpus/aarch64/cortex_a55.S \
lib/cpus/aarch64/cortex_a75.S lib/cpus/aarch64/cortex_a75.S
endif endif
#Build AArch64-only CPUs with no FVP model yet.
ifeq (${BUILD_CPUS_WITH_NO_FVP_MODEL},1)
FVP_CPU_LIBS += lib/cpus/aarch64/neoverse_hermes.S \
lib/cpus/aarch64/cortex_gelas.S \
lib/cpus/aarch64/nevis.S \
lib/cpus/aarch64/travis.S
endif
else else
FVP_CPU_LIBS += lib/cpus/aarch32/cortex_a32.S \ FVP_CPU_LIBS += lib/cpus/aarch32/cortex_a32.S \
lib/cpus/aarch32/cortex_a57.S \ lib/cpus/aarch32/cortex_a57.S \