Merge pull request #7263 from theotherjimmy/nrf51-postbuild-fix

NRF51 Post-build: Allow Hex BL, SD, APP

Author: Cruz Monrreal

tools/targets/__init__.py

@@ -513,11 +513,13 @@ def binary_hook(t_self, resources, _, binf):
             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: