diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-11-13 21:09:22 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-11-13 21:09:22 +0000 |
| commit | 09c69c89337a9e00f8b13cd170bebba3f57a2028 (patch) | |
| tree | 195f74da812403014a43abc7910a6454696a0f45 /demos | |
| parent | 3babd47150d98c9bd71848d4a6acc39316608c90 (diff) | |
| download | ChibiOS-09c69c89337a9e00f8b13cd170bebba3f57a2028.tar.gz ChibiOS-09c69c89337a9e00f8b13cd170bebba3f57a2028.tar.bz2 ChibiOS-09c69c89337a9e00f8b13cd170bebba3f57a2028.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1284 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/ARMCM3-STM32F103-GCC/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/demos/ARMCM3-STM32F103-GCC/Makefile b/demos/ARMCM3-STM32F103-GCC/Makefile index 2e65c9c16..9129cd687 100644 --- a/demos/ARMCM3-STM32F103-GCC/Makefile +++ b/demos/ARMCM3-STM32F103-GCC/Makefile @@ -38,7 +38,7 @@ endif # Enable this if you really want to use the STM FWLib.
ifeq ($(USE_FWLIB),)
- USE_FWLIB = no
+ USE_FWLIB = yes
endif
#
@@ -69,13 +69,13 @@ CSRC = ${PORTSRC} \ ${CHIBIOS}/os/io/pal.c \
${CHIBIOS}/os/io/serial.c \
${CHIBIOS}/os/io/spi.c \
+ ${CHIBIOS}/os/io/mmc_spi.c \
${CHIBIOS}/os/io/platforms/STM32/pal_lld.c \
${CHIBIOS}/os/io/platforms/STM32/serial_lld.c \
${CHIBIOS}/os/io/platforms/STM32/spi_lld.c \
${CHIBIOS}/os/io/platforms/STM32/stm32_dma.c \
${CHIBIOS}/os/various/evtimer.c \
- board.c main.c
- + board.c main.c # C++ sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
@@ -108,8 +108,7 @@ ASMSRC = $(PORTASM) \ INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
${CHIBIOS}/os/io \
${CHIBIOS}/os/io/platforms/STM32 \
- ${CHIBIOS}/os/various \
- ./stm32lib/inc
+ ${CHIBIOS}/os/various
#
# Project, sources and paths
@@ -198,8 +197,9 @@ ULIBS = ##############################################################################
ifeq ($(USE_FWLIB),yes)
- include ./stm32lib/stm32lib.mk
+ include ${CHIBIOS}/ext/stm32lib/stm32lib.mk
CSRC += ${STM32SRC}
+ INCDIR += ${STM32INC}
USE_OPT += -DUSE_STDPERIPH_DRIVER
endif
|