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

CR fixes

pull/9529/head
Oren Cohen 2019-01-25 17:32:36 +02:00 committed by Oren Cohen
parent 8841ba69f8
commit 34895a05ad
12 changed files with 11 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TESTS/psa/entropy_inject/its_reset/COMPONENT_SPE/TARGET_MBED_SPM/psa_test_its_reset_partition.c
View File

@ -23,8 +23,6 @@
* Generated by tools/spm/generate_partition_code.py Version 1.0 * Generated by tools/spm/generate_partition_code.py Version 1.0
**********************************************************************************************************************/ **********************************************************************************************************************/
#if !defined(TARGET_TFM)
#include "cmsis.h" #include "cmsis.h"
#include "mbed_toolchain.h" /* For using MBED_ALIGN macro */ #include "mbed_toolchain.h" /* For using MBED_ALIGN macro */
#include "rtx_os.h" #include "rtx_os.h"
@ -102,4 +100,3 @@ void test_its_reset_init(spm_partition_t *partition)
} }
} }
#endif // !defined(TARGET_TFM)

3
TESTS/psa/prot_internal_storage/its_reset/COMPONENT_SPE/TARGET_MBED_SPM/psa_test_its_reset_partition.c
View File

@ -23,8 +23,6 @@
* Generated by tools/spm/generate_partition_code.py Version 1.0 * Generated by tools/spm/generate_partition_code.py Version 1.0
**********************************************************************************************************************/ **********************************************************************************************************************/
#if !defined(TARGET_TFM)
#include "cmsis.h" #include "cmsis.h"
#include "mbed_toolchain.h" /* For using MBED_ALIGN macro */ #include "mbed_toolchain.h" /* For using MBED_ALIGN macro */
#include "rtx_os.h" #include "rtx_os.h"
@ -102,4 +100,3 @@ void test_its_reset_init(spm_partition_t *partition)
} }
} }
#endif // !defined(TARGET_TFM)

3
TESTS/psa/spm_client/COMPONENT_SPE/TARGET_MBED_SPM/psa_client_tests_part1_partition.c
View File

@ -23,8 +23,6 @@
* Generated by tools/spm/generate_partition_code.py Version 1.0 * Generated by tools/spm/generate_partition_code.py Version 1.0
**********************************************************************************************************************/ **********************************************************************************************************************/
#if !defined(TARGET_TFM)
#include "cmsis.h" #include "cmsis.h"
#include "mbed_toolchain.h" /* For using MBED_ALIGN macro */ #include "mbed_toolchain.h" /* For using MBED_ALIGN macro */
#include "rtx_os.h" #include "rtx_os.h"
@ -126,4 +124,3 @@ void client_tests_part1_init(spm_partition_t *partition)
} }
} }
#endif // !defined(TARGET_TFM)

3
TESTS/psa/spm_server/COMPONENT_SPE/TARGET_MBED_SPM/psa_server_test_part1_partition.c
View File

@ -23,8 +23,6 @@
* Generated by tools/spm/generate_partition_code.py Version 1.0 * Generated by tools/spm/generate_partition_code.py Version 1.0
**********************************************************************************************************************/ **********************************************************************************************************************/
#if !defined(TARGET_TFM)
#include "cmsis.h" #include "cmsis.h"
#include "mbed_toolchain.h" /* For using MBED_ALIGN macro */ #include "mbed_toolchain.h" /* For using MBED_ALIGN macro */
#include "rtx_os.h" #include "rtx_os.h"
@ -120,4 +118,3 @@ void server_test_part1_init(spm_partition_t *partition)
} }
} }
#endif // !defined(TARGET_TFM)

3
TESTS/psa/spm_server/COMPONENT_SPE/TARGET_MBED_SPM/psa_server_test_part2_partition.c
View File

@ -23,8 +23,6 @@
* Generated by tools/spm/generate_partition_code.py Version 1.0 * Generated by tools/spm/generate_partition_code.py Version 1.0
**********************************************************************************************************************/ **********************************************************************************************************************/
#if !defined(TARGET_TFM)
#include "cmsis.h" #include "cmsis.h"
#include "mbed_toolchain.h" /* For using MBED_ALIGN macro */ #include "mbed_toolchain.h" /* For using MBED_ALIGN macro */
#include "rtx_os.h" #include "rtx_os.h"
@ -114,4 +112,3 @@ void server_test_part2_init(spm_partition_t *partition)
} }
} }
#endif // !defined(TARGET_TFM)

