diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2017-07-09 11:50:21 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2017-07-09 11:56:37 +0300 |
| commit | bfa68ef6b23a2bca9d4a713ea436d76c62633078 (patch) | |
| tree | f18638a5d01f1ac5b9e75f963c8cd325e229fd99 | |
| parent | 0291a624cbb0fc12633291b5b53285f7425dd3dc (diff) | |
| download | micropython-bfa68ef6b23a2bca9d4a713ea436d76c62633078.tar.gz micropython-bfa68ef6b23a2bca9d4a713ea436d76c62633078.zip | |
zephyr/Makefile: Revert prj.conf construction rule to the previous state.
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.
| -rw-r--r-- | zephyr/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/zephyr/Makefile b/zephyr/Makefile index 32ccd6f1de..c1337adf0e 100644 --- a/zephyr/Makefile +++ b/zephyr/Makefile @@ -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: |