Added to the Makefiles the ability to change the default build, dependencies and configuration directories.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10350 35acf78f-673a-0410-8e92-d51de3d6d3f4

11 files changed, 77 insertions, 11 deletions

diff --git a/os/hal/hal.mk b/os/hal/hal.mk
index 905dbfd5d..9691e4b23 100644
--- a/os/hal/hal.mk
+++ b/os/hal/hal.mk
@@ -1,7 +1,13 @@
 # List of all the ChibiOS/HAL files, there is no need to remove the files

 # from this list, you can disable parts of the HAL by editing halconf.h.

 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"))

 

 HALSRC := $(CHIBIOS)/os/hal/src/hal.c \

           $(CHIBIOS)/os/hal/src/hal_st.c \

diff --git a/os/hal/ports/STM32/STM32F0xx/platform.mk b/os/hal/ports/STM32/STM32F0xx/platform.mk
index 0af154124..91b3e1bb7 100644
--- a/os/hal/ports/STM32/STM32F0xx/platform.mk
+++ b/os/hal/ports/STM32/STM32F0xx/platform.mk
@@ -8,7 +8,13 @@ PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
 

 # Optional platform files.

 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"))

 

 ifneq ($(findstring HAL_USE_EXT TRUE,$(HALCONF)),)

 PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/hal_ext_lld_isr.c

diff --git a/os/hal/ports/STM32/STM32F1xx/platform.mk b/os/hal/ports/STM32/STM32F1xx/platform.mk
index 216724585..b115aafc3 100644
--- a/os/hal/ports/STM32/STM32F1xx/platform.mk
+++ b/os/hal/ports/STM32/STM32F1xx/platform.mk
@@ -8,7 +8,13 @@ PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
 

 # Optional platform files.

 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"))

 

 ifneq ($(findstring HAL_USE_EXT TRUE,$(HALCONF)),)

 PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/hal_ext_lld_isr.c

diff --git a/os/hal/ports/STM32/STM32F1xx/platform_f105_f107.mk b/os/hal/ports/STM32/STM32F1xx/platform_f105_f107.mk
index 8c4eb980e..719457e83 100644
--- a/os/hal/ports/STM32/STM32F1xx/platform_f105_f107.mk
+++ b/os/hal/ports/STM32/STM32F1xx/platform_f105_f107.mk
@@ -8,7 +8,13 @@ PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
 

 # Optional platform files.

 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"))

 

 ifneq ($(findstring HAL_USE_EXT TRUE,$(HALCONF)),)

 PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/hal_ext_lld_isr.c

diff --git a/os/hal/ports/STM32/STM32F37x/platform.mk b/os/hal/ports/STM32/STM32F37x/platform.mk
index 09e487f22..9dbccae60 100644
--- a/os/hal/ports/STM32/STM32F37x/platform.mk
+++ b/os/hal/ports/STM32/STM32F37x/platform.mk
@@ -8,7 +8,13 @@ PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
 

 # Optional platform files.

 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"))

 

 ifneq ($(findstring HAL_USE_ADC TRUE,$(HALCONF)),)

 PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/hal_adc_lld.c

diff --git a/os/hal/ports/STM32/STM32F3xx/platform.mk b/os/hal/ports/STM32/STM32F3xx/platform.mk
index 61094702e..0109b5a5c 100644
--- a/os/hal/ports/STM32/STM32F3xx/platform.mk
+++ b/os/hal/ports/STM32/STM32F3xx/platform.mk
@@ -8,7 +8,13 @@ PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
 

 # Optional platform files.

 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"))

 

 ifneq ($(findstring HAL_USE_EXT TRUE,$(HALCONF)),)

 PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/STM32F3xx/hal_ext_lld_isr.c

diff --git a/os/hal/ports/STM32/STM32F4xx/platform.mk b/os/hal/ports/STM32/STM32F4xx/platform.mk
index 0844fb78f..811249c6d 100644
--- a/os/hal/ports/STM32/STM32F4xx/platform.mk
+++ b/os/hal/ports/STM32/STM32F4xx/platform.mk
@@ -8,7 +8,13 @@ PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
 

 # Optional platform files.

 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"))

 

 ifneq ($(findstring HAL_USE_EXT TRUE,$(HALCONF)),)

 PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/hal_ext_lld_isr.c

diff --git a/os/hal/ports/STM32/STM32F7xx/platform.mk b/os/hal/ports/STM32/STM32F7xx/platform.mk
index 5c6d14a23..c1cffcbbf 100644
--- a/os/hal/ports/STM32/STM32F7xx/platform.mk
+++ b/os/hal/ports/STM32/STM32F7xx/platform.mk
@@ -8,7 +8,13 @@ PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
 

 # Optional platform files.

 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"))

 

 ifneq ($(findstring HAL_USE_EXT TRUE,$(HALCONF)),)

 PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/STM32F7xx/hal_ext_lld_isr.c

diff --git a/os/hal/ports/STM32/STM32L0xx/platform.mk b/os/hal/ports/STM32/STM32L0xx/platform.mk
index 978aae073..3cbacdd85 100644
--- a/os/hal/ports/STM32/STM32L0xx/platform.mk
+++ b/os/hal/ports/STM32/STM32L0xx/platform.mk
@@ -8,7 +8,13 @@ PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
 

 # Optional platform files.

 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"))

 

 ifneq ($(findstring HAL_USE_EXT TRUE,$(HALCONF)),)

 PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/STM32L0xx/hal_ext_lld_isr.c

diff --git a/os/hal/ports/STM32/STM32L1xx/platform.mk b/os/hal/ports/STM32/STM32L1xx/platform.mk
index e2c2344af..23c6bbaae 100644
--- a/os/hal/ports/STM32/STM32L1xx/platform.mk
+++ b/os/hal/ports/STM32/STM32L1xx/platform.mk
@@ -8,7 +8,13 @@ PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
 

 # Optional platform files.

 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"))

 

 ifneq ($(findstring HAL_USE_EXT TRUE,$(HALCONF)),)

 PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/hal_ext_lld_isr.c

diff --git a/os/hal/ports/STM32/STM32L4xx/platform.mk b/os/hal/ports/STM32/STM32L4xx/platform.mk
index 824e97eb0..32733f96b 100644
--- a/os/hal/ports/STM32/STM32L4xx/platform.mk
+++ b/os/hal/ports/STM32/STM32L4xx/platform.mk
@@ -8,7 +8,13 @@ PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
 

 # Optional platform files.

 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"))

 

 ifneq ($(findstring HAL_USE_EXT TRUE,$(HALCONF)),)

 PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/STM32L4xx/hal_ext_lld_isr.c