Changed the way files are included to a more convenient way.

This commit is contained in:
Fabien Poussin 2015-08-20 17:47:21 +02:00
parent 3a945458c0
commit 48a03708ff
11 changed files with 60 additions and 59 deletions

View File

@ -1,5 +1,5 @@
# List of all the board related files.
BOARDSRC = ${CHIBIOS}/community/os/hal/boards/ST_STM32F0308_DISCOVERY/board.c
BOARDSRC = ${CHIBIOS_CONTRIB}/os/hal/boards/ST_STM32F0308_DISCOVERY/board.c
# Required include directories
BOARDINC = ${CHIBIOS}/community/os/hal/boards/ST_STM32F0308_DISCOVERY
BOARDINC = ${CHIBIOS_CONTRIB}/os/hal/boards/ST_STM32F0308_DISCOVERY

View File

@ -1,5 +1,5 @@
# List of all the board related files.
BOARDSRC = ${CHIBIOS}/community/os/hal/boards/TI_TM4C123G_LAUNCHPAD/board.c
BOARDSRC = ${CHIBIOS_CONTRIB}/os/hal/boards/TI_TM4C123G_LAUNCHPAD/board.c
# Required include directories
BOARDINC = ${CHIBIOS}/community/os/hal/boards/TI_TM4C123G_LAUNCHPAD
BOARDINC = ${CHIBIOS_CONTRIB}/os/hal/boards/TI_TM4C123G_LAUNCHPAD

View File

@ -1,5 +1,5 @@
# List of all the board related files.
BOARDSRC = ${CHIBIOS}/community/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.c
BOARDSRC = ${CHIBIOS_CONTRIB}/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.c
# Required include directories
BOARDINC = ${CHIBIOS}/community/os/hal/boards/TI_TM4C1294_LAUNCHPAD
BOARDINC = ${CHIBIOS_CONTRIB}/os/hal/boards/TI_TM4C1294_LAUNCHPAD

View File

@ -1,5 +1,5 @@
# List of all the board related files.
BOARDSRC = ${CHIBIOS}/community/os/hal/boards/WVSHARE_BLE400/board.c
BOARDSRC = ${CHIBIOS_CONTRIB}/os/hal/boards/WVSHARE_BLE400/board.c
# Required include directories
BOARDINC = ${CHIBIOS}/community/os/hal/boards/WVSHARE_BLE400
BOARDINC = ${CHIBIOS_CONTRIB}/os/hal/boards/WVSHARE_BLE400

View File

@ -1,9 +1,9 @@
include ${CHIBIOS}/os/hal/hal.mk
HALSRC += ${CHIBIOS}/community/os/hal/src/hal_community.c \
${CHIBIOS}/community/os/hal/src/nand.c \
${CHIBIOS}/community/os/hal/src/onewire.c \
${CHIBIOS}/community/os/hal/src/eicu.c \
${CHIBIOS}/community/os/hal/src/crc.c
HALSRC += ${CHIBIOS_CONTRIB}/os/hal/src/hal_community.c \
${CHIBIOS_CONTRIB}/os/hal/src/nand.c \
${CHIBIOS_CONTRIB}/os/hal/src/onewire.c \
${CHIBIOS_CONTRIB}/os/hal/src/eicu.c \
${CHIBIOS_CONTRIB}/os/hal/src/crc.c
HALINC += ${CHIBIOS}/community/os/hal/include
HALINC += ${CHIBIOS_CONTRIB}/os/hal/include

View File

