diff options
| author | Stephane D'Alu <sdalu@sdalu.com> | 2016-02-21 17:03:19 +0100 |
|---|---|---|
| committer | Stephane D'Alu <sdalu@sdalu.com> | 2016-02-21 17:03:19 +0100 |
| commit | e9a1a01f90ab2dae92def1547c81ae778d690cdb (patch) | |
| tree | b588b1a09357599530841bedac2823486b8f12c9 /os/hal/ports/STM32/STM32F4xx/platform.mk | |
| parent | 709c28c9299e4464a0654443f87ce0180403fef8 (diff) | |
| parent | b634bd9beef41b5b141b994efa4ac3d55505d0c4 (diff) | |
| download | ChibiOS-Contrib-e9a1a01f90ab2dae92def1547c81ae778d690cdb.tar.gz ChibiOS-Contrib-e9a1a01f90ab2dae92def1547c81ae778d690cdb.tar.bz2 ChibiOS-Contrib-e9a1a01f90ab2dae92def1547c81ae778d690cdb.zip | |
Merge branch 'master' into rng
Added haltest
Conflicts:
os/hal/hal.mk
os/hal/include/hal_community.h
os/hal/src/hal_community.c
Diffstat (limited to 'os/hal/ports/STM32/STM32F4xx/platform.mk')
| -rw-r--r-- | os/hal/ports/STM32/STM32F4xx/platform.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/os/hal/ports/STM32/STM32F4xx/platform.mk b/os/hal/ports/STM32/STM32F4xx/platform.mk index eed262e..5ffc9dd 100644 --- a/os/hal/ports/STM32/STM32F4xx/platform.mk +++ b/os/hal/ports/STM32/STM32F4xx/platform.mk @@ -6,10 +6,15 @@ PLATFORMSRC += ${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD/DMA2Dv1/stm32_dma2d.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
+ ${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD/TIMv1/timcap_lld.c \
+ ${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD/USBHv1/usbh_lld.c \
+ ${CHIBIOS_CONTRIB}/os/hal/src/fsmc_sdram.c \
+ ${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD/CRCv1/crc_lld.c
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/USBHv1 \
+ ${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD/CRCv1 \
${CHIBIOS_CONTRIB}/os/hal/ports/STM32/LLD
|