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 #9781 from vmedcy/psoc6-hex-align 

PSOC6: correctly align hex files with split text sections
pull/9842/head
Cruz Monrreal 2019-02-25 17:29:14 -06:00 committed by GitHub
parent d0881ad259 534becb175
commit 4532e41212
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/targets/PSOC6.py
View File

@ -96,7 +96,7 @@ def patch(message_func, ihex, hexf, align=256):
aligned_end += align
message_func("Aligning end from 0x%x to 0x%x" % (end, aligned_end))
alignments.frombytes(ihex.tobinarray(end, aligned_end - 1), end)
ihex.merge(alignments)
ihex.merge(alignments, 'ignore')
def merge_images(hexf0, hexf1=None):
ihex = IntelHex()