diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-03-17 17:34:16 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-03-17 17:34:16 +0000 |
| commit | 35c72d21376b08452cbe15855e22312e402f73cc (patch) | |
| tree | 685a5019e10d79168e11cd15ad86df7fc685d69c | |
| parent | 0ca35b4b5a8fc67b2222fa0981cb650f1b938f35 (diff) | |
| download | ChibiOS-35c72d21376b08452cbe15855e22312e402f73cc.tar.gz ChibiOS-35c72d21376b08452cbe15855e22312e402f73cc.tar.bz2 ChibiOS-35c72d21376b08452cbe15855e22312e402f73cc.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11796 110e8d01-0319-4d1e-a829-52ad28d1bb01
| -rw-r--r-- | demos/STM32/RT-STM32F746G-DISCOVERY/Makefile | 14 | ||||
| -rw-r--r-- | demos/STM32/RT-STM32F746G-DISCOVERY/cfg/chconf.h (renamed from demos/STM32/RT-STM32F746G-DISCOVERY/chconf.h) | 0 | ||||
| -rw-r--r-- | demos/STM32/RT-STM32F746G-DISCOVERY/cfg/halconf.h (renamed from demos/STM32/RT-STM32F746G-DISCOVERY/halconf.h) | 0 | ||||
| -rw-r--r-- | demos/STM32/RT-STM32F746G-DISCOVERY/cfg/mcuconf.h (renamed from demos/STM32/RT-STM32F746G-DISCOVERY/mcuconf.h) | 0 | ||||
| -rw-r--r-- | demos/STM32/RT-STM32L476-DISCOVERY/Makefile | 9 |
5 files changed, 15 insertions, 8 deletions
diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY/Makefile b/demos/STM32/RT-STM32F746G-DISCOVERY/Makefile index 8c571546d..4c8954433 100644 --- a/demos/STM32/RT-STM32F746G-DISCOVERY/Makefile +++ b/demos/STM32/RT-STM32F746G-DISCOVERY/Makefile @@ -18,7 +18,7 @@ ifeq ($(USE_CPPOPT),) USE_CPPOPT = -fno-rtti
endif
-# Enable this if you want the linker to remove unused code and data
+# Enable this if you want the linker to remove unused code and data.
ifeq ($(USE_LINK_GC),)
USE_LINK_GC = yes
endif
@@ -28,7 +28,7 @@ ifeq ($(USE_LDOPT),) USE_LDOPT =
endif
-# Enable this if you want link time optimizations (LTO)
+# Enable this if you want link time optimizations (LTO).
ifeq ($(USE_LTO),)
USE_LTO = yes
endif
@@ -91,8 +91,8 @@ endif PROJECT = ch
# Imported source files and paths
-CHIBIOS := ../../..
-CONFDIR := .
+CHIBIOS = ../../..
+CONFDIR := ./cfg
BUILDDIR := ./build
DEPDIR := ./.dep
@@ -148,11 +148,11 @@ TCSRC = # option that results in lower performance and larger code size.
TCPPSRC =
-# List ASM source files here
-ASMSRC = $(ALLASMSRC) $(ALLASMSRC)
+# List ASM source files here.
+ASMSRC = $(ALLASMSRC)
ASMXSRC = $(ALLXASMSRC)
-INCDIR = $(ALLINC) $(TESTINC)
+INCDIR = $(CONFDIR) $(ALLINC) $(TESTINC)
#
# Project, sources and paths
diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY/chconf.h b/demos/STM32/RT-STM32F746G-DISCOVERY/cfg/chconf.h index 665a147d4..665a147d4 100644 --- a/demos/STM32/RT-STM32F746G-DISCOVERY/chconf.h +++ b/demos/STM32/RT-STM32F746G-DISCOVERY/cfg/chconf.h diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY/halconf.h b/demos/STM32/RT-STM32F746G-DISCOVERY/cfg/halconf.h index 6e5569097..6e5569097 100644 --- a/demos/STM32/RT-STM32F746G-DISCOVERY/halconf.h +++ b/demos/STM32/RT-STM32F746G-DISCOVERY/cfg/halconf.h diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY/mcuconf.h b/demos/STM32/RT-STM32F746G-DISCOVERY/cfg/mcuconf.h index 2d5eea42c..2d5eea42c 100644 --- a/demos/STM32/RT-STM32F746G-DISCOVERY/mcuconf.h +++ b/demos/STM32/RT-STM32F746G-DISCOVERY/cfg/mcuconf.h diff --git a/demos/STM32/RT-STM32L476-DISCOVERY/Makefile b/demos/STM32/RT-STM32L476-DISCOVERY/Makefile index 26e343617..9c33696ac 100644 --- a/demos/STM32/RT-STM32L476-DISCOVERY/Makefile +++ b/demos/STM32/RT-STM32L476-DISCOVERY/Makefile @@ -74,6 +74,11 @@ ifeq ($(USE_FPU),) USE_FPU = no
endif
+# FPU-related options.
+ifeq ($(USE_FPU_OPT),)
+ USE_FPU_OPT = -mfloat-abi=$(USE_FPU) -mfpu=fpv4-sp-d16 -fsingle-precision-constant
+endif
+
#
# Architecture or project specific options
##############################################################################
@@ -103,6 +108,8 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk # RTOS files (optional).
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
+# Auto-build files in ./source recursively.
+include $(CHIBIOS)/tools/mk/autobuild.mk
# Other files (optional).
include $(CHIBIOS)/test/lib/test.mk
include $(CHIBIOS)/test/rt/rt_test.mk
@@ -171,7 +178,7 @@ ULIBDIR = ULIBS =
#
-# End of user defines
+# End of user section
##############################################################################
##############################################################################
|