zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved makefiles. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1166 35acf78f-673a-0410-8e92-d51de3d6d3f4
master
gdisirio 2009-09-19 08:00:34 +00:00
parent db46ee952b
commit 9b59b00627
19 changed files with 199 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
demos/ARM7-AT91SAM7X-GCC/Makefile
View File

@ -43,20 +43,21 @@ PROJECT = ch
LDSCRIPT= ch.ld LDSCRIPT= ch.ld
# Imported source files # Imported source files
include ../../os/ports/GCC/ARM7/port.mk CHIBIOS = ../..
include ../../os/kernel/kernel.mk include ${CHIBIOS}/os/ports/GCC/ARM7/port.mk
include ../../test/test.mk include ${CHIBIOS}/os/kernel/kernel.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} \
../../os/io/pal.c \ ${CHIBIOS}/os/io/pal.c \
../../os/io/serial.c \ ${CHIBIOS}/os/io/serial.c \
../../os/io/platforms/AT91SAM7X/pal_lld.c \ ${CHIBIOS}/os/io/platforms/AT91SAM7X/pal_lld.c \
../../os/io/platforms/AT91SAM7X/serial_lld.c \ ${CHIBIOS}/os/io/platforms/AT91SAM7X/serial_lld.c \
../../os/io/platforms/AT91SAM7X/at91lib/aic.c \ ${CHIBIOS}/os/io/platforms/AT91SAM7X/at91lib/aic.c \
board.c main.c board.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
@ -85,13 +86,13 @@ TCPPSRC =
# List ASM source files here # List ASM source files here
ASMSRC = $(PORTASM) \ ASMSRC = $(PORTASM) \
../../os/ports/GCC/ARM7/AT91SAM7X/vectors.s ${CHIBIOS}/os/ports/GCC/ARM7/AT91SAM7X/vectors.s
INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \ INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
../../os/io \ ${CHIBIOS}/os/io \
../../os/io/platforms/AT91SAM7X \ ${CHIBIOS}/os/io/platforms/AT91SAM7X \
../../os/various \ ${CHIBIOS}/os/various \
../../os/ports/GCC/ARM7/AT91SAM7X ${CHIBIOS}/os/ports/GCC/ARM7/AT91SAM7X
# #
# Project, sources and paths # Project, sources and paths
@ -179,4 +180,4 @@ ULIBS =
# End of user defines # End of user defines
############################################################################## ##############################################################################
include ../../os/ports/GCC/ARM/rules.mk include ${CHIBIOS}/os/ports/GCC/ARM/rules.mk

49
demos/ARM7-AT91SAM7X-WEB-GCC/Makefile
View File

