aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal/ports/TIVA/TM4C123x
diff options
context:
space:
mode:
authorFabien Poussin <fabien.poussin@gmail.com>2018-03-08 21:42:35 +0100
committerGitHub <noreply@github.com>2018-03-08 21:42:35 +0100
commitaa8c6cc4af857cdb3e7f4813cf7a22ebf5333818 (patch)
treec1650b3940dab317bbd3bb4af8b3937a09385d5b /os/hal/ports/TIVA/TM4C123x
parentf113e893549d0086e53cb1bb52c7c2beda769e30 (diff)
parentbe0446c54977d2012079358e23a56b428614ac08 (diff)
downloadChibiOS-Contrib-aa8c6cc4af857cdb3e7f4813cf7a22ebf5333818.tar.gz
ChibiOS-Contrib-aa8c6cc4af857cdb3e7f4813cf7a22ebf5333818.tar.bz2
ChibiOS-Contrib-aa8c6cc4af857cdb3e7f4813cf7a22ebf5333818.zip
Merge pull request #145 from marcoveeneman/tiva_improvements
Various Tiva improvements
Diffstat (limited to 'os/hal/ports/TIVA/TM4C123x')
-rw-r--r--os/hal/ports/TIVA/TM4C123x/platform.mk9
1 files changed, 8 insertions, 1 deletions
diff --git a/os/hal/ports/TIVA/TM4C123x/platform.mk b/os/hal/ports/TIVA/TM4C123x/platform.mk
index de482d0..8372c25 100644
--- a/os/hal/ports/TIVA/TM4C123x/platform.mk
+++ b/os/hal/ports/TIVA/TM4C123x/platform.mk
@@ -7,7 +7,14 @@ PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/TM4C123x
ifeq ($(USE_SMART_BUILD),yes)
-HALCONF := $(strip $(shell cat halconf.h | egrep -e "\#define"))
+
+# Configuration files directory
+ifeq ($(CONFDIR),)
+ CONFDIR = .
+endif
+
+HALCONF := $(strip $(shell cat $(CONFDIR)/halconf.h | egrep -e "\#define"))
+else
endif
# Drivers compatible with the platform.