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 #13584 from ARMmbed/revert-13011-alzix/both-artifacts 

Revert "Always build both .hex and .bin files"
pull/13587/head
Martin Kojtal 2020-09-10 12:25:02 +01:00 committed by GitHub
parent 267a5ac5bf 5d245ad553
commit 8a22d3500a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
connectivity/libraries/nanostack-libservice/test/libService/unittest/Makefile Executable file → Normal file
View File

0
connectivity/libraries/nanostack-libservice/test/libService/unittest/MakefileWorker.mk Executable file → Normal file
View File

9
tools/toolchains/mbed_toolchain.py
View File

@ -778,15 +778,14 @@ 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:
stem = join(new_path, "{}_application".format(tail)) filename = "{}_application.{}".format(tail, ext)
else: else:
stem = join(new_path, tail) filename = "{}.{}".format(tail, ext)
full_path = "{}.{}".format(stem, ext) full_path = join(new_path, filename)
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, "{}.{}".format(stem, 'bin')) self.binary(r, elf, full_path)
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