summaryrefslogtreecommitdiffstatshomepage
path: root/zephyr
diff options
context:
space:
mode:
authorPaul Sokolovsky <pfalcon@users.sourceforge.net>2016-11-04 19:42:43 +0300
committerPaul Sokolovsky <pfalcon@users.sourceforge.net>2016-11-04 19:42:43 +0300
commitf59465d76367f556ce15a21482abc702a78d01e2 (patch)
treef585e8ebf94aaf85d9cd841d8e7fbde106cd68c7 /zephyr
parent919fc2dc478b53333d44358190ad99be0b8c54b3 (diff)
downloadmicropython-f59465d76367f556ce15a21482abc702a78d01e2.tar.gz
micropython-f59465d76367f556ce15a21482abc702a78d01e2.zip
zephyr/Makefile: Allow to override Zephyr config from make command line.
Diffstat (limited to 'zephyr')
-rw-r--r--zephyr/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/zephyr/Makefile b/zephyr/Makefile
index b4dd902bdb..c832490a82 100644
--- a/zephyr/Makefile
+++ b/zephyr/Makefile
@@ -7,6 +7,7 @@
#
BOARD ?= qemu_x86
+CONF_FILE = prj.conf
# Zephyr 1.5.0
#OUTDIR_PREFIX =
# Zephyr 1.6.0
@@ -58,7 +59,7 @@ CFLAGS = $(KBUILD_CFLAGS) $(NOSTDINC_FLAGS) $(ZEPHYRINCLUDE) \
include ../py/mkrules.mk
$(Z_EXPORTS):
- $(MAKE) -f Makefile.zephyr BOARD=$(BOARD) initconfig outputexports
+ $(MAKE) -f Makefile.zephyr BOARD=$(BOARD) CONF_FILE=$(CONF_FILE) initconfig outputexports
GENERIC_TARGETS = all zephyr qemu qemugdb flash debug
KCONFIG_TARGETS = \
@@ -73,14 +74,14 @@ $(CLEAN_TARGETS): clean
$(GENERIC_TARGETS) $(KCONFIG_TARGETS) $(CLEAN_TARGETS):
$(RM) -f outdir/$(OUTDIR_PREFIX)/zephyr.lnk
- $(MAKE) -f Makefile.zephyr BOARD=$(BOARD) $@
+ $(MAKE) -f Makefile.zephyr BOARD=$(BOARD) CONF_FILE=$(CONF_FILE) $@
$(LIBMICROPYTHON): $(Z_SYSGEN_H)
build/genhdr/qstr.i.last: $(Z_SYSGEN_H)
$(Z_SYSGEN_H):
rm -f $(LIBMICROPYTHON)
- -$(MAKE) -f Makefile.zephyr BOARD=$(BOARD)
+ -$(MAKE) -f Makefile.zephyr BOARD=$(BOARD) CONF_FILE=$(CONF_FILE)
# Clean Zephyr things too
clean: z_clean