@ -1,13 +1,13 @@
# List of all the NRF51x platform files.
PLATFORMSRC = ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c \
${CHIBIOS}/community/os/hal/ports/NRF51/NRF51822/hal_lld.c \
${CHIBIOS}/community/os/hal/ports/NRF51/NRF51822/pal_lld.c \
${CHIBIOS}/community/os/hal/ports/NRF51/NRF51822/serial_lld.c \
${CHIBIOS}/community/os/hal/ports/NRF51/NRF51822/st_lld.c \
${CHIBIOS}/community/os/hal/ports/NRF51/NRF51822/spi_lld.c \
${CHIBIOS}/community/os/hal/ports/NRF51/NRF51822/ext_lld_isr.c \
${CHIBIOS}/community/os/hal/ports/NRF51/NRF51822/ext_lld.c
${CHIBIOS_CONTRIB}/os/hal/ports/NRF51/NRF51822/hal_lld.c \
${CHIBIOS_CONTRIB}/os/hal/ports/NRF51/NRF51822/pal_lld.c \
${CHIBIOS_CONTRIB}/os/hal/ports/NRF51/NRF51822/serial_lld.c \
${CHIBIOS_CONTRIB}/os/hal/ports/NRF51/NRF51822/st_lld.c \
${CHIBIOS_CONTRIB}/os/hal/ports/NRF51/NRF51822/spi_lld.c \
${CHIBIOS_CONTRIB}/os/hal/ports/NRF51/NRF51822/ext_lld_isr.c \
${CHIBIOS_CONTRIB}/os/hal/ports/NRF51/NRF51822/ext_lld.c
# Required include directories
PLATFORMINC = ${CHIBIOS}/os/hal/ports/common/ARMCMx \
${CHIBIOS}/community/os/hal/ports/NRF51/NRF51822
${CHIBIOS_CONTRIB}/os/hal/ports/NRF51/NRF51822

View File

