diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-08-19 14:07:53 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-08-19 14:07:53 +0000 |
| commit | 58f8d8a051580add16ede4c74ae5e24e5f4bb45e (patch) | |
| tree | ca271f96c15dce684e2b5acb9078091b35962242 /testhal/STM32F30x/ADC_DUAL/Makefile | |
| parent | 1003ac4c256575f760cfdcada7ebbcb0f03d9f90 (diff) | |
| download | ChibiOS-58f8d8a051580add16ede4c74ae5e24e5f4bb45e.tar.gz ChibiOS-58f8d8a051580add16ede4c74ae5e24e5f4bb45e.tar.bz2 ChibiOS-58f8d8a051580add16ede4c74ae5e24e5f4bb45e.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6180 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'testhal/STM32F30x/ADC_DUAL/Makefile')
| -rw-r--r-- | testhal/STM32F30x/ADC_DUAL/Makefile | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/testhal/STM32F30x/ADC_DUAL/Makefile b/testhal/STM32F30x/ADC_DUAL/Makefile index 455c2e5da..41c3e23a8 100644 --- a/testhal/STM32F30x/ADC_DUAL/Makefile +++ b/testhal/STM32F30x/ADC_DUAL/Makefile @@ -65,11 +65,12 @@ PROJECT = ch # Imported source files and paths
CHIBIOS = ../../..
-include $(CHIBIOS)/boards/ST_STM32F3_DISCOVERY/board.mk
-include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk
include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk
-include $(CHIBIOS)/os/kernel/kernel.mk
+include $(CHIBIOS)/os/hal/osal/chibios/osal.mk
+include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk
+include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk
+include $(CHIBIOS)/os/rt/rt.mk
+include $(CHIBIOS)/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk
#include $(CHIBIOS)/test/test.mk
# Define linker script file here
@@ -81,6 +82,7 @@ CSRC = $(PORTSRC) \ $(KERNSRC) \
$(TESTSRC) \
$(HALSRC) \
+ $(OSALSRC) \
$(PLATFORMSRC) \
$(BOARDSRC) \
main.c
@@ -113,7 +115,7 @@ TCPPSRC = ASMSRC = $(PORTASM)
INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
- $(HALINC) $(PLATFORMINC) $(BOARDINC) \
+ $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \
$(CHIBIOS)/os/various/devices_lib/accel \
$(CHIBIOS)/os/various
@@ -207,8 +209,10 @@ ULIBS = ifeq ($(USE_FPU),yes)
USE_OPT += -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -fsingle-precision-constant
DDEFS += -DCORTEX_USE_FPU=TRUE
+ DADEFS += -DCORTEX_USE_FPU=TRUE
else
DDEFS += -DCORTEX_USE_FPU=FALSE
+ DADEFS += -DCORTEX_USE_FPU=FALSE
endif
ifeq ($(USE_FWLIB),yes)
@@ -218,4 +222,4 @@ ifeq ($(USE_FWLIB),yes) USE_OPT += -DUSE_STDPERIPH_DRIVER
endif
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk
+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/rules.mk
|