Merge "sgm775: Fix build fail for TSP support on sgm775" into integration

plat/arm/board/sgm775/tsp/tsp-sgm775.mk

+#
+# Copyright (c) 2019, ARM Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+include plat/arm/css/sgm/tsp/tsp-sgm.mk
\ No newline at end of file

plat/arm/css/sgm/include/sgm_base_platform_def.h

@@ -133,11 +133,6 @@
 #define PLAT_CSS_PRIMARY_CPU_BIT_WIDTH		4
 #endif
 
-/*
- * tspd support is conditional so enable this for CSS sgm platforms.
- */
-#define SPD_tspd
-
 /*
  * PLAT_CSS_MAX_SCP_BL2_SIZE is calculated using the current
  * SCP_BL2 size plus a little space for growth.

plat/arm/css/sgm/tsp/tsp-sgm.mk

@@ -6,6 +6,6 @@
 
 BL32_SOURCES		+= 	${SGM_GIC_SOURCES}			\
 				${CSS_SGM_BASE}/sgm_plat_config.c	\
-				plat/arm/board/sgm/tsp/sgm_tsp_setup.c
+				plat/arm/css/sgm/tsp/sgm_tsp_setup.c
 
 include plat/arm/common/tsp/arm_tsp.mk