Merge pull request #11978 from hugueskamba/hk-fix-lpc55s69_ns-baremetal-compilation

LPC55S69_NS: Fix baremetal compilation error
pull/11991/head
Martin Kojtal 2019-11-29 13:05:13 +01:00 committed by GitHub
commit f2d211b7c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 1 deletions

View File

@ -1,3 +1,6 @@
{
"name": "psa"
"name": "psa",
"config": {
"present": 1
}
}

View File

@ -16,6 +16,8 @@
* limitations under the License.
*/
#if MBED_CONF_PSA_PRESENT
#include "cmsis_nvic_virtual.h"
#include "mbed_toolchain.h"
@ -25,3 +27,5 @@ void __NVIC_TFMSystemReset(void)
{
mbed_psa_system_reset();
}
#endif // MBED_CONF_PSA_PRESENT

View File

@ -37,9 +37,14 @@ extern "C" {
#define NVIC_GetActive __NVIC_GetActive
#define NVIC_SetPriority __NVIC_SetPriority
#define NVIC_GetPriority __NVIC_GetPriority
#if MBED_CONF_PSA_PRESENT
#define NVIC_SystemReset __NVIC_TFMSystemReset
#else
#define NVIC_SystemReset __NVIC_SystemReset
#endif // MBED_CONF_PSA_PRESENT
#if MBED_CONF_PSA_PRESENT
/**
* \brief Overriding the default CMSIS system reset implementation by calling
* secure TFM service.
@ -47,6 +52,8 @@ extern "C" {
*/
void __NVIC_TFMSystemReset(void);
#endif // MBED_CONF_PSA_PRESENT
#ifdef __cplusplus
}
#endif