djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zephyr/Makefile: Revert prj.conf construction rule to the previous state.

Browse Source 
CONF_FILE can be overriden, e.g. for minimal build, and we don't construct
such overriden conf file like we do for prj_merged.conf.
This commit is contained in:
Paul Sokolovsky 2017-07-09 11:50:21 +03:00
parent 0291a624cb
commit bfa68ef6b2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zephyr/Makefile
View File

@ -93,7 +93,9 @@ CLEAN_EXTRA = outdir
z_clean:
$(MAKE) -f Makefile.zephyr BOARD=$(BOARD) clean
$(CONF_FILE): prj_base.conf prj_$(BOARD).conf
# This rule is for prj_$(BOARD)_merged.conf, not $(CONF_FILE), which
# can be overriden
prj_$(BOARD)_merged.conf: prj_base.conf prj_$(BOARD).conf
$(PYTHON) makeprj.py prj_base.conf prj_$(BOARD).conf $@
test: