scripts: mergehex: Add --overlap argument
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>
diff --git a/scripts/mergehex.py b/scripts/mergehex.py
index bf23cb2..8dcc7d9 100644
--- a/scripts/mergehex.py
+++ b/scripts/mergehex.py
@@ -13,7 +13,7 @@
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 @@
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 @@
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 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__":