@ -43,18 +43,19 @@ PROJECT = ch
LDSCRIPT= ch.ld LDSCRIPT= ch.ld
# Imported source files # Imported source files
include ../../os/ports/GCC/ARM7/port.mk CHIBIOS = ../..
include ../../os/kernel/kernel.mk include ${CHIBIOS}/os/ports/GCC/ARM7/port.mk
include ../../test/test.mk include ${CHIBIOS}/os/kernel/kernel.mk
include ${CHIBIOS}/test/test.mk
# List of the required uIP source files. # List of the required uIP source files.
USRC = ../../ext/uip-1.0/uip/uip_arp.c \ USRC = ${CHIBIOS}/ext/uip-1.0/uip/uip_arp.c \
../../ext/uip-1.0/uip/psock.c \ ${CHIBIOS}/ext/uip-1.0/uip/psock.c \
../../ext/uip-1.0/uip/uip.c \ ${CHIBIOS}/ext/uip-1.0/uip/uip.c \
../../ext/uip-1.0/apps/webserver/httpd.c \ ${CHIBIOS}/ext/uip-1.0/apps/webserver/httpd.c \
../../ext/uip-1.0/apps/webserver/http-strings.c \ ${CHIBIOS}/ext/uip-1.0/apps/webserver/http-strings.c \
../../ext/uip-1.0/apps/webserver/httpd-fs.c \ ${CHIBIOS}/ext/uip-1.0/apps/webserver/httpd-fs.c \
../../ext/uip-1.0/apps/webserver/httpd-cgi.c ${CHIBIOS}/ext/uip-1.0/apps/webserver/httpd-cgi.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
# setting. # setting.
@ -62,13 +63,13 @@ CSRC = ${PORTSRC} \
${KERNSRC} \ ${KERNSRC} \
${TESTSRC} \ ${TESTSRC} \
${USRC} \ ${USRC} \
../../os/io/pal.c \ ${CHIBIOS}/os/io/pal.c \
../../os/io/serial.c \ ${CHIBIOS}/os/io/serial.c \
../../os/io/platforms/AT91SAM7X/pal_lld.c \ ${CHIBIOS}/os/io/platforms/AT91SAM7X/pal_lld.c \
../../os/io/platforms/AT91SAM7X/serial_lld.c \ ${CHIBIOS}/os/io/platforms/AT91SAM7X/serial_lld.c \
../../os/io/platforms/AT91SAM7X/sam7x_emac.c \ ${CHIBIOS}/os/io/platforms/AT91SAM7X/sam7x_emac.c \
../../os/io/platforms/AT91SAM7X/at91lib/aic.c \ ${CHIBIOS}/os/io/platforms/AT91SAM7X/at91lib/aic.c \
../../os/various/evtimer.c \ ${CHIBIOS}/os/various/evtimer.c \
web/webthread.c \ web/webthread.c \
board.c main.c board.c main.c
@ -98,14 +99,14 @@ TCPPSRC =
# List ASM source files here # List ASM source files here
ASMSRC = $(PORTASM) \ ASMSRC = $(PORTASM) \
../../os/ports/GCC/ARM7/AT91SAM7X/vectors.s ${CHIBIOS}/os/ports/GCC/ARM7/AT91SAM7X/vectors.s
INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \ INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
../../os/io \ ${CHIBIOS}/os/io \
../../os/io/platforms/AT91SAM7X \ ${CHIBIOS}/os/io/platforms/AT91SAM7X \
../../os/various \ ${CHIBIOS}/os/various \
../../os/ports/GCC/ARM7/AT91SAM7X \ ${CHIBIOS}/os/ports/GCC/ARM7/AT91SAM7X \
./web ../../ext/uip-1.0/uip ../../ext/uip-1.0/apps/webserver ./web ${CHIBIOS}/ext/uip-1.0/uip ${CHIBIOS}/ext/uip-1.0/apps/webserver
# #
# Project, sources and paths # Project, sources and paths
@ -193,4 +194,4 @@ ULIBS =
# End of user defines # End of user defines
############################################################################## ##############################################################################
include ../../os/ports/GCC/ARM/rules.mk include ${CHIBIOS}/os/ports/GCC/ARM/rules.mk

33
demos/ARM7-LPC214x-G++/Makefile
View File

@ -43,26 +43,27 @@ PROJECT = ch
LDSCRIPT = ch.ld LDSCRIPT = ch.ld
# Imported source files # Imported source files
include ../../os/ports/GCC/ARM7/port.mk CHIBIOS = ../..
include ../../os/kernel/kernel.mk include ${CHIBIOS}/os/ports/GCC/ARM7/port.mk
include ../../test/test.mk include ${CHIBIOS}/os/kernel/kernel.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} \
../../os/io/pal.c \ ${CHIBIOS}/os/io/pal.c \
../../os/io/serial.c \ ${CHIBIOS}/os/io/serial.c \
../../os/io/platforms/LPC214x/pal_lld.c \ ${CHIBIOS}/os/io/platforms/LPC214x/pal_lld.c \
../../os/io/platforms/LPC214x/serial_lld.c \ ${CHIBIOS}/os/io/platforms/LPC214x/serial_lld.c \
../../os/io/platforms/LPC214x/vic.c \ ${CHIBIOS}/os/io/platforms/LPC214x/vic.c \
../../os/various/evtimer.c \ ${CHIBIOS}/os/various/evtimer.c \
board.c board.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
# setting. # setting.
CPPSRC = ../../os/various/ch.cpp main.cpp CPPSRC = ${CHIBIOS}/os/various/ch.cpp main.cpp
# C sources to be compiled in ARM mode regardless of the global setting. # C sources to be compiled in ARM mode regardless of the global setting.
# NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler # NOTE: Mixing ARM and THUMB mode enables the -mthumb-interwork compiler
@ -86,13 +87,13 @@ TCPPSRC =
# List ASM source files here # List ASM source files here
ASMSRC = $(PORTASM) \ ASMSRC = $(PORTASM) \
../../os/ports/GCC/ARM7/LPC214x/vectors.s ${CHIBIOS}/os/ports/GCC/ARM7/LPC214x/vectors.s
INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \ INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
../../os/io \ ${CHIBIOS}/os/io \
../../os/io/platforms/LPC214x \ ${CHIBIOS}/os/io/platforms/LPC214x \
../../os/various \ ${CHIBIOS}/os/various \
../../os/ports/GCC/ARM7/LPC214x ${CHIBIOS}/os/ports/GCC/ARM7/LPC214x
# #
# Project, sources and paths # Project, sources and paths
@ -180,4 +181,4 @@ ULIBS =
# End of user defines # End of user defines
############################################################################## ##############################################################################
include ../../os/ports/GCC/ARM/rules.mk include ${CHIBIOS}/os/ports/GCC/ARM/rules.mk

25
demos/ARM7-LPC214x-GCC-minimal/Makefile
View File

@ -43,18 +43,19 @@ PROJECT = ch
LDSCRIPT = ch.ld LDSCRIPT = ch.ld
# Imported source files # Imported source files
include ../../os/ports/GCC/ARM7/port.mk CHIBIOS = ../..
include ../../os/kernel/kernel.mk include ${CHIBIOS}/os/ports/GCC/ARM7/port.mk
#include ../../test/test.mk include ${CHIBIOS}/os/kernel/kernel.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} \
../../os/io/pal.c \ ${CHIBIOS}/os/io/pal.c \
../../os/io/platforms/LPC214x/pal_lld.c \ ${CHIBIOS}/os/io/platforms/LPC214x/pal_lld.c \
../../os/io/platforms/LPC214x/vic.c \ ${CHIBIOS}/os/io/platforms/LPC214x/vic.c \
board.c main.c board.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
@ -83,13 +84,13 @@ TCPPSRC =
# List ASM source files here # List ASM source files here
ASMSRC = $(PORTASM) \ ASMSRC = $(PORTASM) \
../../os/ports/GCC/ARM7/LPC214x/vectors.s ${CHIBIOS}/os/ports/GCC/ARM7/LPC214x/vectors.s
INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \ INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
../../os/io \ ${CHIBIOS}/os/io \
../../os/io/platforms/LPC214x \ ${CHIBIOS}/os/io/platforms/LPC214x \
../../os/various \ ${CHIBIOS}/os/various \
../../os/ports/GCC/ARM7/LPC214x ${CHIBIOS}/os/ports/GCC/ARM7/LPC214x
# #
# Project, sources and paths # Project, sources and paths
@ -177,4 +178,4 @@ ULIBS =
# End of user defines # End of user defines
############################################################################## ##############################################################################
include ../../os/ports/GCC/ARM/rules.mk include ${CHIBIOS}/os/ports/GCC/ARM/rules.mk

33
demos/ARM7-LPC214x-GCC/Makefile
View File

