Skip to content

Commit 68a5e7d

Browse files
committed
[BSP] Update building script
1 parent e8a6da9 commit 68a5e7d

File tree

5 files changed

+8
-10
lines changed

5 files changed

+8
-10
lines changed

bsp/gd32450z-eval/rtconfig.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# toolchains options
44
ARCH='arm'
55
CPU='cortex-m4'
6-
CROSS_TOOL='gcc'
6+
CROSS_TOOL='keil'
77

88
if os.getenv('RTT_CC'):
99
CROSS_TOOL = os.getenv('RTT_CC')
@@ -17,14 +17,13 @@
1717
print 'Not support gcc yet!'
1818
print '================================================='
1919
PLATFORM = 'gcc'
20-
exit(0)
2120
elif CROSS_TOOL == 'keil':
2221
PLATFORM = 'armcc'
2322
EXEC_PATH = r'C:/Keil_v5'
2423
elif CROSS_TOOL == 'iar':
2524
PLATFORM = 'iar'
2625
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0'
27-
26+
2827
if os.getenv('RTT_EXEC_PATH'):
2928
EXEC_PATH = os.getenv('RTT_EXEC_PATH')
3029

bsp/imx6ul/SConstruct

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ TARGET = 'rtthread-imx6.' + rtconfig.TARGET_EXT
1515
env = Environment(tools = ['mingw'],
1616
AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS,
1717
CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS,
18-
CXX= rtconfig.CXX, CXXFLAGS = rtconfig.CFLAGS,
18+
CXX= rtconfig.CXX, CXXFLAGS = rtconfig.CFLAGS,
1919
AR = rtconfig.AR, ARFLAGS = '-rc',
2020
LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
2121
env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

bsp/lpc824/SConstruct

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ if os.getenv('RTT_ROOT'):
88
else:
99
#RTT_ROOT = os.path.join(Dir('#').get_abspath(), 'rt-thread')
1010
RTT_ROOT = os.path.normpath(os.getcwd() + '/../..')
11-
print RTT_ROOT
12-
11+
1312
sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')]
1413
from building import *
1514

bsp/mini4020/rtconfig.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
if os.getenv('RTT_CC'):
1111
CROSS_TOOL = os.getenv('RTT_CC')
1212

13-
if CROSS_TOOL == 'gcc':
13+
if CROSS_TOOL == 'gcc':
1414
print '================ERROR============================'
1515
print 'Not support gcc yet!'
1616
print '================================================='

tools/keil.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ def MDK45Project(tree, target, script):
226226
if CPPDEFINES:
227227
CPPDEFINES += group['CPPDEFINES']
228228
else:
229-
CPPDEFINES += group['CPPDEFINES']
229+
CPPDEFINES = group['CPPDEFINES']
230230

231231
# get each group's link flags
232232
if group.has_key('LINKFLAGS') and group['LINKFLAGS']:
@@ -332,9 +332,9 @@ def MDKProject(target, script):
332332
# get each group's definitions
333333
if group.has_key('CPPDEFINES') and group['CPPDEFINES']:
334334
if CPPDEFINES:
335-
CPPDEFINES += ';' + group['CPPDEFINES']
336-
else:
337335
CPPDEFINES += group['CPPDEFINES']
336+
else:
337+
CPPDEFINES = group['CPPDEFINES']
338338

339339
# get each group's link flags
340340
if group.has_key('LINKFLAGS') and group['LINKFLAGS']:

0 commit comments

Comments
 (0)