Commit f59465d7 authored by Paul Sokolovsky's avatar Paul Sokolovsky
Browse files

zephyr/Makefile: Allow to override Zephyr config from make command line.

parent 919fc2dc
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
# #
BOARD ?= qemu_x86 BOARD ?= qemu_x86
CONF_FILE = prj.conf
# Zephyr 1.5.0 # Zephyr 1.5.0
#OUTDIR_PREFIX = #OUTDIR_PREFIX =
# Zephyr 1.6.0 # Zephyr 1.6.0
...@@ -58,7 +59,7 @@ CFLAGS = $(KBUILD_CFLAGS) $(NOSTDINC_FLAGS) $(ZEPHYRINCLUDE) \ ...@@ -58,7 +59,7 @@ CFLAGS = $(KBUILD_CFLAGS) $(NOSTDINC_FLAGS) $(ZEPHYRINCLUDE) \
include ../py/mkrules.mk include ../py/mkrules.mk
$(Z_EXPORTS): $(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 GENERIC_TARGETS = all zephyr qemu qemugdb flash debug
KCONFIG_TARGETS = \ KCONFIG_TARGETS = \
...@@ -73,14 +74,14 @@ $(CLEAN_TARGETS): clean ...@@ -73,14 +74,14 @@ $(CLEAN_TARGETS): clean
$(GENERIC_TARGETS) $(KCONFIG_TARGETS) $(CLEAN_TARGETS): $(GENERIC_TARGETS) $(KCONFIG_TARGETS) $(CLEAN_TARGETS):
$(RM) -f outdir/$(OUTDIR_PREFIX)/zephyr.lnk $(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) $(LIBMICROPYTHON): $(Z_SYSGEN_H)
build/genhdr/qstr.i.last: $(Z_SYSGEN_H) build/genhdr/qstr.i.last: $(Z_SYSGEN_H)
$(Z_SYSGEN_H): $(Z_SYSGEN_H):
rm -f $(LIBMICROPYTHON) rm -f $(LIBMICROPYTHON)
-$(MAKE) -f Makefile.zephyr BOARD=$(BOARD) -$(MAKE) -f Makefile.zephyr BOARD=$(BOARD) CONF_FILE=$(CONF_FILE)
# Clean Zephyr things too # Clean Zephyr things too
clean: z_clean clean: z_clean
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment