cactus: do not compile irrelevant test files
Now Cactus image is only used for showcasing SPCI Beta1 spec features,
however there are some residual tests(related with SPRT) which are no
more relevant.
Signed-off-by: Manish Pandey <manish.pandey2@arm.com>
Change-Id: Ia049f20f47c8d68d84b25a424d6a064592c3b0af
diff --git a/spm/cactus/cactus.mk b/spm/cactus/cactus.mk
index c0b98f4..d89a4bd 100644
--- a/spm/cactus/cactus.mk
+++ b/spm/cactus/cactus.mk
@@ -4,7 +4,6 @@
# SPDX-License-Identifier: BSD-3-Clause
#
-include lib/sprt/sprt_client.mk
include lib/xlat_tables_v2/xlat_tables.mk
CACTUS_DTB := $(BUILD_PLAT)/cactus.dtb
@@ -16,22 +15,16 @@
-Iinclude/common/${ARCH} \
-Iinclude/lib \
-Iinclude/lib/${ARCH} \
- -Iinclude/lib/sprt \
-Iinclude/lib/utils \
-Iinclude/lib/xlat_tables \
-Iinclude/runtime_services \
- -Iinclude/runtime_services/secure_el0_payloads \
-Ispm/cactus \
-Ispm/common \
- ${SPRT_LIB_INCLUDES}
CACTUS_SOURCES := \
$(addprefix spm/cactus/, \
aarch64/cactus_entrypoint.S \
cactus_main.c \
- cactus_tests_memory_attributes.c \
- cactus_tests_misc.c \
- cactus_tests_system_setup.c \
) \
$(addprefix spm/common/, \
aarch64/sp_arch_helpers.S \
@@ -51,7 +44,6 @@
lib/smc/${ARCH}/hvc.c \
lib/locks/${ARCH}/spinlock.S \
lib/utils/mp_printf.c \
- ${SPRT_LIB_SOURCES} \
${XLAT_TABLES_LIB_SRCS}
CACTUS_LINKERFILE := spm/cactus/cactus.ld.S
diff --git a/spm/cactus/cactus_def.h b/spm/cactus/cactus_def.h
index e865036..6eceb01 100644
--- a/spm/cactus/cactus_def.h
+++ b/spm/cactus/cactus_def.h
@@ -32,29 +32,4 @@
#define CACTUS_TEST_MEM_BASE (CACTUS_NS_BUF_BASE + CACTUS_NS_BUF_SIZE)
#define CACTUS_TEST_MEM_SIZE ULL(0x20000)
-/*
- * UUIDs of Secure Services provided by Cactus
- */
-
-#define CACTUS_SERVICE1_UUID U(0x01234567), U(0x89ABCDEF), U(0x76543210), U(0xFEDCBA98)
-#define CACTUS_SERVICE2_UUID U(0x0A1B2C3D), U(0x4E5F6789), U(0x55AA00FF), U(0x0F1E2D3C)
-#define CACTUS_INVALID_UUID U(0x1), U(0x2), U(0x3), U(0x4)
-
-#define CACTUS_SERVICE1_UUID_RD U(0x01234567) U(0x89ABCDEF) U(0x76543210) U(0xFEDCBA98)
-#define CACTUS_SERVICE2_UUID_RD U(0x0A1B2C3D) U(0x4E5F6789) U(0x55AA00FF) U(0x0F1E2D3C)
-#define CACTUS_INVALID_UUID_RD U(0x1) U(0x2) U(0x3) U(0x4)
-
-/*
- * Service IDs
- */
-
-/* Print a magic number unique to Cactus and return */
-#define CACTUS_PRINT_MAGIC U(1)
-/* Return a magic number unique to Cactus */
-#define CACTUS_GET_MAGIC U(2)
-/* Sleep for a number of milliseconds */
-#define CACTUS_SLEEP_MS U(3)
-
-#define CACTUS_MAGIC_NUMBER U(0x12481369)
-
#endif /* CACTUS_DEF_H */
diff --git a/spm/cactus/cactus_main.c b/spm/cactus/cactus_main.c
index c2c8ec2..1b641af 100644
--- a/spm/cactus/cactus_main.c
+++ b/spm/cactus/cactus_main.c
@@ -5,7 +5,6 @@
*/
#include <assert.h>
-#include <cactus_def.h>
#include <debug.h>
#include <drivers/arm/pl011.h>
#include <drivers/console.h>
@@ -16,13 +15,11 @@
#include <plat_arm.h>
#include <plat/common/platform.h>
#include <platform_def.h>
-#include <sp_helpers.h>
#include <spci_svc.h>
#include <std_svc.h>
#include "cactus.h"
#include "cactus_def.h"
-#include "cactus_tests.h"
#include "tftf_lib.h"