@ -43,22 +43,23 @@ PROJECT = ch
LDSCRIPT = ch.ld LDSCRIPT = ch.ld
# Imported source files # Imported source files
include ../../os/ports/GCC/ARM7/port.mk CHIBIOS = ../..
include ../../os/kernel/kernel.mk include ${CHIBIOS}/os/ports/GCC/ARM7/port.mk
include ../../test/test.mk include ${CHIBIOS}/os/kernel/kernel.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} \
../../os/io/pal.c \ ${CHIBIOS}/os/io/pal.c \
../../os/io/serial.c \ ${CHIBIOS}/os/io/serial.c \
../../os/io/platforms/LPC214x/pal_lld.c \ ${CHIBIOS}/os/io/platforms/LPC214x/pal_lld.c \
../../os/io/platforms/LPC214x/serial_lld.c \ ${CHIBIOS}/os/io/platforms/LPC214x/serial_lld.c \
../../os/io/platforms/LPC214x/vic.c \ ${CHIBIOS}/os/io/platforms/LPC214x/vic.c \
../../os/io/platforms/LPC214x/lpc214x_ssp.c \ ${CHIBIOS}/os/io/platforms/LPC214x/lpc214x_ssp.c \
../../os/various/evtimer.c \ ${CHIBIOS}/os/various/evtimer.c \
board.c buzzer.c mmcsd.c main.c board.c buzzer.c mmcsd.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
@ -87,13 +88,13 @@ TCPPSRC =
# List ASM source files here # List ASM source files here
ASMSRC = $(PORTASM) \ ASMSRC = $(PORTASM) \
../../os/ports/GCC/ARM7/LPC214x/vectors.s ${CHIBIOS}/os/ports/GCC/ARM7/LPC214x/vectors.s
INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \ INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
../../os/io \ ${CHIBIOS}/os/io \
../../os/io/platforms/LPC214x \ ${CHIBIOS}/os/io/platforms/LPC214x \
../../os/various \ ${CHIBIOS}/os/various \
../../os/ports/GCC/ARM7/LPC214x ${CHIBIOS}/os/ports/GCC/ARM7/LPC214x
# #
# Project, sources and paths # Project, sources and paths
@ -181,4 +182,4 @@ ULIBS =
# End of user defines # End of user defines
############################################################################## ##############################################################################
include ../../os/ports/GCC/ARM/rules.mk include ${CHIBIOS}/os/ports/GCC/ARM/rules.mk

27
demos/ARMCM3-STM32F103-GCC/Makefile
View File

@ -56,20 +56,21 @@ PROJECT = ch
LDSCRIPT= ch.ld LDSCRIPT= ch.ld
# Imported source files # Imported source files
include ../../os/ports/GCC/ARMCM3/port.mk CHIBIOS = ../..
include ../../os/kernel/kernel.mk include ${CHIBIOS}/os/ports/GCC/ARMCM3/port.mk
include ../../test/test.mk include ${CHIBIOS}/os/kernel/kernel.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} \
../../os/io/pal.c \ ${CHIBIOS}/os/io/pal.c \
../../os/io/serial.c \ ${CHIBIOS}/os/io/serial.c \
../../os/io/platforms/STM32/pal_lld.c \ ${CHIBIOS}/os/io/platforms/STM32/pal_lld.c \
../../os/io/platforms/STM32/serial_lld.c \ ${CHIBIOS}/os/io/platforms/STM32/serial_lld.c \
../../os/various/evtimer.c \ ${CHIBIOS}/os/various/evtimer.c \
board.c main.c board.c main.c
@ -99,12 +100,12 @@ TCPPSRC =
# List ASM source files here # List ASM source files here
ASMSRC = $(PORTASM) \ ASMSRC = $(PORTASM) \
../../os/ports/GCC/ARMCM3/STM32F103/vectors.s ${CHIBIOS}/os/ports/GCC/ARMCM3/STM32F103/vectors.s
INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \ INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
../../os/io \ ${CHIBIOS}/os/io \
../../os/io/platforms/STM32 \ ${CHIBIOS}/os/io/platforms/STM32 \
../../os/various \ ${CHIBIOS}/os/various \
./stm32lib/inc ./stm32lib/inc
# #
@ -199,4 +200,4 @@ ifeq ($(USE_FWLIB),yes)
USE_OPT += -DUSE_STDPERIPH_DRIVER USE_OPT += -DUSE_STDPERIPH_DRIVER
endif endif
include ../../os/ports/GCC/ARM/rules.mk include ${CHIBIOS}/os/ports/GCC/ARM/rules.mk

19
demos/AVR-AT90CANx-GCC/Makefile
View File

