Anders Blomdell / mbed-sdk-tools
Committer:
The Other Jimmy
Date:
Mon Feb 13 09:29:13 2017 -0600
Revision:
34:42f20e28adf5
Parent:
0:66f3b5499f7f
Fix ignoring real targets.json

Who changed what in which revision?

UserRevisionLine numberNew contents of line
screamer 0:66f3b5499f7f 1 {% extends "gcc_arm_common.tmpl" %}
screamer 0:66f3b5499f7f 2
screamer 0:66f3b5499f7f 3 {% block additional_variables %}
screamer 0:66f3b5499f7f 4 SOFTDEVICE = mbed/TARGET_ARCH_BLE/TARGET_NORDIC/TARGET_MCU_NRF51822/Lib/s110_nrf51822_7_1_0/s110_nrf51822_7.1.0_softdevice.hex
screamer 0:66f3b5499f7f 5 {% endblock %}
screamer 0:66f3b5499f7f 6
screamer 0:66f3b5499f7f 7 {% block additional_executables %}
screamer 0:66f3b5499f7f 8 SREC_CAT = srec_cat
screamer 0:66f3b5499f7f 9 {% endblock %}
screamer 0:66f3b5499f7f 10
screamer 0:66f3b5499f7f 11 {% block additional_targets %}
screamer 0:66f3b5499f7f 12 merge:
screamer 0:66f3b5499f7f 13 $(SREC_CAT) $(SOFTDEVICE) -intel $(PROJECT).hex -intel -o combined.hex -intel --line-length=44
screamer 0:66f3b5499f7f 14 {% endblock %}