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 #7263 from theotherjimmy/nrf51-postbuild-fix 

NRF51 Post-build: Allow Hex BL, SD, APP
pull/7271/head
Cruz Monrreal 2018-06-19 21:39:27 -05:00 committed by GitHub
parent ba5b5a3870 4e6b830c91
commit 1e37f9cdc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/targets/__init__.py
View File

@ -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: