diff options
| author | Fabien Poussin <fabien.poussin@gmail.com> | 2018-03-15 12:51:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-15 12:51:14 +0100 |
| commit | 3add406135c78d44ebc38d810b22af5da19cd296 (patch) | |
| tree | fd42297388ca04dc8ff202e40d491b73ff4c21d6 /testhal/TIVA/TM4C123x/GPT | |
| parent | 345e218afd4f8009729dddc6eb541d8ec6a91565 (diff) | |
| parent | dabdfca04e5f470d1eb83f72f18269bd294031b6 (diff) | |
| download | ChibiOS-Contrib-3add406135c78d44ebc38d810b22af5da19cd296.tar.gz ChibiOS-Contrib-3add406135c78d44ebc38d810b22af5da19cd296.tar.bz2 ChibiOS-Contrib-3add406135c78d44ebc38d810b22af5da19cd296.zip | |
Merge branch 'master' into update_tests
Diffstat (limited to 'testhal/TIVA/TM4C123x/GPT')
| -rw-r--r-- | testhal/TIVA/TM4C123x/GPT/Makefile | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/testhal/TIVA/TM4C123x/GPT/Makefile b/testhal/TIVA/TM4C123x/GPT/Makefile index f2833ec..00661de 100644 --- a/testhal/TIVA/TM4C123x/GPT/Makefile +++ b/testhal/TIVA/TM4C123x/GPT/Makefile @@ -71,7 +71,7 @@ endif # Enables the use of FPU on Cortex-M4 (no, softfp, hard). ifeq ($(USE_FPU),) - USE_FPU = hard + USE_FPU = no endif # @@ -88,6 +88,9 @@ PROJECT = ch # Imported source files and paths CHIBIOS = ../../../../../ChibiOS-RT CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib + +# Licensing files. +include $(CHIBIOS)/os/license/license.mk # Startup files. include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk # HAL-OSAL files (optional). @@ -105,19 +108,12 @@ LDSCRIPT= $(STARTUPLD)/TM4C123xH6.ld # C sources that can be compiled in ARM or THUMB mode depending on the global # setting. -CSRC = $(STARTUPSRC) \ - $(KERNSRC) \ - $(PORTSRC) \ - $(OSALSRC) \ - $(HALSRC) \ - $(PLATFORMSRC) \ - $(BOARDSRC) \ - $(TESTSRC) \ +CSRC = $(ALLCSRC) \ main.c # C++ sources that can be compiled in ARM or THUMB mode depending on the global # setting. -CPPSRC = +CPPSRC = $(ALLCPPSRC) # C sources to be compiled in ARM mode regardless of the global setting. # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler @@ -140,13 +136,10 @@ TCSRC = TCPPSRC = # List ASM source files here -ASMSRC = -ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) +ASMSRC = $(ALLASMSRC) +ASMXSRC = $(ALLXASMSRC) -INCDIR = $(CHIBIOS)/os/license \ - $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ - $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \ - $(CHIBIOS)/os/various +INCDIR = $(ALLINC) # # Project, sources and paths @@ -182,10 +175,10 @@ AOPT = TOPT = -mthumb -DTHUMB # Define C warning options here -CWARN = -Wall -Wextra -Wstrict-prototypes +CWARN = -Wall -Wextra -Wundef -Wstrict-prototypes # Define C++ warning options here -CPPWARN = -Wall -Wextra +CPPWARN = -Wall -Wextra -Wundef # # Compiler settings |