ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix goals for NRF51_DK makefile: 

Now "all" depend on the project merged with the soft device,
the goal merged has been renamed into the file it generate and now depend
on the realization of $(PROJECT).hex
pull/2345/head
Vincent Coubard 2016-08-02 22:55:15 +01:00
parent 0320f3b89e
commit 80f296202c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/export/gcc_arm_nrf51_dk.tmpl
View File

@ -1,7 +1,7 @@
{% extends "gcc_arm_common.tmpl" %} {% extends "gcc_arm_common.tmpl" %}
{% block target_all %} {% block target_all %}
all: $(PROJECT).bin $(PROJECT).hex size merge all: $(PROJECT).bin $(PROJECT)-combined.hex size
{% endblock %} {% endblock %}
{% block additional_variables %} {% block additional_variables %}
@ -13,6 +13,6 @@ SREC_CAT = srec_cat
{% endblock %} {% endblock %}
{% block additional_targets %} {% block additional_targets %}
merge: $(PROJECT)-combined.hex: $(PROJECT).hex
$(SREC_CAT) $(SOFTDEVICE) -intel $(PROJECT).hex -intel -o $(PROJECT)-combined.hex -intel --line-length=44 $(SREC_CAT) $(SOFTDEVICE) -intel $(PROJECT).hex -intel -o $(PROJECT)-combined.hex -intel --line-length=44
{% endblock %} {% endblock %}