ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update auto generated SPM files

pull/8804/head
Mohammad AboMokh 2018-11-21 17:20:31 +02:00 committed by mohammad1603
parent 1325084b1a
commit 72037747b1
4 changed files with 64 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
TESTS/psa/prot_internal_storage/COMPONENT_SPE/psa_setup.c
View File

@ -28,9 +28,10 @@
#include "handles_manager.h" #include "handles_manager.h"
#include "cmsis.h" #include "cmsis.h"
#include "psa_test_its_reset_partition.h" #include "psa_test_its_reset_partition.h"
#include "psa_psa_f_partition.h"
#include "psa_its_partition.h" #include "psa_its_partition.h"
#include "psa_psa_f_partition.h"
extern const uint32_t psa_f_external_sids[4];
spm_partition_t g_partitions[3] = { spm_partition_t g_partitions[3] = {
{ {
@ -44,17 +45,6 @@ spm_partition_t g_partitions[3] = {
.extern_sids_count = TEST_ITS_RESET_EXT_ROT_SRV_COUNT, .extern_sids_count = TEST_ITS_RESET_EXT_ROT_SRV_COUNT,
.irq_mapper = NULL, .irq_mapper = NULL,
}, },
{
.partition_id = PSA_F_ID,
.thread_id = 0,
.flags_rot_srv = PSA_F_WAIT_ANY_SID_MSK,
.flags_interrupts = 0,
.rot_services = NULL,
.rot_services_count = PSA_F_ROT_SRV_COUNT,
.extern_sids = NULL,
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
.irq_mapper = NULL,
},
{ {
.partition_id = ITS_ID, .partition_id = ITS_ID,
.thread_id = 0, .thread_id = 0,
@ -66,6 +56,17 @@ spm_partition_t g_partitions[3] = {
.extern_sids_count = ITS_EXT_ROT_SRV_COUNT, .extern_sids_count = ITS_EXT_ROT_SRV_COUNT,
.irq_mapper = NULL, .irq_mapper = NULL,
}, },
{
.partition_id = PSA_F_ID,
.thread_id = 0,
.flags_rot_srv = PSA_F_WAIT_ANY_SID_MSK,
.flags_interrupts = 0,
.rot_services = NULL,
.rot_services_count = PSA_F_ROT_SRV_COUNT,
.extern_sids = psa_f_external_sids,
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
.irq_mapper = NULL,
},
}; };
/* Check all the defined memory regions for overlapping. */ /* Check all the defined memory regions for overlapping. */
@ -77,8 +78,8 @@ const uint32_t mem_region_count = 0;
// forward declaration of partition initializers // forward declaration of partition initializers
void test_its_reset_init(spm_partition_t *partition); void test_its_reset_init(spm_partition_t *partition);
void psa_f_init(spm_partition_t *partition);
void its_init(spm_partition_t *partition); void its_init(spm_partition_t *partition);
void psa_f_init(spm_partition_t *partition);
uint32_t init_partitions(spm_partition_t **partitions) uint32_t init_partitions(spm_partition_t **partitions)
{ {
@ -87,8 +88,8 @@ uint32_t init_partitions(spm_partition_t **partitions)
} }
test_its_reset_init(&(g_partitions[0])); test_its_reset_init(&(g_partitions[0]));
psa_f_init(&(g_partitions[1])); its_init(&(g_partitions[1]));
its_init(&(g_partitions[2])); psa_f_init(&(g_partitions[2]));
*partitions = g_partitions; *partitions = g_partitions;
return 3; return 3;

31
TESTS/psa/spm_client/COMPONENT_SPE/psa_setup.c
View File

@ -28,9 +28,10 @@
#include "handles_manager.h" #include "handles_manager.h"
#include "cmsis.h" #include "cmsis.h"
#include "psa_client_tests_part1_partition.h" #include "psa_client_tests_part1_partition.h"
#include "psa_psa_f_partition.h"
#include "psa_its_partition.h" #include "psa_its_partition.h"
#include "psa_psa_f_partition.h"
extern const uint32_t psa_f_external_sids[4];
spm_partition_t g_partitions[3] = { spm_partition_t g_partitions[3] = {
{ {
@ -44,17 +45,6 @@ spm_partition_t g_partitions[3] = {
.extern_sids_count = CLIENT_TESTS_PART1_EXT_ROT_SRV_COUNT, .extern_sids_count = CLIENT_TESTS_PART1_EXT_ROT_SRV_COUNT,
.irq_mapper = NULL, .irq_mapper = NULL,
}, },
{
.partition_id = PSA_F_ID,
.thread_id = 0,
.flags_rot_srv = PSA_F_WAIT_ANY_SID_MSK,
.flags_interrupts = 0,
.rot_services = NULL,
.rot_services_count = PSA_F_ROT_SRV_COUNT,
.extern_sids = NULL,
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
.irq_mapper = NULL,
},
{ {
.partition_id = ITS_ID, .partition_id = ITS_ID,
.thread_id = 0, .thread_id = 0,
@ -66,6 +56,17 @@ spm_partition_t g_partitions[3] = {
.extern_sids_count = ITS_EXT_ROT_SRV_COUNT, .extern_sids_count = ITS_EXT_ROT_SRV_COUNT,
.irq_mapper = NULL, .irq_mapper = NULL,
}, },
{
.partition_id = PSA_F_ID,
.thread_id = 0,
.flags_rot_srv = PSA_F_WAIT_ANY_SID_MSK,
.flags_interrupts = 0,
.rot_services = NULL,
.rot_services_count = PSA_F_ROT_SRV_COUNT,
.extern_sids = psa_f_external_sids,
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
.irq_mapper = NULL,
},
}; };
/* Check all the defined memory regions for overlapping. */ /* Check all the defined memory regions for overlapping. */
@ -77,8 +78,8 @@ const uint32_t mem_region_count = 0;
// forward declaration of partition initializers // forward declaration of partition initializers
void client_tests_part1_init(spm_partition_t *partition); void client_tests_part1_init(spm_partition_t *partition);
void psa_f_init(spm_partition_t *partition);
void its_init(spm_partition_t *partition); void its_init(spm_partition_t *partition);
void psa_f_init(spm_partition_t *partition);
uint32_t init_partitions(spm_partition_t **partitions) uint32_t init_partitions(spm_partition_t **partitions)
{ {
@ -87,8 +88,8 @@ uint32_t init_partitions(spm_partition_t **partitions)
} }
client_tests_part1_init(&(g_partitions[0])); client_tests_part1_init(&(g_partitions[0]));
psa_f_init(&(g_partitions[1])); its_init(&(g_partitions[1]));
its_init(&(g_partitions[2])); psa_f_init(&(g_partitions[2]));
*partitions = g_partitions; *partitions = g_partitions;
return 3; return 3;

31
TESTS/psa/spm_server/COMPONENT_SPE/psa_setup.c
View File

@ -29,10 +29,11 @@
#include "cmsis.h" #include "cmsis.h"
#include "psa_server_test_part1_partition.h" #include "psa_server_test_part1_partition.h"
#include "psa_server_test_part2_partition.h" #include "psa_server_test_part2_partition.h"
#include "psa_psa_f_partition.h"
#include "psa_its_partition.h" #include "psa_its_partition.h"
#include "psa_psa_f_partition.h"
extern const uint32_t server_test_part1_external_sids[2]; extern const uint32_t server_test_part1_external_sids[2];
extern const uint32_t psa_f_external_sids[4];
spm_partition_t g_partitions[4] = { spm_partition_t g_partitions[4] = {
{ {
@ -57,17 +58,6 @@ spm_partition_t g_partitions[4] = {
.extern_sids_count = SERVER_TEST_PART2_EXT_ROT_SRV_COUNT, .extern_sids_count = SERVER_TEST_PART2_EXT_ROT_SRV_COUNT,
.irq_mapper = NULL, .irq_mapper = NULL,
}, },
{
.partition_id = PSA_F_ID,
.thread_id = 0,
.flags_rot_srv = PSA_F_WAIT_ANY_SID_MSK,
.flags_interrupts = 0,
.rot_services = NULL,
.rot_services_count = PSA_F_ROT_SRV_COUNT,
.extern_sids = NULL,
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
.irq_mapper = NULL,
},
{ {
.partition_id = ITS_ID, .partition_id = ITS_ID,
.thread_id = 0, .thread_id = 0,
@ -79,6 +69,17 @@ spm_partition_t g_partitions[4] = {
.extern_sids_count = ITS_EXT_ROT_SRV_COUNT, .extern_sids_count = ITS_EXT_ROT_SRV_COUNT,
.irq_mapper = NULL, .irq_mapper = NULL,
}, },
{
.partition_id = PSA_F_ID,
.thread_id = 0,
.flags_rot_srv = PSA_F_WAIT_ANY_SID_MSK,
.flags_interrupts = 0,
.rot_services = NULL,
.rot_services_count = PSA_F_ROT_SRV_COUNT,
.extern_sids = psa_f_external_sids,
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
.irq_mapper = NULL,
},
}; };
/* Check all the defined memory regions for overlapping. */ /* Check all the defined memory regions for overlapping. */
@ -91,8 +92,8 @@ const uint32_t mem_region_count = 0;
// forward declaration of partition initializers // forward declaration of partition initializers
void server_test_part1_init(spm_partition_t *partition); void server_test_part1_init(spm_partition_t *partition);
void server_test_part2_init(spm_partition_t *partition); void server_test_part2_init(spm_partition_t *partition);
void psa_f_init(spm_partition_t *partition);
void its_init(spm_partition_t *partition); void its_init(spm_partition_t *partition);
void psa_f_init(spm_partition_t *partition);
uint32_t init_partitions(spm_partition_t **partitions) uint32_t init_partitions(spm_partition_t **partitions)
{ {
@ -102,8 +103,8 @@ uint32_t init_partitions(spm_partition_t **partitions)
server_test_part1_init(&(g_partitions[0])); server_test_part1_init(&(g_partitions[0]));
server_test_part2_init(&(g_partitions[1])); server_test_part2_init(&(g_partitions[1]));
psa_f_init(&(g_partitions[2])); its_init(&(g_partitions[2]));
its_init(&(g_partitions[3])); psa_f_init(&(g_partitions[3]));
*partitions = g_partitions; *partitions = g_partitions;
return 4; return 4;

31
TESTS/psa/spm_smoke/COMPONENT_SPE/psa_setup.c
View File

@ -28,9 +28,10 @@
#include "handles_manager.h" #include "handles_manager.h"
#include "cmsis.h" #include "cmsis.h"
#include "psa_smoke_test_part1_partition.h" #include "psa_smoke_test_part1_partition.h"
#include "psa_psa_f_partition.h"
#include "psa_its_partition.h" #include "psa_its_partition.h"
#include "psa_psa_f_partition.h"
extern const uint32_t psa_f_external_sids[4];
spm_partition_t g_partitions[3] = { spm_partition_t g_partitions[3] = {
{ {
@ -44,17 +45,6 @@ spm_partition_t g_partitions[3] = {
.extern_sids_count = SMOKE_TEST_PART1_EXT_ROT_SRV_COUNT, .extern_sids_count = SMOKE_TEST_PART1_EXT_ROT_SRV_COUNT,
.irq_mapper = NULL, .irq_mapper = NULL,
}, },
{
.partition_id = PSA_F_ID,
.thread_id = 0,
.flags_rot_srv = PSA_F_WAIT_ANY_SID_MSK,
.flags_interrupts = 0,
.rot_services = NULL,
.rot_services_count = PSA_F_ROT_SRV_COUNT,
.extern_sids = NULL,
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
.irq_mapper = NULL,
},
{ {
.partition_id = ITS_ID, .partition_id = ITS_ID,
.thread_id = 0, .thread_id = 0,
@ -66,6 +56,17 @@ spm_partition_t g_partitions[3] = {
.extern_sids_count = ITS_EXT_ROT_SRV_COUNT, .extern_sids_count = ITS_EXT_ROT_SRV_COUNT,
.irq_mapper = NULL, .irq_mapper = NULL,
}, },
{
.partition_id = PSA_F_ID,
.thread_id = 0,
.flags_rot_srv = PSA_F_WAIT_ANY_SID_MSK,
.flags_interrupts = 0,
.rot_services = NULL,
.rot_services_count = PSA_F_ROT_SRV_COUNT,
.extern_sids = psa_f_external_sids,
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
.irq_mapper = NULL,
},
}; };
/* Check all the defined memory regions for overlapping. */ /* Check all the defined memory regions for overlapping. */
@ -77,8 +78,8 @@ const uint32_t mem_region_count = 0;
// forward declaration of partition initializers // forward declaration of partition initializers
void smoke_test_part1_init(spm_partition_t *partition); void smoke_test_part1_init(spm_partition_t *partition);
void psa_f_init(spm_partition_t *partition);
void its_init(spm_partition_t *partition); void its_init(spm_partition_t *partition);
void psa_f_init(spm_partition_t *partition);
uint32_t init_partitions(spm_partition_t **partitions) uint32_t init_partitions(spm_partition_t **partitions)
{ {
@ -87,8 +88,8 @@ uint32_t init_partitions(spm_partition_t **partitions)
} }
smoke_test_part1_init(&(g_partitions[0])); smoke_test_part1_init(&(g_partitions[0]));
psa_f_init(&(g_partitions[1])); its_init(&(g_partitions[1]));
its_init(&(g_partitions[2])); psa_f_init(&(g_partitions[2]));
*partitions = g_partitions; *partitions = g_partitions;
return 3; return 3;