2
TESTS/psa/spm_server/COMPONENT_SPE/server_tests.h
View File

@ -34,7 +34,7 @@ typedef psa_status_t (*psa_test_server_side_func)(psa_status_t *);
#define PSA_TEST_SERVER_NAME(name) psa_test_server_side_ ## name #define PSA_TEST_SERVER_NAME(name) psa_test_server_side_ ## name
#define PSA_TEST_CLIENT(name) void PSA_TEST_CLIENT_NAME(name) (void) #define PSA_TEST_CLIENT(name) void PSA_TEST_CLIENT_NAME(name) (void)
#define PSA_TEST_SERVER(name) psa_status_t PSA_TEST_SERVER_NAME(name) (psa_status_t* status_ptr) #define PSA_TEST_SERVER(name) psa_status_t PSA_TEST_SERVER_NAME(name) (psa_status_t *status_ptr)
#define PSA_TEST(name) \ #define PSA_TEST(name) \
PSA_TEST_CLIENT(name); \ PSA_TEST_CLIENT(name); \

2
TESTS/psa/spm_server/server_tests.h
View File

@ -34,7 +34,7 @@ typedef psa_status_t (*psa_test_server_side_func)(psa_status_t *);
#define PSA_TEST_SERVER_NAME(name) psa_test_server_side_ ## name #define PSA_TEST_SERVER_NAME(name) psa_test_server_side_ ## name
#define PSA_TEST_CLIENT(name) void PSA_TEST_CLIENT_NAME(name) (void) #define PSA_TEST_CLIENT(name) void PSA_TEST_CLIENT_NAME(name) (void)
#define PSA_TEST_SERVER(name) psa_status_t PSA_TEST_SERVER_NAME(name) (psa_status_t* status_ptr) #define PSA_TEST_SERVER(name) psa_status_t PSA_TEST_SERVER_NAME(name) (psa_status_t *status_ptr)
#define PSA_TEST(name) \ #define PSA_TEST(name) \
PSA_TEST_CLIENT(name); \ PSA_TEST_CLIENT(name); \

3
TESTS/psa/spm_smoke/COMPONENT_SPE/TARGET_MBED_SPM/psa_smoke_test_part1_partition.c
View File

@ -23,8 +23,6 @@
* Generated by tools/spm/generate_partition_code.py Version 1.0 * Generated by tools/spm/generate_partition_code.py Version 1.0
**********************************************************************************************************************/ **********************************************************************************************************************/
#if !defined(TARGET_TFM)
#include "cmsis.h" #include "cmsis.h"
#include "mbed_toolchain.h" /* For using MBED_ALIGN macro */ #include "mbed_toolchain.h" /* For using MBED_ALIGN macro */
#include "rtx_os.h" #include "rtx_os.h"
@ -102,4 +100,3 @@ void smoke_test_part1_init(spm_partition_t *partition)
} }
} }
#endif // !defined(TARGET_TFM)

3
components/TARGET_PSA/services/crypto/COMPONENT_SPE/TARGET_MBED_SPM/psa_crypto_srv_partition.c
View File

@ -23,8 +23,6 @@
* Generated by tools/spm/generate_partition_code.py Version 1.0 * Generated by tools/spm/generate_partition_code.py Version 1.0
**********************************************************************************************************************/ **********************************************************************************************************************/
#if !defined(TARGET_TFM)
#include "cmsis.h" #include "cmsis.h"
#include "mbed_toolchain.h" /* For using MBED_ALIGN macro */ #include "mbed_toolchain.h" /* For using MBED_ALIGN macro */
#include "rtx_os.h" #include "rtx_os.h"
@ -230,4 +228,3 @@ void crypto_srv_init(spm_partition_t *partition)
} }
} }
#endif // !defined(TARGET_TFM)

3
components/TARGET_PSA/services/psa_prot_internal_storage/COMPONENT_SPE/TARGET_MBED_SPM/psa_its_partition.c
View File

@ -23,8 +23,6 @@
* Generated by tools/spm/generate_partition_code.py Version 1.0 * Generated by tools/spm/generate_partition_code.py Version 1.0
**********************************************************************************************************************/ **********************************************************************************************************************/
#if !defined(TARGET_TFM)
#include "cmsis.h" #include "cmsis.h"
#include "mbed_toolchain.h" /* For using MBED_ALIGN macro */ #include "mbed_toolchain.h" /* For using MBED_ALIGN macro */
#include "rtx_os.h" #include "rtx_os.h"
@ -138,4 +136,3 @@ void its_init(spm_partition_t *partition)
} }
} }
#endif // !defined(TARGET_TFM)

15
rtos/TARGET_CORTEX/mbed_rtos_rtx.c
View File

@ -24,12 +24,11 @@
#include "mbed_critical.h" #include "mbed_critical.h"
#include "mbed_boot.h" #include "mbed_boot.h"
#if defined(TARGET_PSA) && defined(TARGET_MBED_SPM) #if defined(TARGET_MBED_SPM)
#include "spm_init.h" #include "spm_init.h"
#include "spm_api.h" #include "spm_api.h"
#endif #endif
#if defined(COMPONENT_NSPE) && defined(COMPONENT_SPM_MAILBOX) #if defined(COMPONENT_NSPE) && defined(COMPONENT_SPM_MAILBOX)
MBED_ALIGN(8) char psa_spm_dispatcher_th_stack[0x100]; MBED_ALIGN(8) char psa_spm_dispatcher_th_stack[0x100];
@ -85,18 +84,22 @@ MBED_NORETURN void mbed_rtos_start()
spm_ipc_mailbox_init(); spm_ipc_mailbox_init();
#endif // defined(COMPONENT_SPM_MAILBOX) #endif // defined(COMPONENT_SPM_MAILBOX)
#if defined(COMPONENT_SPE) && defined(TARGET_MBED_SPM) #if defined(TARGET_MBED_SPM)
#if defined(COMPONENT_SPE)
// At this point, the mailbox is already initialized // At this point, the mailbox is already initialized
spm_hal_start_nspe(); spm_hal_start_nspe();
psa_spm_init(); psa_spm_init();
#endif // defined(COMPONENT_SPE) && defined(TARGET_MBED_SPM) #endif // defined(COMPONENT_SPE)
#if defined(COMPONENT_NSPE) && defined(COMPONENT_SPM_MAILBOX) && defined(TARGET_MBED_SPM) #if defined(COMPONENT_NSPE) && defined(COMPONENT_SPM_MAILBOX)
osThreadId_t spm_result = osThreadNew((osThreadFunc_t)psa_spm_mailbox_dispatcher, NULL, &psa_spm_dispatcher_th_attr); osThreadId_t spm_result = osThreadNew((osThreadFunc_t)psa_spm_mailbox_dispatcher, NULL, &psa_spm_dispatcher_th_attr);
if ((void *)spm_result == NULL) { if ((void *)spm_result == NULL) {
MBED_ERROR1(MBED_MAKE_ERROR(MBED_MODULE_PLATFORM, MBED_ERROR_CODE_INITIALIZATION_FAILED), "Dispatcher thread not created", &psa_spm_dispatcher_th_attr); MBED_ERROR1(MBED_MAKE_ERROR(MBED_MODULE_PLATFORM, MBED_ERROR_CODE_INITIALIZATION_FAILED), "Dispatcher thread not created", &psa_spm_dispatcher_th_attr);
} }
#endif // defined(COMPONENT_NSPE) && defined(COMPONENT_SPM_MAILBOX) && defined(TARGET_MBED_SPM) #endif // defined(COMPONENT_NSPE) && defined(COMPONENT_SPM_MAILBOX)
#endif // defined(TARGET_MBED_SPM)
singleton_mutex_id = osMutexNew(&singleton_mutex_attr); singleton_mutex_id = osMutexNew(&singleton_mutex_attr);
osThreadId_t result = osThreadNew((osThreadFunc_t)mbed_start, NULL, &_main_thread_attr); osThreadId_t result = osThreadNew((osThreadFunc_t)mbed_start, NULL, &_main_thread_attr);

3
tools/spm/templates/COMPONENT_SPE/TARGET_MBED_SPM/psa_NAME_partition.c.tpl
View File

@ -23,8 +23,6 @@
* Generated by tools/spm/generate_partition_code.py Version {{script_ver}} * Generated by tools/spm/generate_partition_code.py Version {{script_ver}}
**********************************************************************************************************************/ **********************************************************************************************************************/
#if !defined(TARGET_TFM)
#include "cmsis.h" #include "cmsis.h"
#include "mbed_toolchain.h" /* For using MBED_ALIGN macro */ #include "mbed_toolchain.h" /* For using MBED_ALIGN macro */
#include "rtx_os.h" #include "rtx_os.h"
@ -146,5 +144,4 @@ void {{partition.name|lower}}_init(spm_partition_t *partition)
} }
} }
#endif // !defined(TARGET_TFM)
{# End of file #} {# End of file #}