@ -80,18 +80,19 @@ OBJDIR = .
# Imported source files # Imported source files
include ../../os/ports/GCC/AVR/port.mk CHIBIOS = ../..
include ../../os/kernel/kernel.mk include ${CHIBIOS}/os/ports/GCC/AVR/port.mk
include ../../test/test.mk include ${CHIBIOS}/os/kernel/kernel.mk
include ${CHIBIOS}/test/test.mk
# List C source files here. (C dependencies are automatically generated.) # List C source files here. (C dependencies are automatically generated.)
SRC = ${PORTSRC} \ SRC = ${PORTSRC} \
${KERNSRC} \ ${KERNSRC} \
${TESTSRC} \ ${TESTSRC} \
../../os/io/serial.c \ ${CHIBIOS}/os/io/serial.c \
../../os/io/platforms/AVR/serial_lld.c \ ${CHIBIOS}/os/io/platforms/AVR/serial_lld.c \
../../os/various/evtimer.c \ ${CHIBIOS}/os/various/evtimer.c \
board.c main.c board.c main.c
@ -127,9 +128,9 @@ DEBUG = dwarf-2
# Use forward slashes for directory separators. # Use forward slashes for directory separators.
# For a directory that has spaces, enclose it in quotes. # For a directory that has spaces, enclose it in quotes.
EXTRAINCDIRS = $(PORTINC) $(KERNINC) $(TESTINC) \ EXTRAINCDIRS = $(PORTINC) $(KERNINC) $(TESTINC) \
../../os/io \ ${CHIBIOS}/os/io \
../../os/io/platforms/AVR \ ${CHIBIOS}/os/io/platforms/AVR \
../../os/various ${CHIBIOS}/os/various
# Compiler flag to set the C Standard level. # Compiler flag to set the C Standard level.

19
demos/AVR-ATmega128-GCC/Makefile
View File

@ -80,18 +80,19 @@ OBJDIR = .
# Imported source files # Imported source files
include ../../os/ports/GCC/AVR/port.mk CHIBIOS = ../..
include ../../os/kernel/kernel.mk include ${CHIBIOS}/os/ports/GCC/AVR/port.mk
include ../../test/test.mk include ${CHIBIOS}/os/kernel/kernel.mk
include ${CHIBIOS}/test/test.mk
# List C source files here. (C dependencies are automatically generated.) # List C source files here. (C dependencies are automatically generated.)
SRC = ${PORTSRC} \ SRC = ${PORTSRC} \
${KERNSRC} \ ${KERNSRC} \
${TESTSRC} \ ${TESTSRC} \
../../os/io/serial.c \ ${CHIBIOS}/os/io/serial.c \
../../os/io/platforms/AVR/serial_lld.c \ ${CHIBIOS}/os/io/platforms/AVR/serial_lld.c \
../../os/various/evtimer.c \ ${CHIBIOS}/os/various/evtimer.c \
lcd.c board.c main.c lcd.c board.c main.c
@ -127,9 +128,9 @@ DEBUG = dwarf-2
# Use forward slashes for directory separators. # Use forward slashes for directory separators.
# For a directory that has spaces, enclose it in quotes. # For a directory that has spaces, enclose it in quotes.
EXTRAINCDIRS = $(PORTINC) $(KERNINC) $(TESTINC) \ EXTRAINCDIRS = $(PORTINC) $(KERNINC) $(TESTINC) \
../../os/io \ ${CHIBIOS}/os/io \
../../os/io/platforms/AVR \ ${CHIBIOS}/os/io/platforms/AVR \
../../os/various ${CHIBIOS}/os/various
# Compiler flag to set the C Standard level. # Compiler flag to set the C Standard level.

7
demos/GNU-Linux-GCC/Makefile
View File

@ -56,8 +56,9 @@ UDEFS =
UADEFS = UADEFS =
# Imported source files # Imported source files
include ../../src/kernel.mk CHIBIOS = ../..
include ../../test/test.mk include ${CHIBIOS}/src/kernel.mk
include ${CHIBIOS}/test/test.mk
# List C source files here # List C source files here
SRC = chcore.c main.c \ SRC = chcore.c main.c \
@ -68,7 +69,7 @@ SRC = chcore.c main.c \
ASRC = ASRC =
# List all user directories here # List all user directories here
UINCDIR = ../../src/include UINCDIR = ${CHIBIOS}/src/include
# List the user directory to look for the libraries here # List the user directory to look for the libraries here
ULIBDIR = ULIBDIR =

25
demos/MSP430-MSP430x1611-GCC/Makefile
View File

@ -39,19 +39,20 @@ PROJECT = ch
LDSCRIPT = mspgcc/msp430x1611.x LDSCRIPT = mspgcc/msp430x1611.x
# Imported source files # Imported source files
include ../../os/ports/GCC/MSP430/port.mk CHIBIOS = ../..
include ../../os/kernel/kernel.mk include ${CHIBIOS}/os/ports/GCC/MSP430/port.mk
include ../../test/test.mk include ${CHIBIOS}/os/kernel/kernel.mk
include ${CHIBIOS}/test/test.mk
# C sources here. # C sources here.
CSRC = ${PORTSRC} \ CSRC = ${PORTSRC} \
${KERNSRC} \ ${KERNSRC} \
${TESTSRC} \ ${TESTSRC} \
../../os/io/pal.c \ ${CHIBIOS}/os/io/pal.c \
../../os/io/serial.c \ ${CHIBIOS}/os/io/serial.c \
../../os/io/platforms/MSP430/pal_lld.c \ ${CHIBIOS}/os/io/platforms/MSP430/pal_lld.c \
../../os/io/platforms/MSP430/serial_lld.c \ ${CHIBIOS}/os/io/platforms/MSP430/serial_lld.c \
../../os/various/evtimer.c \ ${CHIBIOS}/os/various/evtimer.c \
board.c main.c board.c main.c
# C++ sources here. # C++ sources here.
@ -61,9 +62,9 @@ CPPSRC =
ASMSRC = $(PORTASM) ASMSRC = $(PORTASM)
INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \ INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
../../os/io \ ${CHIBIOS}/os/io \
../../os/io/platforms/MSP430 \ ${CHIBIOS}/os/io/platforms/MSP430 \
../../os/various ${CHIBIOS}/os/various
# #
# Project, sources and paths # Project, sources and paths
@ -145,4 +146,4 @@ ULIBS =
# End of user defines # End of user defines
############################################################################## ##############################################################################
include ../../os/ports/GCC/MSP430/rules.mk include ${CHIBIOS}/os/ports/GCC/MSP430/rules.mk

13
demos/Win32-MinGW/Makefile
View File

@ -56,15 +56,16 @@ UDEFS =
UADEFS = UADEFS =
# Imported source files # Imported source files
include ../../os/kernel/kernel.mk CHIBIOS = ../..
include ../../test/test.mk include ${CHIBIOS}/os/kernel/kernel.mk
include ${CHIBIOS}/test/test.mk
# List C source files here # List C source files here
SRC = ${KERNSRC} \ SRC = ${KERNSRC} \
${TESTSRC} \ ${TESTSRC} \
chcore.c \ chcore.c \
../../os/io/serial.c \ ${CHIBIOS}/os/io/serial.c \
../../os/io/platforms/Win32/serial_lld.c \ ${CHIBIOS}/os/io/platforms/Win32/serial_lld.c \
main.c main.c
# List ASM source files here # List ASM source files here
@ -72,8 +73,8 @@ ASRC =
# List all user directories here # List all user directories here
UINCDIR = $(KERNINC) $(TESTINC) \ UINCDIR = $(KERNINC) $(TESTINC) \
../../os/io \ ${CHIBIOS}/os/io \
../../os/io/platforms/Win32 ${CHIBIOS}/os/io/platforms/Win32
# List the user directory to look for the libraries here # List the user directory to look for the libraries here
ULIBDIR = ULIBDIR =

25
os/kernel/kernel.mk
View File

@ -1,13 +1,20 @@
# List of all the ChibiOS/RT kernel files, there is no need to remove the files # List of all the ChibiOS/RT kernel files, there is no need to remove the files
# from this list, you can disable parts of the kernel by editing chconf.h. # from this list, you can disable parts of the kernel by editing chconf.h.
KERNSRC = ../../os/kernel/src/chsys.c ../../os/kernel/src/chdebug.c \ KERNSRC = ${CHIBIOS}/os/kernel/src/chsys.c \
../../os/kernel/src/chlists.c ../../os/kernel/src/chvt.c \ ${CHIBIOS}/os/kernel/src/chdebug.c \
../../os/kernel/src/chschd.c ../../os/kernel/src/chthreads.c \ ${CHIBIOS}/os/kernel/src/chlists.c \
../../os/kernel/src/chsem.c ../../os/kernel/src/chmtx.c \ ${CHIBIOS}/os/kernel/src/chvt.c \
../../os/kernel/src/chcond.c ../../os/kernel/src/chevents.c \ ${CHIBIOS}/os/kernel/src/chschd.c \
../../os/kernel/src/chmsg.c ../../os/kernel/src/chmboxes.c \ ${CHIBIOS}/os/kernel/src/chthreads.c \
../../os/kernel/src/chqueues.c ../../os/kernel/src/chheap.c \ ${CHIBIOS}/os/kernel/src/chsem.c \
../../os/kernel/src/chmempools.c ${CHIBIOS}/os/kernel/src/chmtx.c \
${CHIBIOS}/os/kernel/src/chcond.c \
${CHIBIOS}/os/kernel/src/chevents.c \
${CHIBIOS}/os/kernel/src/chmsg.c \
${CHIBIOS}/os/kernel/src/chmboxes.c \
${CHIBIOS}/os/kernel/src/chqueues.c \
${CHIBIOS}/os/kernel/src/chheap.c \
${CHIBIOS}/os/kernel/src/chmempools.c
# Required include directories # Required include directories
KERNINC = ../../os/kernel/include KERNINC = ${CHIBIOS}/os/kernel/include

10
os/ports/GCC/ARM7/port.mk
View File

@ -1,7 +1,7 @@
# List of the ChibiOS/RT Cortex-M3 port files. # List of the ChibiOS/RT ARM7 port files.
PORTSRC = ../../os/ports/GCC/ARM7/chcore.c PORTSRC = ${CHIBIOS}/os/ports/GCC/ARM7/chcore.c
PORTASM = ../../os/ports/GCC/ARM7/crt0.s \ PORTASM = ${CHIBIOS}/os/ports/GCC/ARM7/crt0.s \
../../os/ports/GCC/ARM7/chcoreasm.s ${CHIBIOS}/os/ports/GCC/ARM7/chcoreasm.s
PORTINC = ../../os/ports/GCC/ARM7 PORTINC = ${CHIBIOS}/os/ports/GCC/ARM7

12
os/ports/GCC/ARMCM3/port.mk
View File

@ -1,9 +1,9 @@
# List of the ChibiOS/RT Cortex-M3 port files. # List of the ChibiOS/RT Cortex-M3 port files.
PORTSRC = ../../os/ports/GCC/ARMCM3/chcore.c \ PORTSRC = ${CHIBIOS}/os/ports/GCC/ARMCM3/chcore.c \
../../os/ports/GCC/ARMCM3/nvic.c \ ${CHIBIOS}/os/ports/GCC/ARMCM3/nvic.c \
../../os/ports/GCC/ARMCM3/cmsis/core_cm3.c ${CHIBIOS}/os/ports/GCC/ARMCM3/cmsis/core_cm3.c
PORTASM = ../../os/ports/GCC/ARMCM3/crt0.s PORTASM = ${CHIBIOS}/os/ports/GCC/ARMCM3/crt0.s
PORTINC = ../../os/ports/GCC/ARMCM3 \ PORTINC = ${CHIBIOS}/os/ports/GCC/ARMCM3 \
../../os/ports/GCC/ARMCM3/cmsis ${CHIBIOS}/os/ports/GCC/ARMCM3/cmsis

6
os/ports/GCC/AVR/port.mk
View File

