git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1435 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
gdisirio 2009-12-18 14:39:43 +00:00
parent 0b598c6990
commit 901489dd38
2 changed files with 44 additions and 44 deletions

View File

@ -57,25 +57,25 @@ LDSCRIPT= ch.ld
# Imported source files # Imported source files
CHIBIOS = ../.. CHIBIOS = ../..
include ${CHIBIOS}/boards/OLIMEX_STM32_P103/board.mk include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk
include ${CHIBIOS}/os/hal/platforms/STM32/platform.mk include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk
include ${CHIBIOS}/os/hal/hal.mk include $(CHIBIOS)/os/hal/hal.mk
include ${CHIBIOS}/os/ports/GCC/ARMCM3/port.mk include $(CHIBIOS)/os/ports/GCC/ARMCM3/port.mk
include ${CHIBIOS}/os/kernel/kernel.mk include $(CHIBIOS)/os/kernel/kernel.mk
include ${CHIBIOS}/test/test.mk include $(CHIBIOS)/test/test.mk
include ${CHIBIOS}/ext/fatfs/fatfs.mk include $(CHIBIOS)/ext/fatfs/fatfs.mk
# C sources that can be compiled in ARM or THUMB mode depending on the global # C sources that can be compiled in ARM or THUMB mode depending on the global
# setting. # setting.
CSRC = ${PORTSRC} \ CSRC = $(PORTSRC) \
${KERNSRC} \ $(KERNSRC) \
${TESTSRC} \ $(TESTSRC) \
${HALSRC} \ $(HALSRC) \
${PLATFORMSRC} \ $(PLATFORMSRC) \
${BOARDSRC} \ $(BOARDSRC) \
${FATFSSRC} \ $(FATFSSRC) \
${CHIBIOS}/os/various/evtimer.c \ $(CHIBIOS)/os/various/evtimer.c \
${CHIBIOS}/os/various/syscalls.c \ $(CHIBIOS)/os/various/syscalls.c \
main.c main.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global # C++ sources that can be compiled in ARM or THUMB mode depending on the global
@ -104,12 +104,12 @@ TCPPSRC =
# List ASM source files here # List ASM source files here
ASMSRC = $(PORTASM) \ ASMSRC = $(PORTASM) \
${CHIBIOS}/os/ports/GCC/ARMCM3/STM32F103/vectors.s $(CHIBIOS)/os/ports/GCC/ARMCM3/STM32F103/vectors.s
INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \ INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
$(HALINC) $(PLATFORMINC) ${BOARDINC} \ $(HALINC) $(PLATFORMINC) $(BOARDINC) \
$(FATFSINC) \ $(FATFSINC) \
${CHIBIOS}/os/various $(CHIBIOS)/os/various
# #
# Project, sources and paths # Project, sources and paths
@ -198,10 +198,10 @@ ULIBS =
############################################################################## ##############################################################################
ifeq ($(USE_FWLIB),yes) ifeq ($(USE_FWLIB),yes)
include ${CHIBIOS}/ext/stm32lib/stm32lib.mk include $(CHIBIOS)/ext/stm32lib/stm32lib.mk
CSRC += ${STM32SRC} CSRC += $(STM32SRC)
INCDIR += ${STM32INC} INCDIR += $(STM32INC)
USE_OPT += -DUSE_STDPERIPH_DRIVER USE_OPT += -DUSE_STDPERIPH_DRIVER
endif endif
include ${CHIBIOS}/os/ports/GCC/ARM/rules.mk include $(CHIBIOS)/os/ports/GCC/ARM/rules.mk

View File

@ -57,23 +57,23 @@ LDSCRIPT= ch.ld
# Imported source files # Imported source files
CHIBIOS = ../.. CHIBIOS = ../..
include ${CHIBIOS}/boards/OLIMEX_STM32_P103/board.mk include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk
include ${CHIBIOS}/os/hal/platforms/STM32/platform.mk include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk
include ${CHIBIOS}/os/hal/hal.mk include $(CHIBIOS)/os/hal/hal.mk
include ${CHIBIOS}/os/ports/GCC/ARMCM3/port.mk include $(CHIBIOS)/os/ports/GCC/ARMCM3/port.mk
include ${CHIBIOS}/os/kernel/kernel.mk include $(CHIBIOS)/os/kernel/kernel.mk
include ${CHIBIOS}/test/test.mk include $(CHIBIOS)/test/test.mk
# C sources that can be compiled in ARM or THUMB mode depending on the global # C sources that can be compiled in ARM or THUMB mode depending on the global
# setting. # setting.
CSRC = ${PORTSRC} \ CSRC = $(PORTSRC) \
${KERNSRC} \ $(KERNSRC) \
${TESTSRC} \ $(TESTSRC) \
${HALSRC} \ $(HALSRC) \
${PLATFORMSRC} \ $(PLATFORMSRC) \
${BOARDSRC} \ $(BOARDSRC) \
${CHIBIOS}/os/various/evtimer.c \ $(CHIBIOS)/os/various/evtimer.c \
${CHIBIOS}/os/various/syscalls.c \ $(CHIBIOS)/os/various/syscalls.c \
main.c main.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global # C++ sources that can be compiled in ARM or THUMB mode depending on the global
@ -102,11 +102,11 @@ TCPPSRC =
# List ASM source files here # List ASM source files here
ASMSRC = $(PORTASM) \ ASMSRC = $(PORTASM) \
${CHIBIOS}/os/ports/GCC/ARMCM3/STM32F103/vectors.s $(CHIBIOS)/os/ports/GCC/ARMCM3/STM32F103/vectors.s
INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \ INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
$(HALINC) $(PLATFORMINC) ${BOARDINC} \ $(HALINC) $(PLATFORMINC) $(BOARDINC) \
${CHIBIOS}/os/various $(CHIBIOS)/os/various
# #
# Project, sources and paths # Project, sources and paths
@ -195,10 +195,10 @@ ULIBS =
############################################################################## ##############################################################################
ifeq ($(USE_FWLIB),yes) ifeq ($(USE_FWLIB),yes)
include ${CHIBIOS}/ext/stm32lib/stm32lib.mk include $(CHIBIOS)/ext/stm32lib/stm32lib.mk
CSRC += ${STM32SRC} CSRC += $(STM32SRC)
INCDIR += ${STM32INC} INCDIR += $(STM32INC)
USE_OPT += -DUSE_STDPERIPH_DRIVER USE_OPT += -DUSE_STDPERIPH_DRIVER
endif endif
include ${CHIBIOS}/os/ports/GCC/ARM/rules.mk include $(CHIBIOS)/os/ports/GCC/ARM/rules.mk