From 4e6b830c9197d0fde5df58db9ea20aa066d94193 Mon Sep 17 00:00:00 2001 From: Jimmy Brisson Date: Tue, 19 Jun 2018 09:27:09 -0500 Subject: [PATCH] Allow hex BL, SD and application merging --- tools/targets/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/targets/__init__.py b/tools/targets/__init__.py index fcc4a66353..9155872b78 100644 --- a/tools/targets/__init__.py +++ b/tools/targets/__init__.py @@ -513,11 +513,13 @@ class MCU_NRF51Code(object): t_self.notify.debug("Merge SoftDevice file %s" % softdevice_and_offset_entry['name']) sdh = IntelHex(sdf) + sdh.start_addr = None binh.merge(sdh) if t_self.target.MERGE_BOOTLOADER is True and blf is not None: t_self.notify.debug("Merge BootLoader file %s" % blf) blh = IntelHex(blf) + blh.start_addr = None binh.merge(blh) with open(binf.replace(".bin", ".hex"), "w") as fileout: