ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #13011 from alzix/alzix/both-artifacts 

Always build both .hex and .bin files
pull/13283/head
Martin Kojtal 2020-07-10 09:31:32 +02:00 committed by GitHub
parent aa605bb056 136897f829
commit efe46b5aa1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/toolchains/mbed_toolchain.py
View File

@ -778,14 +778,15 @@ class mbedToolchain(with_metaclass(ABCMeta, object)):
self.link(elf, objects, libraries, lib_dirs, linker_script) self.link(elf, objects, libraries, lib_dirs, linker_script)
if self.config.has_regions: if self.config.has_regions:
filename = "{}_application.{}".format(tail, ext) stem = join(new_path, "{}_application".format(tail))
else: else:
filename = "{}.{}".format(tail, ext) stem = join(new_path, tail)
full_path = join(new_path, filename) full_path = "{}.{}".format(stem, ext)
if ext != 'elf': if ext != 'elf':
if full_path and self.need_update(full_path, [elf]): if full_path and self.need_update(full_path, [elf]):
self.progress("elf2bin", tail) self.progress("elf2bin", tail)
self.binary(r, elf, full_path) self.binary(r, elf, "{}.{}".format(stem, 'bin'))
self.binary(r, elf, "{}.{}".format(stem, 'hex'))
if self.config.has_regions: if self.config.has_regions:
full_path, updatable = self._do_region_merge( full_path, updatable = self._do_region_merge(
tail, full_path, ext tail, full_path, ext