diff options
| author | Konstantin Oblaukhov <oblaukhov.konstantin@gmail.com> | 2018-09-24 20:31:28 +0700 |
|---|---|---|
| committer | Konstantin Oblaukhov <oblaukhov.konstantin@gmail.com> | 2018-09-24 20:31:28 +0700 |
| commit | 2db0e3fd7877253bf82766fb0666ab16234639b3 (patch) | |
| tree | f054157368fa404d1dc71f6d71e083eb11dc669b /demos | |
| parent | 7ab18994e7ac71872b9aa4684546dffe01c5c3f0 (diff) | |
| download | ChibiOS-Contrib-2db0e3fd7877253bf82766fb0666ab16234639b3.tar.gz ChibiOS-Contrib-2db0e3fd7877253bf82766fb0666ab16234639b3.tar.bz2 ChibiOS-Contrib-2db0e3fd7877253bf82766fb0666ab16234639b3.zip | |
New style makefiles for demos and tests.
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/STM32/RT-STM32F303-DISCOVERY-PID/Makefile | 20 | ||||
| -rw-r--r-- | demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile | 26 | ||||
| -rw-r--r-- | demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/Makefile | 26 |
3 files changed, 23 insertions, 49 deletions
diff --git a/demos/STM32/RT-STM32F303-DISCOVERY-PID/Makefile b/demos/STM32/RT-STM32F303-DISCOVERY-PID/Makefile index 2173b3e..738a956 100644 --- a/demos/STM32/RT-STM32F303-DISCOVERY-PID/Makefile +++ b/demos/STM32/RT-STM32F303-DISCOVERY-PID/Makefile @@ -88,6 +88,8 @@ 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)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f3xx.mk
# HAL-OSAL files (optional).
@@ -105,20 +107,14 @@ LDSCRIPT= $(STARTUPLD)/STM32F303xC.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) \
+CSRC = $(ALLCSRC) \
$(TESTSRC) \
$(CHIBIOS_CONTRIB)/os/various/pid.c \
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
@@ -141,12 +137,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) \
+INCDIR = $(ALLINC) $(TESTINC) \
$(CHIBIOS_CONTRIB)/os/various
#
diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile index 6cf025a..aa99ec7 100644 --- a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile +++ b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile @@ -88,6 +88,8 @@ 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)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk
# HAL-OSAL files (optional).
@@ -110,16 +112,8 @@ LDSCRIPT = STM32F429xI_SDRAM.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) \
+CSRC = $(ALLCSRC) \
$(TESTSRC) \
- $(STREAMSSRC) \
- $(SHELLSRC) \
$(CHIBIOS_CONTRIB)/os/various/devices_lib/lcd/ili9341.c \
main.c usbcfg.c \
wolf3d_palette.c \
@@ -127,7 +121,7 @@ CSRC = $(STARTUPSRC) \ # 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
@@ -150,14 +144,10 @@ TCSRC = TCPPSRC =
# List ASM source files here
-ASMSRC =
-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
-
-INCDIR = $(CHIBIOS)/os/license \
- $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
- $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
- $(STREAMSINC) $(SHELLINC) \
- $(CHIBIOS)/os/various \
+ASMSRC = $(ALLASMSRC)
+ASMXSRC = $(ALLXASMSRC)
+
+INCDIR = $(ALLINC) $(TESTINC) \
$(CHIBIOS_CONTRIB)/os/various/devices_lib/lcd \
res
diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/Makefile b/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/Makefile index 1203a72..ead8513 100644 --- a/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/Makefile +++ b/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/Makefile @@ -88,6 +88,8 @@ 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)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk
# HAL-OSAL files (optional).
@@ -110,23 +112,15 @@ LDSCRIPT = $(STARTUPLD)/STM32F429xI.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) \
+CSRC = $(ALLCSRC) \
$(TESTSRC) \
- $(STREAMSSRC) \
- $(SHELLSRC) \
$(CHIBIOS_CONTRIB)/os/various/tribuf.c \
usbcfg.c \
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
@@ -149,14 +143,10 @@ TCSRC = TCPPSRC =
# List ASM source files here
-ASMSRC =
-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
-
-INCDIR = $(CHIBIOS)/os/license \
- $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
- $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
- $(STREAMSINC) $(SHELLINC) \
- $(CHIBIOS)/os/various \
+ASMSRC = $(ALLASMSRC)
+ASMXSRC = $(ALLXASMSRC)
+
+INCDIR = $(ALLINC) $(TESTINC) \
$(CHIBIOS_CONTRIB)/os/various
#
|