deon/chopstx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Now, example-led works fine with -mcortex-m4.

Browse Source
This commit is contained in:
NIIBE Yutaka
2019-04-12 10:30:53 +09:00
parent 5a326eee54
commit 52efc84f5c
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,3 +1,7 @@
2019-04-12 NIIBE Yutaka <gniibe@fsij.org>
* entry.c [__ARM_ARCH_7EM__] (entry): Fix for Cortex-M4.
2019-04-11 NIIBE Yutaka <gniibe@fsij.org> 2019-04-11 NIIBE Yutaka <gniibe@fsij.org>
* chopstx-cortex-m.c: Support Cortex-M4 (not touching FPU). * chopstx-cortex-m.c: Support Cortex-M4 (not touching FPU).

6
entry.c
View File

@@ -73,7 +73,7 @@ main (int argc, const char *argv[])
#endif #endif
extern uint8_t __main_stack_end__; extern uint8_t __main_stack_end__;
#if defined(__ARM_ARCH_7M__) #if defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__)
extern void svc (void); extern void svc (void);
#endif #endif
extern void preempt (void); extern void preempt (void);
@@ -169,7 +169,7 @@ entry (void)
"bl chx_systick_init\n\t" "bl chx_systick_init\n\t"
"bl gpio_init\n\t" "bl gpio_init\n\t"
/* Enable interrupts. */ /* Enable interrupts. */
#if defined(__ARM_ARCH_7M__) #if defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__)
"mov r0, #0\n\t" "mov r0, #0\n\t"
"msr BASEPRI, r0\n\t" "msr BASEPRI, r0\n\t"
#endif #endif
@@ -199,7 +199,7 @@ handler vector_table[] __attribute__ ((section(".startup.vectors"))) = {
none, none, none, /* reserved */ none, none, none, /* reserved */
#if defined(__ARM_ARCH_6M__) #if defined(__ARM_ARCH_6M__)
none, /* SVCall */ none, /* SVCall */
#elif defined(__ARM_ARCH_7M__) #elif defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__)
svc, /* SVCall */ svc, /* SVCall */
#endif #endif
none, /* Debug */ none, /* Debug */

4
example-led/Makefile
View File

@@ -26,9 +26,9 @@ OBJCOPY = $(CROSS)objcopy
### MCU = cortex-m3 ### MCU = cortex-m3
### MCU = cortex-m0 ### MCU = cortex-m0
MCU = cortex-m3 MCU = cortex-m4
CWARN = -Wall -Wextra -Wstrict-prototypes CWARN = -Wall -Wextra -Wstrict-prototypes
DEFS = -DUSE_SYS3 -DFREE_STANDING -DMHZ=48 DEFS = -DUSE_SYS3 -DFREE_STANDING -DMHZ=80
### DEFS = -DFREE_STANDING -DUSE_SYS3 -DBUSY_LOOP -DCHX_FLAGS_MAIN=CHOPSTX_SCHED_RR ### DEFS = -DFREE_STANDING -DUSE_SYS3 -DBUSY_LOOP -DCHX_FLAGS_MAIN=CHOPSTX_SCHED_RR
OPT = -O3 -Os -g OPT = -O3 -Os -g
LIBS = LIBS =