Merge "fix(fvp): unconditionally include lib/psa headers" into integration
diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk
index 2d2886b..6d25def 100644
--- a/plat/arm/board/fvp/platform.mk
+++ b/plat/arm/board/fvp/platform.mk
@@ -102,7 +102,8 @@
plat/arm/common/arm_tzc400.c
-PLAT_INCLUDES := -Iplat/arm/board/fvp/include
+PLAT_INCLUDES := -Iplat/arm/board/fvp/include \
+ -Iinclude/lib/psa
PLAT_BL_COMMON_SOURCES := plat/arm/board/fvp/fvp_common.c
@@ -204,7 +205,6 @@
# provide hardcoded token/key on request.
BL31_SOURCES += lib/psa/delegated_attestation.c
-PLAT_INCLUDES += -Iinclude/lib/psa
endif
ifeq (${ENABLE_FEAT_RNG_TRAP},1)