diff --git a/bl32/tsp/tsp-fvp.mk b/bl32/tsp/tsp-fvp.mk
index 2bf748e..278d358 100644
--- a/bl32/tsp/tsp-fvp.mk
+++ b/bl32/tsp/tsp-fvp.mk
@@ -33,7 +33,6 @@
 vpath			%.S	${PLAT_BL2_S_VPATH}
 
 # TSP source files specific to FVP platform
-BL32_OBJS		+=	bl32_plat_setup.o			\
-				bl32_setup_xlat.o			\
-				plat_common.o				\
-				${PLAT_BL_COMMON_OBJS}
+BL32_SOURCES		+=	bl32_plat_setup.c			\
+				bl32_setup_xlat.c			\
+				plat_common.c
diff --git a/bl32/tsp/tsp.mk b/bl32/tsp/tsp.mk
index bc23315..a16c970 100644
--- a/bl32/tsp/tsp.mk
+++ b/bl32/tsp/tsp.mk
@@ -38,16 +38,14 @@
 				include				\
 				lib/sync/locks/exclusive
 
-BL32_OBJS		+=	tsp_entrypoint.o		\
-				tsp_main.o			\
-				tsp_request.o			\
-				spinlock.o			\
-				early_exceptions.o		\
-				${BL_COMMON_OBJS}
+BL32_SOURCES		+=	tsp_entrypoint.S		\
+				tsp_main.c			\
+				tsp_request.S			\
+				spinlock.S			\
+				early_exceptions.S
 
 BL32_ENTRY_POINT	:=	tsp_entrypoint
-BL32_MAPFILE		:=	tsp.map
-BL32_LINKERFILE		:=	tsp.ld
+BL32_LINKERFILE		:=	tsp.ld.S
 
 vpath %.ld.S ${BL32_ROOT}
 vpath %.c ${BL32_ROOT}