Skip to content

Support mbed_start_application for Cortex-M0+ #9791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 25, 2019
Merged

Support mbed_start_application for Cortex-M0+ #9791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7201cab
Support mbed_start_application for Cortex-M0+
sarahmarshy Feb 21, 2019
15b573d
Reuse nvic powerdown code block for M0+
sarahmarshy Feb 21, 2019
3c51257
Change MOV to MOVS for M0+
sarahmarshy Feb 22, 2019
3b98ebc
Change to MOVS for all targets
sarahmarshy Feb 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions platform/mbed_application.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion platform/mbed_application.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down