From 5d245ad5537bc8c54795a87549258a6c22df5087 Mon Sep 17 00:00:00 2001 From: Martin Kojtal Date: Thu, 10 Sep 2020 10:19:04 +0100 Subject: [PATCH] Revert "Always build both .hex and .bin files" --- .../test/libService/unittest/Makefile | 0 .../test/libService/unittest/MakefileWorker.mk | 0 tools/toolchains/mbed_toolchain.py | 9 ++++----- 3 files changed, 4 insertions(+), 5 deletions(-) mode change 100755 => 100644 connectivity/libraries/nanostack-libservice/test/libService/unittest/Makefile mode change 100755 => 100644 connectivity/libraries/nanostack-libservice/test/libService/unittest/MakefileWorker.mk diff --git a/connectivity/libraries/nanostack-libservice/test/libService/unittest/Makefile b/connectivity/libraries/nanostack-libservice/test/libService/unittest/Makefile old mode 100755 new mode 100644 diff --git a/connectivity/libraries/nanostack-libservice/test/libService/unittest/MakefileWorker.mk b/connectivity/libraries/nanostack-libservice/test/libService/unittest/MakefileWorker.mk old mode 100755 new mode 100644 diff --git a/tools/toolchains/mbed_toolchain.py b/tools/toolchains/mbed_toolchain.py index 47b156620a..47668b5f20 100755 --- a/tools/toolchains/mbed_toolchain.py +++ b/tools/toolchains/mbed_toolchain.py @@ -778,15 +778,14 @@ class mbedToolchain(with_metaclass(ABCMeta, object)): self.link(elf, objects, libraries, lib_dirs, linker_script) if self.config.has_regions: - stem = join(new_path, "{}_application".format(tail)) + filename = "{}_application.{}".format(tail, ext) else: - stem = join(new_path, tail) - full_path = "{}.{}".format(stem, ext) + filename = "{}.{}".format(tail, ext) + full_path = join(new_path, filename) if ext != 'elf': if full_path and self.need_update(full_path, [elf]): self.progress("elf2bin", tail) - self.binary(r, elf, "{}.{}".format(stem, 'bin')) - self.binary(r, elf, "{}.{}".format(stem, 'hex')) + self.binary(r, elf, full_path) if self.config.has_regions: full_path, updatable = self._do_region_merge( tail, full_path, ext