Add the merge goal to the list dependent goals of all.

Fix import of the softdevice hex file.

Author: pan-

tools/export/gcc_arm_nrf51_dk.tmpl

@@ -1,7 +1,11 @@
 {% extends "gcc_arm_common.tmpl" %}
 
+{% block target_all %}
+all: $(PROJECT).bin $(PROJECT).hex size merge
+{% endblock %}
+
 {% block additional_variables %}
-SOFTDEVICE = mbed/TARGET_NRF51_DK/TARGET_NORDIC/TARGET_MCU_NRF51822/Lib/s110_nrf51822_7_1_0/s110_nrf51822_7.1.0_softdevice.hex
+SOFTDEVICE = {% for f in hex_files %}{{f}} {% endfor %}
 {% endblock %}
 
 {% block additional_executables %}