diff options
| author | Bernard Xiong <[email protected]> | 2015-05-22 17:37:16 +0800 |
|---|---|---|
| committer | Bernard Xiong <[email protected]> | 2015-05-22 17:37:16 +0800 |
| commit | 2dd8b560edb3847b73d5fd80a25855e498dd286f (patch) | |
| tree | 1323773c7cbb944c19e78858442d8b57d90bbf84 | |
| parent | 607a1cd11d66f5806c80627873fd1a69a019c1f5 (diff) | |
| parent | 6230ff81ccbf3834727c7b62e6228ba1d6716339 (diff) | |
Merge pull request #488 from aozima/pulls
Pulls
| -rw-r--r-- | libcpu/arm/cortex-m4/context_rvds.S | 1 | ||||
| -rw-r--r-- | tools/keil.py | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libcpu/arm/cortex-m4/context_rvds.S b/libcpu/arm/cortex-m4/context_rvds.S index d7cb34d5c3..fa7a1c90f8 100644 --- a/libcpu/arm/cortex-m4/context_rvds.S +++ b/libcpu/arm/cortex-m4/context_rvds.S @@ -205,7 +205,6 @@ rt_hw_context_switch_to PROC LDR r0, =SCB_VTOR LDR r0, [r0] LDR r0, [r0] - NOP MSR msp, r0 ; enable interrupts at processor level diff --git a/tools/keil.py b/tools/keil.py index 16fc0d1fc5..4cf07a0741 100644 --- a/tools/keil.py +++ b/tools/keil.py @@ -75,6 +75,8 @@ def MDK4AddGroupForFN(ProjectFiles, parent, name, filename, project_path): obj_name = name.replace('.s', '.o') elif name.find('.S') != -1: obj_name = name.replace('.s', '.o') + else: + obj_name = name if ProjectFiles.count(obj_name): name = basename + '_' + name @@ -272,6 +274,8 @@ def MDK5AddGroup(ProjectFiles, parent, name, files, project_path): obj_name = name.replace('.s', '.o') elif name.find('.S') != -1: obj_name = name.replace('.s', '.o') + else: + obj_name = name if ProjectFiles.count(obj_name): name = basename + '_' + name |