Merge changes from topic "master" into integration
* changes:
fix(tc): rename macro to match PSA spec
fix(tc): Correct return type
diff --git a/plat/arm/board/tc/region_defs.h b/plat/arm/board/tc/region_defs.h
index d3dfd13..50ec2f1 100644
--- a/plat/arm/board/tc/region_defs.h
+++ b/plat/arm/board/tc/region_defs.h
@@ -7,6 +7,6 @@
#ifndef REGION_DEFS_H
#define REGION_DEFS_H
-#define PSA_INITIAL_ATTEST_TOKEN_MAX_SIZE 0x800
+#define PSA_INITIAL_ATTEST_MAX_TOKEN_SIZE 0x800
#endif /* REGION_DEFS_H */
diff --git a/plat/arm/board/tc/rss_ap_tests.c b/plat/arm/board/tc/rss_ap_tests.c
index 8c40271..ea90ac3 100644
--- a/plat/arm/board/tc/rss_ap_tests.c
+++ b/plat/arm/board/tc/rss_ap_tests.c
@@ -56,7 +56,7 @@
return 0;
}
-void run_platform_tests(void)
+int run_platform_tests(void)
{
size_t i;
int ret;