diff --git a/plat/fvp/platform.mk b/plat/fvp/platform.mk
index 450529b..7f70375 100644
--- a/plat/fvp/platform.mk
+++ b/plat/fvp/platform.mk
@@ -69,23 +69,20 @@
 				plat/fvp/fvp_security.c				\
 				plat/fvp/aarch64/fvp_common.c
 
-BL31_SOURCES		+=	drivers/arm/gic/gic_v2.c			\
+BL31_SOURCES		+=	drivers/arm/cci400/cci400.c			\
+				drivers/arm/gic/gic_v2.c			\
 				drivers/arm/gic/gic_v3.c			\
-				drivers/arm/cci400/cci400.c			\
+				drivers/arm/tzc400/tzc400.c			\
 				plat/common/aarch64/platform_mp_stack.S		\
 				plat/fvp/bl31_fvp_setup.c			\
 				plat/fvp/fvp_gic.c				\
 				plat/fvp/fvp_pm.c				\
+				plat/fvp/fvp_security.c				\
 				plat/fvp/fvp_topology.c				\
 				plat/fvp/aarch64/fvp_helpers.S			\
 				plat/fvp/aarch64/fvp_common.c			\
 				plat/fvp/drivers/pwrc/fvp_pwrc.c
 
-ifeq (${RESET_TO_BL31}, 1)
-BL31_SOURCES		+=	drivers/arm/tzc400/tzc400.c			\
-				plat/fvp/fvp_security.c
-endif
-
 # Flag used by the FVP port to determine the version of ARM GIC architecture
 # to use for interrupt management in EL3.
 FVP_GIC_ARCH		:=	2