From 40e72e4a5cc59fa005259b9e85393a13a32c0a12 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Fri, 27 Jan 2017 21:28:03 +0300
Subject: [PATCH] zephyr: Make sure that correct Zephyr config is used for
 "minimal" build.

Overriding CONF_FILE in "minimal" target itself is too late due to include-
pinned $(Z_EXPORTS) target.
---
 zephyr/Makefile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/zephyr/Makefile b/zephyr/Makefile
index ae707ff75..7f35eefb5 100644
--- a/zephyr/Makefile
+++ b/zephyr/Makefile
@@ -7,7 +7,12 @@
 #
 
 BOARD ?= qemu_x86
+ifeq ($(MAKECMDGOALS), minimal)
+# For minimal, CONF_FILE must be overriden early due to $(Z_EXPORTS) target
+CONF_FILE = prj_minimal.conf
+else
 CONF_FILE = prj.conf
+endif
 # Zephyr 1.5.0
 #OUTDIR_PREFIX =
 # Zephyr 1.6.0
-- 
GitLab