patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

scripts: mergehex: Add --overlap argument

Browse source 
Allows specifying the 'overlap' argument in IntelHex::merge().
This is identical to the --overlap argument in hexmerge.py, which
is bundled with IntelHex.

Signed-off-by: Øyvind Rønningstad <oyvind.ronningstad@nordicsemi.no>
This commit is contained in:
Øyvind Rønningstad 2019-05-15 10:33:09 +02:00 committed by Kumar Gala
parent 61fb6b468d
commit 79d2e31cff
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scripts/mergehex.py
View file

@ -13,7 +13,7 @@ from intelhex import AddressOverlapError
import argparse
def merge_hex_files(output, input_hex_files):
def merge_hex_files(output, input_hex_files, overlap):
ih = IntelHex()
for hex_file_path in input_hex_files:
@ -25,7 +25,7 @@ def merge_hex_files(output, input_hex_files):
to_merge.start_addr = None
try:
ih.merge(to_merge)
ih.merge(to_merge, overlap=overlap)
except AddressOverlapError:
raise AddressOverlapError("{} has merge issues".format(hex_file_path))
@ -41,6 +41,9 @@ def parse_args():
parser.add_argument("-o", "--output", required=False, default="merged.hex",
type=argparse.FileType('w', encoding='UTF-8'),
help="Output file name.")
parser.add_argument("--overlap", default="error",
help="What to do when files overlap (error, ignore, replace). "
"See IntelHex.merge() for more info.")
parser.add_argument("input_files", nargs='*')
return parser.parse_args()
@ -48,7 +51,7 @@ def parse_args():
def main():
args = parse_args()
merge_hex_files(args.output, args.input_files)
merge_hex_files(args.output, args.input_files, args.overlap)
if __name__ == "__main__":