@ -1,6 +1,6 @@
include ${CHIBIOS}/os/hal/ports/STM32/STM32F0xx/platform.mk
PLATFORMSRC += ${CHIBIOS}/community/os/hal/ports/STM32/LLD/CRCv1/crc_lld.c
PLATFORMSRC += ${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD/CRCv1/crc_lld.c
PLATFORMINC += ${CHIBIOS}/community/os/hal/ports/STM32/LLD/CRCv1 \
${CHIBIOS}/community/os/hal/ports/STM32/LLD
PLATFORMINC += ${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD/CRCv1 \
${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD

View File

@ -1,15 +1,15 @@
include ${CHIBIOS}/os/hal/ports/STM32/STM32F4xx/platform.mk
PLATFORMSRC += ${CHIBIOS}/community/os/hal/ports/STM32/LLD/DMA2Dv1/stm32_dma2d.c \
${CHIBIOS}/community/os/hal/ports/STM32/LLD/FSMCv1/fsmc.c \
${CHIBIOS}/community/os/hal/ports/STM32/LLD/FSMCv1/nand_lld.c \
${CHIBIOS}/community/os/hal/ports/STM32/LLD/FSMCv1/fsmc_sram.c \
${CHIBIOS}/community/os/hal/ports/STM32/LLD/LTDCv1/stm32_ltdc.c \
${CHIBIOS}/community/os/hal/ports/STM32/LLD/TIMv1/eicu_lld.c \
${CHIBIOS}/community/os/hal/src/fsmc_sdram.c
PLATFORMSRC += ${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD/DMA2Dv1/stm32_dma2d.c \
${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD/FSMCv1/fsmc.c \
${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD/FSMCv1/nand_lld.c \
${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD/FSMCv1/fsmc_sram.c \
${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD/LTDCv1/stm32_ltdc.c \
${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD/TIMv1/eicu_lld.c \
${CHIBIOS_CONTRIB}/os/hal/src/fsmc_sdram.c
PLATFORMINC += ${CHIBIOS}/community/os/hal/ports/STM32/LLD/DMA2Dv1 \
${CHIBIOS}/community/os/hal/ports/STM32/LLD/FSMCv1 \
${CHIBIOS}/community/os/hal/ports/STM32/LLD/LTDCv1 \
${CHIBIOS}/community/os/hal/ports/STM32/LLD/TIMv1 \
${CHIBIOS}/community/os/hal/ports/STM32/LLD
PLATFORMINC += ${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD/DMA2Dv1 \
${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD/FSMCv1 \
${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD/LTDCv1 \
${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD/TIMv1 \
${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD

View File

@ -1,17 +1,17 @@
# List of all the TM4C123x platform files.
PLATFORMSRC = ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c \
${CHIBIOS}/community/os/hal/ports/TIVA/TM4C123x/hal_lld.c \
${CHIBIOS}/community/os/hal/ports/TIVA/LLD/st_lld.c \
${CHIBIOS}/community/os/hal/ports/TIVA/LLD/pal_lld.c \
${CHIBIOS}/community/os/hal/ports/TIVA/LLD/serial_lld.c \
${CHIBIOS}/community/os/hal/ports/TIVA/LLD/i2c_lld.c \
${CHIBIOS}/community/os/hal/ports/TIVA/LLD/gpt_lld.c \
${CHIBIOS}/community/os/hal/ports/TIVA/LLD/pwm_lld.c \
${CHIBIOS}/community/os/hal/ports/TIVA/LLD/spi_lld.c \
${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/TM4C123x/hal_lld.c \
${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/st_lld.c \
${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/pal_lld.c \
${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/serial_lld.c \
${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/i2c_lld.c \
${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/gpt_lld.c \
${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/pwm_lld.c \
${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/spi_lld.c \
${CHISIOS}/community/os/hal/ports/TIVA/LLD/tiva_udma.c \
${CHISIOS}/community/os/hal/ports/TIVA/LLD/ext_lld.c
# Required include directories
PLATFORMINC = ${CHIBIOS}/os/hal/ports/common/ARMCMx \
${CHIBIOS}/community/os/hal/ports/TIVA/TM4C123x \
${CHIBIOS}/community/os/hal/ports/TIVA/LLD
${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/TM4C123x \
${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD

View File

@ -1,13 +1,13 @@
# List of all the TM4C129x platform files.
PLATFORMSRC = ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c \
${CHIBIOS}/community/os/hal/ports/TIVA/TM4C129x/hal_lld.c \
${CHIBIOS}/community/os/hal/ports/TIVA/LLD/st_lld.c \
${CHIBIOS}/community/os/hal/ports/TIVA/LLD/pal_lld.c \
${CHIBIOS}/community/os/hal/ports/TIVA/LLD/serial_lld.c \
${CHIBIOS}/community/os/hal/ports/TIVA/LLD/mac_lld.c \
${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/TM4C129x/hal_lld.c \
${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/st_lld.c \
${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/pal_lld.c \
${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/serial_lld.c \
${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/mac_lld.c \
${CHISIOS}/community/os/hal/ports/TIVA/LLD/ext_lld.c
# Required include directories
PLATFORMINC = ${CHIBIOS}/os/hal/ports/common/ARMCMx \
${CHIBIOS}/community/os/hal/ports/TIVA/TM4C129x \
${CHIBIOS}/community/os/hal/ports/TIVA/LLD
${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/TM4C129x \
${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD

View File

@ -81,12 +81,13 @@ endif
PROJECT = ch
# Imported source files and paths
CHIBIOS = ../../../../..
CHIBIOS = ../../../../../ChibiOS-RT
CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
# Startup files.
include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f0xx.mk
# HAL-OSAL files (optional).
include $(CHIBIOS)/community/os/hal/hal.mk
include $(CHIBIOS)/community/os/hal/ports/STM32/STM32F0xx/platform.mk
include $(CHIBIOS_CONTRIB)/os/hal/hal.mk
include $(CHIBIOS_CONTRIB)/os/hal/ports/STM32/STM32F0xx/platform.mk
include $(CHIBIOS)/os/hal/boards/ST_STM32F072B_DISCOVERY/board.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
# RTOS files (optional).
@ -109,7 +110,7 @@ CSRC = $(STARTUPSRC) \
$(BOARDSRC) \
$(TESTSRC) \
main.c \
$(CHIBIOS)/community/os/various/crcsw.c
$(CHIBIOS_CONTRIB)/os/various/crcsw.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
@ -140,7 +141,7 @@ ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
$(CHIBIOS)/os/various $(CHIBIOS)/community/os/various
$(CHIBIOS)/os/various $(CHIBIOS_CONTRIB)/os/various
#
# Project, sources and paths