Skip to content

Commit db376bf

Browse files
ajaakkohadbridge
authored andcommitted
export: Change linker script name
SW4STM32 linker script name now contains target name. Print formatting is using new Python style.
1 parent 65c4a22 commit db376bf

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

tools/export/sw4stm32/__init__.py

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -323,12 +323,10 @@ def generate(self):
323323
if not self.resources.linker_script:
324324
raise NotSupportedException("No linker script found.")
325325

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 ('\nCreate 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')
332330

333331
self.resources.win_to_unix()
334332

@@ -341,7 +339,6 @@ def generate(self):
341339
elif core == "Cortex-M7FD":
342340
fp_hardware = "fpv5-d16"
343341
fp_abi = "softfp"
344-
print 'FP hardware: ' + fp_hardware
345342

346343
config_header = self.filter_dot(self.toolchain.get_config_header())
347344

@@ -354,17 +351,17 @@ def generate(self):
354351

355352
self.include_path = [self.filter_dot(s)
356353
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)))
358355

359356
self.exclude_dirs = []
360357
self.build_excludelist()
361358

362-
print 'Exclude folders: %d' % len(self.exclude_dirs)
359+
print ('Exclude folders: {0}'.format(len(self.exclude_dirs)))
363360

364361
self.exclude_dirs = '|'.join(self.exclude_dirs)
365362

366363
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))
368365

369366
lib_dirs = [self.filter_dot(s) for s in self.resources.lib_dirs]
370367

@@ -380,7 +377,7 @@ def generate(self):
380377
'config_header': config_header,
381378
'exclude_paths': self.exclude_dirs,
382379
'ld_script': ld_script,
383-
'linker_script': 'linker-script-' + self.project_name + '.ld',
380+
'linker_script': 'linker-script-' + self.toolchain.target.name + '.ld',
384381
'library_paths': lib_dirs,
385382
'object_files': self.resources.objects,
386383
'libraries': libraries,

0 commit comments

Comments
 (0)