From 1df1642b706eb6d39f93936e70df22cbdfb0ec36 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky
Date: Fri, 27 Jan 2017 23:42:11 +0300
Subject: zephyr: Allow to have per-board Zephyr config fragments.

To enable options which may be incompatible with other boards, etc.
---
 zephyr/Makefile          |  7 ++++++-
 zephyr/prj.conf          | 19 -------------------
 zephyr/prj_base.conf     | 12 ++++++++++++
 zephyr/prj_qemu_x86.conf |  6 ++++++
 4 files changed, 24 insertions(+), 20 deletions(-)
 delete mode 100644 zephyr/prj.conf
 create mode 100644 zephyr/prj_base.conf
 create mode 100644 zephyr/prj_qemu_x86.conf

diff --git a/zephyr/Makefile b/zephyr/Makefile
index 7f35eefb5..4c28e4da8 100644
--- a/zephyr/Makefile
+++ b/zephyr/Makefile
@@ -62,7 +62,7 @@ CFLAGS = $(KBUILD_CFLAGS) $(NOSTDINC_FLAGS) $(ZEPHYRINCLUDE) \
 
 include ../py/mkrules.mk
 
-$(Z_EXPORTS):
+$(Z_EXPORTS): $(CONF_FILE)
 	$(MAKE) -f Makefile.zephyr BOARD=$(BOARD) CONF_FILE=$(CONF_FILE) initconfig outputexports
 
 GENERIC_TARGETS = all zephyr qemu qemugdb flash debug
@@ -95,3 +95,8 @@ clean: z_clean
 
 z_clean:
 	$(MAKE) -f Makefile.zephyr BOARD=$(BOARD) clean
+
+.PHONY: prj.conf
+prj.conf: prj_base.conf
+	cat $< >$@
+	if [ -f prj_$(BOARD).conf ]; then cat prj_$(BOARD).conf >>$@; fi
diff --git a/zephyr/prj.conf b/zephyr/prj.conf
deleted file mode 100644
index a2fcb64d9..000000000
--- a/zephyr/prj.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-CONFIG_STDOUT_CONSOLE=y
-CONFIG_CONSOLE_HANDLER=y
-CONFIG_UART_CONSOLE_DEBUG_SERVER_HOOKS=y
-CONFIG_NEWLIB_LIBC=y
-CONFIG_FLOAT=y
-CONFIG_MAIN_STACK_SIZE=4096
-
-# Networking config
-CONFIG_NETWORKING=y
-CONFIG_NET_IPV4=y
-CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_NET_NBUF_RX_COUNT=4
-
-# Networking drivers
-# SLIP driver for QEMU
-CONFIG_NET_SLIP_TAP=y
-
-# BOARD-specific config (qemu_x86)
-CONFIG_RAM_SIZE=256
diff --git a/zephyr/prj_base.conf b/zephyr/prj_base.conf
new file mode 100644
index 000000000..43aedd8fe
--- /dev/null
+++ b/zephyr/prj_base.conf
@@ -0,0 +1,12 @@
+CONFIG_STDOUT_CONSOLE=y
+CONFIG_CONSOLE_HANDLER=y
+CONFIG_UART_CONSOLE_DEBUG_SERVER_HOOKS=y
+CONFIG_NEWLIB_LIBC=y
+CONFIG_FLOAT=y
+CONFIG_MAIN_STACK_SIZE=4096
+
+# Networking config
+CONFIG_NETWORKING=y
+CONFIG_NET_IPV4=y
+CONFIG_TEST_RANDOM_GENERATOR=y
+CONFIG_NET_NBUF_RX_COUNT=4
diff --git a/zephyr/prj_qemu_x86.conf b/zephyr/prj_qemu_x86.conf
new file mode 100644
index 000000000..cb90834ac
--- /dev/null
+++ b/zephyr/prj_qemu_x86.conf
@@ -0,0 +1,6 @@
+# Networking drivers
+# SLIP driver for QEMU
+CONFIG_NET_SLIP_TAP=y
+
+# Default RAM easily overflows with uPy and networking
+CONFIG_RAM_SIZE=256
-- 
cgit v1.2.3