diff options
| author | Nicolas Reinecke <nr@das-labor.org> | 2016-05-01 01:38:31 +0200 |
|---|---|---|
| committer | Nicolas Reinecke <nr@das-labor.org> | 2016-05-01 03:28:30 +0200 |
| commit | 367bc6bcce15d90b49b040d865c3a8f69321b80e (patch) | |
| tree | 2e148b46b925b84387c4d2101e80b34e906150f5 /demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile | |
| parent | 1a6aba5009bf8ba1672adddb5b24fd7fe1f2c973 (diff) | |
| download | ChibiOS-Contrib-367bc6bcce15d90b49b040d865c3a8f69321b80e.tar.gz ChibiOS-Contrib-367bc6bcce15d90b49b040d865c3a8f69321b80e.tar.bz2 ChibiOS-Contrib-367bc6bcce15d90b49b040d865c3a8f69321b80e.zip | |
update stm32 demo and testhal projects to upstream chibios
Diffstat (limited to 'demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile')
| -rw-r--r-- | demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile index 256c0a4..894fe9d 100644 --- a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile +++ b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile @@ -69,7 +69,7 @@ ifeq ($(USE_EXCEPTIONS_STACKSIZE),) USE_EXCEPTIONS_STACKSIZE = 0x400
endif
-# Enables the use of FPU on Cortex-M4 (no, softfp, hard).
+# Enables the use of FPU (no, softfp, hard).
ifeq ($(USE_FPU),)
USE_FPU = no
endif
@@ -89,7 +89,7 @@ PROJECT = ch CHIBIOS = ../../../../ChibiOS-RT
CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
# Startup files.
-include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk
+include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk
# HAL-OSAL files (optional).
include $(CHIBIOS_CONTRIB)/os/hal/hal.mk
include $(CHIBIOS_CONTRIB)/os/hal/ports/STM32/STM32F4xx/platform.mk
@@ -97,9 +97,11 @@ include $(CHIBIOS)/os/hal/boards/ST_STM32F429I_DISCOVERY/board.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk
# RTOS files (optional).
include $(CHIBIOS)/os/rt/rt.mk
-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
# Other files (optional).
include $(CHIBIOS)/test/rt/test.mk
+include $(CHIBIOS)/os/hal/lib/streams/streams.mk
+include $(CHIBIOS)/os/various/shell/shell.mk
# Define linker script file here
LDSCRIPT = STM32F429xI_SDRAM.ld
@@ -114,14 +116,12 @@ CSRC = $(STARTUPSRC) \ $(PLATFORMSRC) \
$(BOARDSRC) \
$(TESTSRC) \
- $(CHIBIOS)/os/various/shell.c \
- $(CHIBIOS)/os/hal/lib/streams/memstreams.c \
- $(CHIBIOS)/os/hal/lib/streams/chprintf.c \
+ $(STREAMSSRC) \
+ $(SHELLSRC) \
$(CHIBIOS_CONTRIB)/os/various/devices_lib/lcd/ili9341.c \
- ./main.c \
- ./wolf3d_palette.c \
- ./res/wolf3d_vgagraph_chunk87.c \
- # eol
+ main.c \
+ wolf3d_palette.c \
+ res/wolf3d_vgagraph_chunk87.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
@@ -154,11 +154,10 @@ ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) INCDIR = $(CHIBIOS)/os/license \
$(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
+ $(STREAMSINC) $(SHELLINC) \
$(CHIBIOS)/os/various \
- $(CHIBIOS)/os/hal/lib/streams \
$(CHIBIOS_CONTRIB)/os/various/devices_lib/lcd \
- ./res \
- # eol
+ res
#
# Project, sources and paths
@@ -194,10 +193,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
@@ -226,5 +225,5 @@ ULIBS = # End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
include $(RULESPATH)/rules.mk
|