commit 6967c24a7616326c0bb8cf57873a2788523d37d2
author Olivier Deprez <olivier.deprez@arm.com> Fri Apr 09 09:24:08 2021 +0200
committer Olivier Deprez <olivier.deprez@arm.com> Tue Apr 13 18:11:24 2021 +0200
tree 8cd18e0c1fd09bcc253f0157a77a94e7f9fc5b85
parent d89d11b4838d69d422b6ba19138af6bf50a90b80

spmc: hypervisor calls moved to a separate module

Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
Change-Id: I285ffc684aa780246468355add9d03c1b5b8fefb

spm/cactus/cactus.mk

diff --git a/spm/cactus/cactus.mk b/spm/cactus/cactus.mk
index 08b824c..9d47b90 100644
--- a/spm/cactus/cactus.mk
+++ b/spm/cactus/cactus.mk
@@ -38,6 +38,7 @@
 	$(addprefix spm/common/,			\
 		aarch64/sp_arch_helpers.S		\
 		sp_helpers.c				\
+		spm_helpers.c					\
 	)						\
 	$(addprefix spm/cactus/cactus_tests/,		\
 		cactus_message_loop.c			\

spm/cactus/cactus_debug.c

diff --git a/spm/cactus/cactus_debug.c b/spm/cactus/cactus_debug.c
index 43093a6..30a2527 100644
--- a/spm/cactus/cactus_debug.c
+++ b/spm/cactus/cactus_debug.c
@@ -6,7 +6,7 @@
 
 #include <drivers/arm/pl011.h>
 #include <drivers/console.h>
-#include <sp_helpers.h>
+#include <spm_helpers.h>
 
 #include "cactus.h"
 

spm/cactus/cactus_main.c

diff --git a/spm/cactus/cactus_main.c b/spm/cactus/cactus_main.c
index e54f3b0..ed48fe4 100644
--- a/spm/cactus/cactus_main.c
+++ b/spm/cactus/cactus_main.c
@@ -20,6 +20,7 @@
 #include <plat/common/platform.h>
 #include <platform_def.h>
 #include <sp_helpers.h>
+#include <spm_helpers.h>
 #include <std_svc.h>
 
 #include "cactus_def.h"

spm/cactus/cactus_tests/cactus_test_ffa.c

diff --git a/spm/cactus/cactus_tests/cactus_test_ffa.c b/spm/cactus/cactus_tests/cactus_test_ffa.c
index c1ba783..2ade7bd 100644
--- a/spm/cactus/cactus_tests/cactus_test_ffa.c
+++ b/spm/cactus/cactus_tests/cactus_test_ffa.c
@@ -11,6 +11,7 @@
 #include <cactus_platform_def.h>
 #include <ffa_endpoints.h>
 #include <sp_helpers.h>
+#include <spm_helpers.h>
 #include <spm_common.h>
 
 #include <lib/libc/string.h>