Skip to content

Commit a100ce8

Browse files
authored
Merge pull request #9899 from kfnta/fix_travis_psa
Regenerate mbed-spm files
2 parents b5d713d + 3c0c575 commit a100ce8

File tree

1 file changed

+20
-5
lines changed
  • TESTS/psa/crypto_access_control/COMPONENT_SPE

1 file changed

+20
-5
lines changed

TESTS/psa/crypto_access_control/COMPONENT_SPE/psa_setup.c

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,17 @@
2828
#include "handles_manager.h"
2929
#include "cmsis.h"
3030
#include "psa_test_partition_partition.h"
31+
#include "psa_attest_srv_partition.h"
3132
#include "psa_crypto_srv_partition.h"
3233
#include "psa_platform_partition.h"
3334
#include "psa_its_partition.h"
3435

3536
extern const uint32_t test_partition_external_sids[1];
37+
extern const uint32_t attest_srv_external_sids[7];
3638
extern const uint32_t crypto_srv_external_sids[4];
3739
extern const uint32_t platform_external_sids[1];
3840

39-
spm_partition_t g_partitions[4] = {
41+
spm_partition_t g_partitions[5] = {
4042
{
4143
.partition_id = TEST_PARTITION_ID,
4244
.thread_id = 0,
@@ -48,6 +50,17 @@ spm_partition_t g_partitions[4] = {
4850
.extern_sids_count = TEST_PARTITION_EXT_ROT_SRV_COUNT,
4951
.irq_mapper = NULL,
5052
},
53+
{
54+
.partition_id = ATTEST_SRV_ID,
55+
.thread_id = 0,
56+
.flags_rot_srv = ATTEST_SRV_WAIT_ANY_SID_MSK,
57+
.flags_interrupts = 0,
58+
.rot_services = NULL,
59+
.rot_services_count = ATTEST_SRV_ROT_SRV_COUNT,
60+
.extern_sids = attest_srv_external_sids,
61+
.extern_sids_count = ATTEST_SRV_EXT_ROT_SRV_COUNT,
62+
.irq_mapper = NULL,
63+
},
5164
{
5265
.partition_id = CRYPTO_SRV_ID,
5366
.thread_id = 0,
@@ -92,6 +105,7 @@ const uint32_t mem_region_count = 0;
92105

93106
// forward declaration of partition initializers
94107
void test_partition_init(spm_partition_t *partition);
108+
void attest_srv_init(spm_partition_t *partition);
95109
void crypto_srv_init(spm_partition_t *partition);
96110
void platform_init(spm_partition_t *partition);
97111
void its_init(spm_partition_t *partition);
@@ -103,11 +117,12 @@ uint32_t init_partitions(spm_partition_t **partitions)
103117
}
104118

105119
test_partition_init(&(g_partitions[0]));
106-
crypto_srv_init(&(g_partitions[1]));
107-
platform_init(&(g_partitions[2]));
108-
its_init(&(g_partitions[3]));
120+
attest_srv_init(&(g_partitions[1]));
121+
crypto_srv_init(&(g_partitions[2]));
122+
platform_init(&(g_partitions[3]));
123+
its_init(&(g_partitions[4]));
109124

110125
*partitions = g_partitions;
111-
return 4;
126+
return 5;
112127
}
113128

0 commit comments

Comments
 (0)