@ -1,6 +1,6 @@
# List of the ChibiOS/RT Cortex-M3 port files. # List of the ChibiOS/RT AVR port files.
PORTSRC = ../../os/ports/GCC/AVR/chcore.c PORTSRC = ${CHIBIOS}/os/ports/GCC/AVR/chcore.c
PORTASM = PORTASM =
PORTINC = ../../os/ports/GCC/AVR PORTINC = ${CHIBIOS}/os/ports/GCC/AVR

6
os/ports/GCC/MSP430/port.mk
View File

@ -1,6 +1,6 @@
# List of the ChibiOS/RT Cortex-M3 port files. # List of the ChibiOS/RT MSP430 port files.
PORTSRC = ../../os/ports/GCC/MSP430/chcore.c PORTSRC = ${CHIBIOS}/os/ports/GCC/MSP430/chcore.c
PORTASM = PORTASM =
PORTINC = ../../os/ports/GCC/MSP430 PORTINC = ${CHIBIOS}/os/ports/GCC/MSP430

3
readme.txt
View File

@ -31,6 +31,9 @@
- NEW: Updated the STM32 port to use the newest ST firmware library files - NEW: Updated the STM32 port to use the newest ST firmware library files
(version 3.1.0). Note that now the ST drivers are included in the STM32 (version 3.1.0). Note that now the ST drivers are included in the STM32
demo directory. demo directory.
- NEW: Improved makefiles and makefile fragments, now the paths are not fixed,
the fragments can be included also from projects outside the ChibiOS/RT files
structure by simply defining the variable ${CHIBIOS}.
- CHANGE: Removed the CH_USE_SERIAL_FULLDUPLEX configuration option because - CHANGE: Removed the CH_USE_SERIAL_FULLDUPLEX configuration option because
the serial driver is no more part of the kernel. the serial driver is no more part of the kernel.
- CHANGE: Reorganized the PAL and Serial identifiers now IOPORT1..N and - CHANGE: Reorganized the PAL and Serial identifiers now IOPORT1..N and

9
test/coverage/Makefile
View File

@ -57,20 +57,21 @@ UDEFS =
UADEFS = UADEFS =
# Imported source files # Imported source files
include ../../os/kernel/kernel.mk CHIBIOS = ../..
include ../../test/test.mk include ${CHIBIOS}/os/kernel/kernel.mk
include ${CHIBIOS}/test/test.mk
# List C source files here # List C source files here
SRC = ${KERNSRC} \ SRC = ${KERNSRC} \
${TESTSRC} \ ${TESTSRC} \
../../os/io/serial.c \ ${CHIBIOS}/os/io/serial.c \
chcore.c serial_lld.c main.c chcore.c serial_lld.c main.c
# List ASM source files here # List ASM source files here
ASRC = ASRC =
# List all user directories here # List all user directories here
UINCDIR = $(KERNINC) $(TESTINC) ../../os/io UINCDIR = $(KERNINC) $(TESTINC) ${CHIBIOS}/os/io
# List the user directory to look for the libraries here # List the user directory to look for the libraries here
ULIBDIR = ULIBDIR =

20
test/test.mk
View File

@ -1,10 +1,16 @@
# List of all the ChibiOS/RT test files. # List of all the ChibiOS/RT test files.
TESTSRC = ../../test/test.c ../../test/testthd.c \ TESTSRC = ${CHIBIOS}/test/test.c \
../../test/testsem.c ../../test/testmtx.c \ ${CHIBIOS}/test/testthd.c \
../../test/testmsg.c ../../test/testmbox.c \ ${CHIBIOS}/test/testsem.c \
../../test/testevt.c ../../test/testheap.c \ ${CHIBIOS}/test/testmtx.c \
../../test/testpools.c ../../test/testdyn.c \ ${CHIBIOS}/test/testmsg.c \
../../test/testqueues.c ../../test/testbmk.c ${CHIBIOS}/test/testmbox.c \
${CHIBIOS}/test/testevt.c \
${CHIBIOS}/test/testheap.c \
${CHIBIOS}/test/testpools.c \
${CHIBIOS}/test/testdyn.c \
${CHIBIOS}/test/testqueues.c \
${CHIBIOS}/test/testbmk.c
# Required include directories # Required include directories
TESTINC = ../../test TESTINC = ${CHIBIOS}/test