Skip to content

Commit 8a22d35

Browse files
authored
Merge pull request ARMmbed#13584 from ARMmbed/revert-13011-alzix/both-artifacts
Revert "Always build both .hex and .bin files"
2 parents 267a5ac + 5d245ad commit 8a22d35

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

connectivity/libraries/nanostack-libservice/test/libService/unittest/Makefile

100755100644
File mode changed.

connectivity/libraries/nanostack-libservice/test/libService/unittest/MakefileWorker.mk

100755100644
File mode changed.

tools/toolchains/mbed_toolchain.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -778,15 +778,14 @@ def link_program(self, r, tmp_path, name):
778778
self.link(elf, objects, libraries, lib_dirs, linker_script)
779779

780780
if self.config.has_regions:
781-
stem = join(new_path, "{}_application".format(tail))
781+
filename = "{}_application.{}".format(tail, ext)
782782
else:
783-
stem = join(new_path, tail)
784-
full_path = "{}.{}".format(stem, ext)
783+
filename = "{}.{}".format(tail, ext)
784+
full_path = join(new_path, filename)
785785
if ext != 'elf':
786786
if full_path and self.need_update(full_path, [elf]):
787787
self.progress("elf2bin", tail)
788-
self.binary(r, elf, "{}.{}".format(stem, 'bin'))
789-
self.binary(r, elf, "{}.{}".format(stem, 'hex'))
788+
self.binary(r, elf, full_path)
790789
if self.config.has_regions:
791790
full_path, updatable = self._do_region_merge(
792791
tail, full_path, ext

0 commit comments

Comments
 (0)