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

Merge pull request #9791 from sarahmarshy/m0-start-app 

Support mbed_start_application for Cortex-M0+
pull/9829/head
Martin Kojtal 2019-02-25 09:40:37 +01:00 committed by GitHub
parent 92385a13da 3b98ebc5be
commit 5f38878f3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
platform/mbed_application.c
View File

@ -89,16 +89,19 @@ void mbed_start_application(uintptr_t address)
static void powerdown_nvic()
{
int isr_groups_32;
int i;
int j;
int isr_groups_32;
#if defined(__CORTEX_M23)
// M23 doesn't support ICTR and supports up to 240 external interrupts.
isr_groups_32 = 8;
#elif defined(__CORTEX_M0PLUS)
isr_groups_32 = 1;
#else
isr_groups_32 = ((SCnSCB->ICTR & SCnSCB_ICTR_INTLINESNUM_Msk) >> SCnSCB_ICTR_INTLINESNUM_Pos) + 1;
#endif
for (i = 0; i < isr_groups_32; i++) {
NVIC->ICER[i] = 0xFFFFFFFF;
NVIC->ICPR[i] = 0xFFFFFFFF;
@ -122,21 +125,21 @@ static void powerdown_scb(uint32_t vtor)
SCB->AIRCR = 0x05FA | 0x0000;
SCB->SCR = 0x00000000;
// SCB->CCR - Implementation defined value
#if defined(__CORTEX_M23)
for (i = 0; i < 2; i++) {
SCB->SHPR[i] = 0x00;
}
int num_pri_reg; // Number of priority registers
#if defined(__CORTEX_M0PLUS) || defined(__CORTEX_M23)
num_pri_reg = 2;
#else
for (i = 0; i < 12; i++) {
#if defined(__CORTEX_M7)
num_pri_reg = 12;
#endif
for (i = 0; i < num_pri_reg; i++) {
#if defined(__CORTEX_M7) || defined(__CORTEX_M23)
SCB->SHPR[i] = 0x00;
#else
SCB->SHP[i] = 0x00;
#endif
}
#endif
SCB->SHCSR = 0x00000000;
#if defined(__CORTEX_M23)
#if defined(__CORTEX_M23) || defined(__CORTEX_M0PLUS)
#else
SCB->CFSR = 0xFFFFFFFF;
SCB->HFSR = SCB_HFSR_DEBUGEVT_Msk | SCB_HFSR_FORCED_Msk | SCB_HFSR_VECTTBL_Msk;
@ -158,7 +161,7 @@ static void powerdown_scb(uint32_t vtor)
__asm static void start_new_application(void *sp, void *pc)
{
MOV R2, #0
MOVS R2, #0
MSR CONTROL, R2 // Switch to main stack
MOV SP, R0
MSR PRIMASK, R2 // Enable interrupts
@ -170,9 +173,7 @@ __asm static void start_new_application(void *sp, void *pc)
void start_new_application(void *sp, void *pc)
{
__asm volatile(
"movw r2, #0 \n" // Fail to compile "mov r2, #0" with ARMC6. Replace with MOVW.
// We needn't "movt r2, #0" immediately following because MOVW
// will zero-extend the 16-bit immediate.
"movs r2, #0 \n"
"msr control, r2 \n" // Switch to main stack
"mov sp, %0 \n"
"msr primask, r2 \n" // Enable interrupts

2
platform/mbed_application.h
View File

@ -20,7 +20,7 @@
#include<stdint.h>
#if defined(__CORTEX_M3) || defined(__CORTEX_M4) || defined(__CORTEX_M7)\
#if defined(__CORTEX_M0PLUS) || defined(__CORTEX_M3) || defined(__CORTEX_M4) || defined(__CORTEX_M7)\
|| defined(__CORTEX_M23) || defined(__CORTEX_A9)
#define MBED_APPLICATION_SUPPORT 1
#else