@@ -323,12 +323,10 @@ def generate(self):
323
323
if not self .resources .linker_script :
324
324
raise NotSupportedException ("No linker script found." )
325
325
326
- print
327
- print 'Create a System Workbench for STM32 managed project'
328
- print 'Project name: {0}' .format (self .project_name )
329
- print 'Target: {0}' .format (self .toolchain .target .name )
330
- print 'Toolchain: {0}' .format (self .TOOLCHAIN )
331
- print
326
+ print ('\n Create a System Workbench for STM32 managed project' )
327
+ print ('Project name: {0}' .format (self .project_name ))
328
+ print ('Target: {0}' .format (self .toolchain .target .name ))
329
+ print ('Toolchain: {0}' .format (self .TOOLCHAIN ) + '\n ' )
332
330
333
331
self .resources .win_to_unix ()
334
332
@@ -341,7 +339,6 @@ def generate(self):
341
339
elif core == "Cortex-M7FD" :
342
340
fp_hardware = "fpv5-d16"
343
341
fp_abi = "softfp"
344
- print 'FP hardware: ' + fp_hardware
345
342
346
343
config_header = self .filter_dot (self .toolchain .get_config_header ())
347
344
@@ -354,17 +351,17 @@ def generate(self):
354
351
355
352
self .include_path = [self .filter_dot (s )
356
353
for s in self .resources .inc_dirs ]
357
- print 'Include folders: %d' % len (self .include_path )
354
+ print ( 'Include folders: {0}' . format ( len (self .include_path )) )
358
355
359
356
self .exclude_dirs = []
360
357
self .build_excludelist ()
361
358
362
- print 'Exclude folders: %d' % len (self .exclude_dirs )
359
+ print ( 'Exclude folders: {0}' . format ( len (self .exclude_dirs )) )
363
360
364
361
self .exclude_dirs = '|' .join (self .exclude_dirs )
365
362
366
363
ld_script = self .filter_dot (self .resources .linker_script )
367
- print ('Linker script: {0}' .format (ld_script ))
364
+ print ('Linker script: {0}' .format (ld_script ))
368
365
369
366
lib_dirs = [self .filter_dot (s ) for s in self .resources .lib_dirs ]
370
367
@@ -380,7 +377,7 @@ def generate(self):
380
377
'config_header' : config_header ,
381
378
'exclude_paths' : self .exclude_dirs ,
382
379
'ld_script' : ld_script ,
383
- 'linker_script' : 'linker-script-' + self .project_name + '.ld' ,
380
+ 'linker_script' : 'linker-script-' + self .toolchain . target . name + '.ld' ,
384
381
'library_paths' : lib_dirs ,
385
382
'object_files' : self .resources .objects ,
386
383
'libraries' : libraries ,
0 commit comments