From bfa68ef6b23a2bca9d4a713ea436d76c62633078 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Sun, 9 Jul 2017 11:50:21 +0300
Subject: [PATCH] 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.
---
 zephyr/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/zephyr/Makefile b/zephyr/Makefile
index 32ccd6f1d..c1337adf0 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:
-- 
GitLab