Skip to content

Support mbed_start_application for Cortex-M23 #6949

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
Jun 7, 2018
Merged

Support mbed_start_application for Cortex-M23 #6949

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
b3f17a9
Support mbed_start_application for Cortex-M23
ccli8 May 17, 2018
646f614
Fix start_new_application compile error on Cortex-M23
ccli8 May 21, 2018
3c14cb6
Fix mbed_start_application on Cortex-M23
ccli8 May 28, 2018
23dcd82
Remove superfluous MOVT in mbed_start_application/start_new_application
ccli8 May 30, 2018
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
22 changes: 21 additions & 1 deletion platform/mbed_application.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,21 @@ static void powerdown_nvic()
int i;
int j;

#if defined(__CORTEX_M23)
// M23 doesn't support ICTR and supports up to 240 external interrupts.
isr_groups_32 = 8;
#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;
for (j = 0; j < 8; j++) {
#if defined(__CORTEX_M23)
NVIC->IPR[i * 8 + j] = 0x00000000;
#else
NVIC->IP[i * 8 + j] = 0x00000000;
#endif
}
}
}
Expand All @@ -68,18 +77,27 @@ 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;
}
#else
for (i = 0; i < 12; i++) {
#if defined(__CORTEX_M7)
SCB->SHPR[i] = 0x00;
#else
SCB->SHP[i] = 0x00;
#endif
}
#endif
SCB->SHCSR = 0x00000000;
#if defined(__CORTEX_M23)
#else
SCB->CFSR = 0xFFFFFFFF;
SCB->HFSR = SCB_HFSR_DEBUGEVT_Msk | SCB_HFSR_FORCED_Msk | SCB_HFSR_VECTTBL_Msk;
SCB->DFSR = SCB_DFSR_EXTERNAL_Msk | SCB_DFSR_VCATCH_Msk |
SCB_DFSR_DWTTRAP_Msk | SCB_DFSR_BKPT_Msk | SCB_DFSR_HALTED_Msk;
#endif
// SCB->MMFAR - Implementation defined value
// SCB->BFAR - Implementation defined value
// SCB->AFSR - Implementation defined value
Expand Down Expand Up @@ -107,7 +125,9 @@ __asm static void start_new_application(void *sp, void *pc)
void start_new_application(void *sp, void *pc)
{
__asm volatile (
"mov r2, #0 \n"
"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.
"msr control, r2 \n" // Switch to main stack
"mov sp, %0 \n"
"msr primask, r2 \n" // Enable interrupts
Expand Down
3 changes: 2 additions & 1 deletion platform/mbed_application.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@

#include<stdint.h>

#if defined(__CORTEX_M3) || defined(__CORTEX_M4) || defined(__CORTEX_M7)
#if defined(__CORTEX_M3) || defined(__CORTEX_M4) || defined(__CORTEX_M7)\
|| defined(__CORTEX_M23)
#define MBED_APPLICATION_SUPPORT 1
#else
#define MBED_APPLICATION_SUPPORT 0
Expand Down