Move hex file merging to common makefile

Author: theotherjimmy

tools/export/gcc_arm_arch_ble.tmpl

@@ -49,6 +49,9 @@ LD      = $(GCC_BIN)arm-none-eabi-gcc
 OBJCOPY = $(GCC_BIN)arm-none-eabi-objcopy
 OBJDUMP = $(GCC_BIN)arm-none-eabi-objdump
 SIZE    = $(GCC_BIN)arm-none-eabi-size
+{% if hex_files %}
+SREC_CAT = srec_cat
+{% endif %}
 {%- block additional_executables -%}{% endblock %}
 
 {%- block flags -%}
@@ -82,9 +85,11 @@ endif
 
 .PHONY: all lst size
 
-{% block target_all -%}
+{% if hex_files -%}
+all: $(PROJECT).bin $(PROJECT)-combined.hex size
+{% else %}
 all: $(PROJECT).bin $(PROJECT).hex size
-{% endblock %}
+{% endif %}
 
 
 .asm.o:
@@ -128,6 +133,9 @@ size: $(PROJECT).elf
 DEPS = $(OBJECTS:.o=.d) $(SYS_OBJECTS:.o=.d)
 -include $(DEPS)
 
-{% block additional_targets %}{% endblock %}
+{% if hex_files %}
+$(PROJECT)-combined.hex: $(PROJECT).hex
+	$(SREC_CAT) {% for f in hex_files %}{{f}} {% endfor %} -intel $(PROJECT).hex -intel -o $(PROJECT)-combined.hex -intel --line-length=44
+{% endif %}
 endif