chinky/rtt-f030
chinky/rtt-f030
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #488 from aozima/pulls

Browse Source 
Pulls
This commit is contained in:
Bernard Xiong 2015-05-22 17:37:16 +08:00
commit 2dd8b560ed
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libcpu/arm/cortex-m4/context_rvds.S
View File

@ -205,7 +205,6 @@ rt_hw_context_switch_to PROC
LDR r0, =SCB_VTOR LDR r0, =SCB_VTOR
LDR r0, [r0] LDR r0, [r0]
LDR r0, [r0] LDR r0, [r0]
NOP
MSR msp, r0 MSR msp, r0
; enable interrupts at processor level ; enable interrupts at processor level

4
tools/keil.py
View File

@ -75,6 +75,8 @@ def MDK4AddGroupForFN(ProjectFiles, parent, name, filename, project_path):
obj_name = name.replace('.s', '.o') obj_name = name.replace('.s', '.o')
elif name.find('.S') != -1: elif name.find('.S') != -1:
obj_name = name.replace('.s', '.o') obj_name = name.replace('.s', '.o')
else:
obj_name = name
if ProjectFiles.count(obj_name): if ProjectFiles.count(obj_name):
name = basename + '_' + name name = basename + '_' + name
@ -272,6 +274,8 @@ def MDK5AddGroup(ProjectFiles, parent, name, files, project_path):
obj_name = name.replace('.s', '.o') obj_name = name.replace('.s', '.o')
elif name.find('.S') != -1: elif name.find('.S') != -1:
obj_name = name.replace('.s', '.o') obj_name = name.replace('.s', '.o')
else:
obj_name = name
if ProjectFiles.count(obj_name): if ProjectFiles.count(obj_name):
name = basename + '_' + name name = basename + '_' + name