aboutsummaryrefslogtreecommitdiffstats
path: root/os/nil
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2019-01-05 15:49:50 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2019-01-05 15:49:50 +0000
commitb470e1ae0feb1d173465f8083248ad4324755592 (patch)
tree89eeb538bf0871730aa890c37b042988f7929654 /os/nil
parent90ddeb9ef88675bfd5cc84be3c2ee215f9404720 (diff)
downloadChibiOS-b470e1ae0feb1d173465f8083248ad4324755592.tar.gz
ChibiOS-b470e1ae0feb1d173465f8083248ad4324755592.tar.bz2
ChibiOS-b470e1ae0feb1d173465f8083248ad4324755592.zip
Improved search of configuration files.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12529 110e8d01-0319-4d1e-a829-52ad28d1bb01
Diffstat (limited to 'os/nil')
-rw-r--r--os/nil/nil.mk13
1 files changed, 12 insertions, 1 deletions
diff --git a/os/nil/nil.mk b/os/nil/nil.mk
index 0d6350f56..fa08333ce 100644
--- a/os/nil/nil.mk
+++ b/os/nil/nil.mk
@@ -1,7 +1,18 @@
# List of all the ChibiOS/NIL kernel files, there is no need to remove the files
# from this list, you can disable parts of the kernel by editing chconf.h.
ifeq ($(USE_SMART_BUILD),yes)
-CHCONF := $(strip $(shell cat chconf.h | egrep -e "\#define"))
+
+# Configuration files directory
+ifeq ($(CHCONFDIR),)
+ ifeq ($(CONFDIR),)
+ CHCONFDIR = .
+ else
+ CHCONFDIR := $(CONFDIR)
+ endif
+endif
+
+CHCONF := $(strip $(shell cat $(CHCONFDIR)/chconf.h | egrep -e "\#define"))
+
KERNSRC := ${CHIBIOS}/os/nil/src/ch.c
else
KERNSRC := ${CHIBIOS}/os/nil/src/ch.c