Sanitize SPD include paths

Commit 09d40e0e0828 ("Sanitise includes across codebase") modified the
include paths of the TSP includes but it didn't remove the include path
from the makefile or did the same for TLK. This patch does the remaining
work.

Change-Id: Iecee2e88fabcd06989d35568c3a4c1f4e7d93572
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>

diff --git a/services/spd/tlkd/tlkd.mk b/services/spd/tlkd/tlkd.mk
index 30100356d79e2d7fd307f2337f2db1529be81802..56de0a642a73bbde9682a659761e6a6bde3c3533 100644 (file)
--- a/services/spd/tlkd/tlkd.mk
+++ b/services/spd/tlkd/tlkd.mk
@@ -4,7 +4,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
+ifeq (${ERROR_DEPRECATED},0)
 SPD_INCLUDES           :=      -Iinclude/bl32/payloads
+endif
 
 SPD_SOURCES            :=      services/spd/tlkd/tlkd_common.c         \
                                services/spd/tlkd/tlkd_helpers.S        \

diff --git a/services/spd/tlkd/tlkd_main.c b/services/spd/tlkd/tlkd_main.c
index f6f2af52fc7ac333dc138efa5b81d762998904b5..3cfc52db425d2d3e2322a409cf9af4ce37eaaa91 100644 (file)
--- a/services/spd/tlkd/tlkd_main.c
+++ b/services/spd/tlkd/tlkd_main.c
@@ -13,12 +13,13 @@
  * handle the request locally or delegate it to the Secure Payload. It is also
  * responsible for initialising and maintaining communication with the SP.
  ******************************************************************************/
-#include <arch_helpers.h>
 #include <assert.h>
 #include <errno.h>
 #include <stddef.h>
 
+#include <arch_helpers.h>
 #include <bl31/bl31.h>
+#include <bl32/payloads/tlk.h>
 #include <common/bl_common.h>
 #include <common/debug.h>
 #include <common/runtime_svc.h>
@@ -26,7 +27,6 @@
 #include <plat/common/platform.h>
 #include <tools_share/uuid.h>
 
-#include <tlk.h>
 #include "tlkd_private.h"
 
 extern const spd_pm_ops_t tlkd_pm_ops;

diff --git a/services/spd/tlkd/tlkd_pm.c b/services/spd/tlkd/tlkd_pm.c
index de34bf6b51d784b34ff73f60b384cce425f042dd..7d1959bce6cfa43e835ae4a8e3765e4cd75240b9 100644 (file)
--- a/services/spd/tlkd/tlkd_pm.c
+++ b/services/spd/tlkd/tlkd_pm.c
@@ -7,11 +7,11 @@
 #include <assert.h>
 
 #include <arch_helpers.h>
+#include <bl32/payloads/tlk.h>
 #include <common/bl_common.h>
 #include <common/debug.h>
 #include <lib/el3_runtime/context_mgmt.h>
 #include <lib/psci/psci.h>
-#include <tlk.h>
 
 #include "tlkd_private.h"
 

diff --git a/services/spd/tspd/tspd.mk b/services/spd/tspd/tspd.mk
index 1457360a530091b6945879d1a6bef883d92ee08f..bda8338836e768ec3a2e285da86f63a1cbae6e85 100644 (file)
--- a/services/spd/tspd/tspd.mk
+++ b/services/spd/tspd/tspd.mk
@@ -5,7 +5,10 @@
 #
 
 TSPD_DIR               :=      services/spd/tspd
+
+ifeq (${ERROR_DEPRECATED},0)
 SPD_INCLUDES           :=      -Iinclude/bl32/tsp
+endif
 
 SPD_SOURCES            :=      services/spd/tspd/tspd_common.c         \
                                services/spd/tspd/tspd_helpers.S        \