mirror of https://github.com/rusefi/ChibiOS.git
Improved search of configuration files.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12529 110e8d01-0319-4d1e-a829-52ad28d1bb01
This commit is contained in:
parent
90ddeb9ef8
commit
b470e1ae0f
|
@ -3,11 +3,15 @@
|
||||||
ifeq ($(USE_SMART_BUILD),yes)
|
ifeq ($(USE_SMART_BUILD),yes)
|
||||||
|
|
||||||
# Configuration files directory
|
# Configuration files directory
|
||||||
ifeq ($(CONFDIR),)
|
ifeq ($(HALCONFDIR),)
|
||||||
CONFDIR = .
|
ifeq ($(CONFDIR),)
|
||||||
|
HALCONFDIR = .
|
||||||
|
else
|
||||||
|
HALCONFDIR := $(CONFDIR)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
HALCONF := $(strip $(shell cat $(CONFDIR)/halconf.h | egrep -e "\#define"))
|
HALCONF := $(strip $(shell cat $(HALCONFDIR)/halconf.h | egrep -e "\#define"))
|
||||||
|
|
||||||
HALSRC := $(CHIBIOS)/os/hal/src/hal.c \
|
HALSRC := $(CHIBIOS)/os/hal/src/hal.c \
|
||||||
$(CHIBIOS)/os/hal/src/hal_st.c \
|
$(CHIBIOS)/os/hal/src/hal_st.c \
|
||||||
|
|
|
@ -11,11 +11,15 @@ PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
|
||||||
ifeq ($(USE_SMART_BUILD),yes)
|
ifeq ($(USE_SMART_BUILD),yes)
|
||||||
|
|
||||||
# Configuration files directory
|
# Configuration files directory
|
||||||
ifeq ($(CONFDIR),)
|
ifeq ($(HALCONFDIR),)
|
||||||
CONFDIR = .
|
ifeq ($(CONFDIR),)
|
||||||
|
HALCONFDIR = .
|
||||||
|
else
|
||||||
|
HALCONFDIR := $(CONFDIR)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
HALCONF := $(strip $(shell cat $(CONFDIR)/halconf.h | egrep -e "\#define"))
|
HALCONF := $(strip $(shell cat $(HALCONFDIR)/halconf.h | egrep -e "\#define"))
|
||||||
|
|
||||||
else
|
else
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -11,11 +11,15 @@ PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
|
||||||
ifeq ($(USE_SMART_BUILD),yes)
|
ifeq ($(USE_SMART_BUILD),yes)
|
||||||
|
|
||||||
# Configuration files directory
|
# Configuration files directory
|
||||||
ifeq ($(CONFDIR),)
|
ifeq ($(HALCONFDIR),)
|
||||||
CONFDIR = .
|
ifeq ($(CONFDIR),)
|
||||||
|
HALCONFDIR = .
|
||||||
|
else
|
||||||
|
HALCONFDIR := $(CONFDIR)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
HALCONF := $(strip $(shell cat $(CONFDIR)/halconf.h | egrep -e "\#define"))
|
HALCONF := $(strip $(shell cat $(HALCONFDIR)/halconf.h | egrep -e "\#define"))
|
||||||
|
|
||||||
ifneq ($(findstring HAL_USE_ADC TRUE,$(HALCONF)),)
|
ifneq ($(findstring HAL_USE_ADC TRUE,$(HALCONF)),)
|
||||||
PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/hal_adc_lld.c
|
PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/hal_adc_lld.c
|
||||||
|
|
|
@ -11,11 +11,15 @@ PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
|
||||||
ifeq ($(USE_SMART_BUILD),yes)
|
ifeq ($(USE_SMART_BUILD),yes)
|
||||||
|
|
||||||
# Configuration files directory
|
# Configuration files directory
|
||||||
ifeq ($(CONFDIR),)
|
ifeq ($(HALCONFDIR),)
|
||||||
CONFDIR = .
|
ifeq ($(CONFDIR),)
|
||||||
|
HALCONFDIR = .
|
||||||
|
else
|
||||||
|
HALCONFDIR := $(CONFDIR)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
HALCONF := $(strip $(shell cat $(CONFDIR)/halconf.h | egrep -e "\#define"))
|
HALCONF := $(strip $(shell cat $(HALCONFDIR)/halconf.h | egrep -e "\#define"))
|
||||||
|
|
||||||
ifneq ($(findstring HAL_USE_ADC TRUE,$(HALCONF)),)
|
ifneq ($(findstring HAL_USE_ADC TRUE,$(HALCONF)),)
|
||||||
PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/hal_adc_lld.c
|
PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/hal_adc_lld.c
|
||||||
|
|
|
@ -11,11 +11,15 @@ PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
|
||||||
ifeq ($(USE_SMART_BUILD),yes)
|
ifeq ($(USE_SMART_BUILD),yes)
|
||||||
|
|
||||||
# Configuration files directory
|
# Configuration files directory
|
||||||
ifeq ($(CONFDIR),)
|
ifeq ($(HALCONFDIR),)
|
||||||
CONFDIR = .
|
ifeq ($(CONFDIR),)
|
||||||
|
HALCONFDIR = .
|
||||||
|
else
|
||||||
|
HALCONFDIR := $(CONFDIR)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
HALCONF := $(strip $(shell cat $(CONFDIR)/halconf.h | egrep -e "\#define"))
|
HALCONF := $(strip $(shell cat $(HALCONFDIR)/halconf.h | egrep -e "\#define"))
|
||||||
|
|
||||||
ifneq ($(findstring HAL_USE_ADC TRUE,$(HALCONF)),)
|
ifneq ($(findstring HAL_USE_ADC TRUE,$(HALCONF)),)
|
||||||
PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/hal_adc_lld.c
|
PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/STM32F37x/hal_adc_lld.c
|
||||||
|
|
|
@ -11,11 +11,15 @@ PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
|
||||||
ifeq ($(USE_SMART_BUILD),yes)
|
ifeq ($(USE_SMART_BUILD),yes)
|
||||||
|
|
||||||
# Configuration files directory
|
# Configuration files directory
|
||||||
ifeq ($(CONFDIR),)
|
ifeq ($(HALCONFDIR),)
|
||||||
CONFDIR = .
|
ifeq ($(CONFDIR),)
|
||||||
|
HALCONFDIR = .
|
||||||
|
else
|
||||||
|
HALCONFDIR := $(CONFDIR)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
HALCONF := $(strip $(shell cat $(CONFDIR)/halconf.h | egrep -e "\#define"))
|
HALCONF := $(strip $(shell cat $(HALCONFDIR)/halconf.h | egrep -e "\#define"))
|
||||||
|
|
||||||
else
|
else
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -11,11 +11,15 @@ PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
|
||||||
ifeq ($(USE_SMART_BUILD),yes)
|
ifeq ($(USE_SMART_BUILD),yes)
|
||||||
|
|
||||||
# Configuration files directory
|
# Configuration files directory
|
||||||
ifeq ($(CONFDIR),)
|
ifeq ($(HALCONFDIR),)
|
||||||
CONFDIR = .
|
ifeq ($(CONFDIR),)
|
||||||
|
HALCONFDIR = .
|
||||||
|
else
|
||||||
|
HALCONFDIR := $(CONFDIR)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
HALCONF := $(strip $(shell cat $(CONFDIR)/halconf.h | egrep -e "\#define"))
|
HALCONF := $(strip $(shell cat $(HALCONFDIR)/halconf.h | egrep -e "\#define"))
|
||||||
|
|
||||||
else
|
else
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -11,11 +11,15 @@ PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
|
||||||
ifeq ($(USE_SMART_BUILD),yes)
|
ifeq ($(USE_SMART_BUILD),yes)
|
||||||
|
|
||||||
# Configuration files directory
|
# Configuration files directory
|
||||||
ifeq ($(CONFDIR),)
|
ifeq ($(HALCONFDIR),)
|
||||||
CONFDIR = .
|
ifeq ($(CONFDIR),)
|
||||||
|
HALCONFDIR = .
|
||||||
|
else
|
||||||
|
HALCONFDIR := $(CONFDIR)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
HALCONF := $(strip $(shell cat $(CONFDIR)/halconf.h | egrep -e "\#define"))
|
HALCONF := $(strip $(shell cat $(HALCONFDIR)/halconf.h | egrep -e "\#define"))
|
||||||
|
|
||||||
else
|
else
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -11,11 +11,15 @@ PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
|
||||||
ifeq ($(USE_SMART_BUILD),yes)
|
ifeq ($(USE_SMART_BUILD),yes)
|
||||||
|
|
||||||
# Configuration files directory
|
# Configuration files directory
|
||||||
ifeq ($(CONFDIR),)
|
ifeq ($(HALCONFDIR),)
|
||||||
CONFDIR = .
|
ifeq ($(CONFDIR),)
|
||||||
|
HALCONFDIR = .
|
||||||
|
else
|
||||||
|
HALCONFDIR := $(CONFDIR)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
HALCONF := $(strip $(shell cat $(CONFDIR)/halconf.h | egrep -e "\#define"))
|
HALCONF := $(strip $(shell cat $(HALCONFDIR)/halconf.h | egrep -e "\#define"))
|
||||||
|
|
||||||
else
|
else
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -11,11 +11,15 @@ PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
|
||||||
ifeq ($(USE_SMART_BUILD),yes)
|
ifeq ($(USE_SMART_BUILD),yes)
|
||||||
|
|
||||||
# Configuration files directory
|
# Configuration files directory
|
||||||
ifeq ($(CONFDIR),)
|
ifeq ($(HALCONFDIR),)
|
||||||
CONFDIR = .
|
ifeq ($(CONFDIR),)
|
||||||
|
HALCONFDIR = .
|
||||||
|
else
|
||||||
|
HALCONFDIR := $(CONFDIR)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
HALCONF := $(strip $(shell cat $(CONFDIR)/halconf.h | egrep -e "\#define"))
|
HALCONF := $(strip $(shell cat $(HALCONFDIR)/halconf.h | egrep -e "\#define"))
|
||||||
|
|
||||||
else
|
else
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -11,11 +11,15 @@ PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
|
||||||
ifeq ($(USE_SMART_BUILD),yes)
|
ifeq ($(USE_SMART_BUILD),yes)
|
||||||
|
|
||||||
# Configuration files directory
|
# Configuration files directory
|
||||||
ifeq ($(CONFDIR),)
|
ifeq ($(HALCONFDIR),)
|
||||||
CONFDIR = .
|
ifeq ($(CONFDIR),)
|
||||||
|
HALCONFDIR = .
|
||||||
|
else
|
||||||
|
HALCONFDIR := $(CONFDIR)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
HALCONF := $(strip $(shell cat $(CONFDIR)/halconf.h | egrep -e "\#define"))
|
HALCONF := $(strip $(shell cat $(HALCONFDIR)/halconf.h | egrep -e "\#define"))
|
||||||
|
|
||||||
ifneq ($(findstring HAL_USE_ADC TRUE,$(HALCONF)),)
|
ifneq ($(findstring HAL_USE_ADC TRUE,$(HALCONF)),)
|
||||||
PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/hal_adc_lld.c
|
PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/STM32L1xx/hal_adc_lld.c
|
||||||
|
|
|
@ -11,11 +11,15 @@ PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
|
||||||
ifeq ($(USE_SMART_BUILD),yes)
|
ifeq ($(USE_SMART_BUILD),yes)
|
||||||
|
|
||||||
# Configuration files directory
|
# Configuration files directory
|
||||||
ifeq ($(CONFDIR),)
|
ifeq ($(HALCONFDIR),)
|
||||||
CONFDIR = .
|
ifeq ($(CONFDIR),)
|
||||||
|
HALCONFDIR = .
|
||||||
|
else
|
||||||
|
HALCONFDIR := $(CONFDIR)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
HALCONF := $(strip $(shell cat $(CONFDIR)/halconf.h | egrep -e "\#define"))
|
HALCONF := $(strip $(shell cat $(HALCONFDIR)/halconf.h | egrep -e "\#define"))
|
||||||
|
|
||||||
else
|
else
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -11,11 +11,15 @@ PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
|
||||||
ifeq ($(USE_SMART_BUILD),yes)
|
ifeq ($(USE_SMART_BUILD),yes)
|
||||||
|
|
||||||
# Configuration files directory
|
# Configuration files directory
|
||||||
ifeq ($(CONFDIR),)
|
ifeq ($(HALCONFDIR),)
|
||||||
CONFDIR = .
|
ifeq ($(CONFDIR),)
|
||||||
|
HALCONFDIR = .
|
||||||
|
else
|
||||||
|
HALCONFDIR := $(CONFDIR)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
HALCONF := $(strip $(shell cat $(CONFDIR)/halconf.h | egrep -e "\#define"))
|
HALCONF := $(strip $(shell cat $(HALCONFDIR)/halconf.h | egrep -e "\#define"))
|
||||||
|
|
||||||
else
|
else
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -11,11 +11,15 @@ PLATFORMINC := $(CHIBIOS)/os/hal/ports/common/ARMCMx \
|
||||||
ifeq ($(USE_SMART_BUILD),yes)
|
ifeq ($(USE_SMART_BUILD),yes)
|
||||||
|
|
||||||
# Configuration files directory
|
# Configuration files directory
|
||||||
ifeq ($(CONFDIR),)
|
ifeq ($(HALCONFDIR),)
|
||||||
CONFDIR = .
|
ifeq ($(CONFDIR),)
|
||||||
|
HALCONFDIR = .
|
||||||
|
else
|
||||||
|
HALCONFDIR := $(CONFDIR)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
HALCONF := $(strip $(shell cat $(CONFDIR)/halconf.h | egrep -e "\#define"))
|
HALCONF := $(strip $(shell cat $(HALCONFDIR)/halconf.h | egrep -e "\#define"))
|
||||||
|
|
||||||
else
|
else
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -3,11 +3,15 @@
|
||||||
ifeq ($(USE_SMART_BUILD),yes)
|
ifeq ($(USE_SMART_BUILD),yes)
|
||||||
|
|
||||||
# Configuration files directory
|
# Configuration files directory
|
||||||
ifeq ($(CONFDIR),)
|
ifeq ($(CHCONFDIR),)
|
||||||
CONFDIR = .
|
ifeq ($(CONFDIR),)
|
||||||
|
CHCONFDIR = .
|
||||||
|
else
|
||||||
|
CHCONFDIR := $(CONFDIR)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CHLIBCONF := $(strip $(shell cat $(CONFDIR)/chconf.h | egrep -e "\#define"))
|
CHLIBCONF := $(strip $(shell cat $(CHCONFDIR)/chconf.h | egrep -e "\#define"))
|
||||||
|
|
||||||
LIBSRC :=
|
LIBSRC :=
|
||||||
ifneq ($(findstring CH_CFG_USE_MAILBOXES TRUE,$(CHLIBCONF)),)
|
ifneq ($(findstring CH_CFG_USE_MAILBOXES TRUE,$(CHLIBCONF)),)
|
||||||
|
|
|
@ -1,7 +1,18 @@
|
||||||
# List of all the ChibiOS/NIL kernel files, there is no need to remove the files
|
# 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.
|
# from this list, you can disable parts of the kernel by editing chconf.h.
|
||||||
ifeq ($(USE_SMART_BUILD),yes)
|
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
|
KERNSRC := ${CHIBIOS}/os/nil/src/ch.c
|
||||||
else
|
else
|
||||||
KERNSRC := ${CHIBIOS}/os/nil/src/ch.c
|
KERNSRC := ${CHIBIOS}/os/nil/src/ch.c
|
||||||
|
|
10
os/rt/rt.mk
10
os/rt/rt.mk
|
@ -3,11 +3,15 @@
|
||||||
ifeq ($(USE_SMART_BUILD),yes)
|
ifeq ($(USE_SMART_BUILD),yes)
|
||||||
|
|
||||||
# Configuration files directory
|
# Configuration files directory
|
||||||
ifeq ($(CONFDIR),)
|
ifeq ($(CHCONFDIR),)
|
||||||
CONFDIR = .
|
ifeq ($(CONFDIR),)
|
||||||
|
CHCONFDIR = .
|
||||||
|
else
|
||||||
|
CHCONFDIR := $(CONFDIR)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CHCONF := $(strip $(shell cat $(CONFDIR)/chconf.h | egrep -e "\#define"))
|
CHCONF := $(strip $(shell cat $(CHCONFDIR)/chconf.h | egrep -e "\#define"))
|
||||||
|
|
||||||
KERNSRC := $(CHIBIOS)/os/rt/src/chsys.c \
|
KERNSRC := $(CHIBIOS)/os/rt/src/chsys.c \
|
||||||
$(CHIBIOS)/os/rt/src/chdebug.c \
|
$(CHIBIOS)/os/rt/src/chdebug.c \
|
||||||
|
|
|
@ -75,6 +75,8 @@
|
||||||
*****************************************************************************
|
*****************************************************************************
|
||||||
|
|
||||||
*** Next ***
|
*** Next ***
|
||||||
|
- NEW: Now it is possible to define separate directories for each
|
||||||
|
configuration file.
|
||||||
- NEW: Added option to enable bypass on SDIOv1 driver allowing to use a
|
- NEW: Added option to enable bypass on SDIOv1 driver allowing to use a
|
||||||
50MHz clock.
|
50MHz clock.
|
||||||
- NEW: Added TIM15, TIM16 and TIM17 support on GPT, ICU and PWM drivers,
|
- NEW: Added TIM15, TIM16 and TIM17 support on GPT, ICU and PWM drivers,
|
||||||
|
|
Loading…
Reference in New Issue