From ea6abe0731888c334b721970d37d3aef0a8ab220 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Fri, 6 Feb 2015 11:42:26 +0000 Subject: chprintf and streams are now part of the HAL library. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7665 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/KINETIS/RT-MCHCK-K20-GPT/Makefile | 3 +- demos/KINETIS/RT-MCHCK-K20-SPI/Makefile | 3 +- demos/SPC5/RT-SPC560B-EVB/Makefile | 3 +- demos/SPC5/RT-SPC560D-EVB/Makefile | 3 +- demos/SPC5/RT-SPC560P-EVB/Makefile | 3 +- demos/SPC5/RT-SPC563M-EVB/Makefile | 3 +- demos/SPC5/RT-SPC564A-EVB/Makefile | 3 +- demos/SPC5/RT-SPC56EC-EVB/Makefile | 3 +- demos/SPC5/RT-SPC56EL-EVB/Makefile | 3 +- demos/STM32/CMSIS-STM32F407-DISCOVERY/.cproject | 4 +- demos/STM32/NIL-STM32F303-DISCOVERY/.cproject | 48 ++-------------------- demos/STM32/RT-STM32F072-DISCOVERY/Makefile | 3 +- demos/STM32/RT-STM32F103-MAPLEMINI/Makefile | 3 +- demos/STM32/RT-STM32F103_INEMO_DISCOVERY/Makefile | 3 +- demos/STM32/RT-STM32F401RE-NUCLEO/.cproject | 4 +- demos/STM32/RT-STM32F407-DISCOVERY-G++/Makefile | 3 +- demos/STM32/RT-STM32F407-DISCOVERY-MEMS/Makefile | 3 +- .../Makefile | 3 +- demos/STM32/RT-STM32F429-DISCOVERY/Makefile | 3 +- demos/various/RT-Win32-Simulator/Makefile | 19 ++++----- 20 files changed, 46 insertions(+), 77 deletions(-) (limited to 'demos') diff --git a/demos/KINETIS/RT-MCHCK-K20-GPT/Makefile b/demos/KINETIS/RT-MCHCK-K20-GPT/Makefile index a8370b0a3..d12b6a10f 100644 --- a/demos/KINETIS/RT-MCHCK-K20-GPT/Makefile +++ b/demos/KINETIS/RT-MCHCK-K20-GPT/Makefile @@ -95,7 +95,8 @@ CSRC = $(PORTSRC) \ $(OSALSRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ - $(CHIBIOS)/os/various/chprintf.c \ + $(CHIBIOS)/os/hal/lib/streams/memstreams.c \ + $(CHIBIOS)/os/hal/lib/streams/chprintf.c \ main.c # C++ sources that can be compiled in ARM or THUMB mode depending on the global diff --git a/demos/KINETIS/RT-MCHCK-K20-SPI/Makefile b/demos/KINETIS/RT-MCHCK-K20-SPI/Makefile index 1e972097a..f9f459bd1 100644 --- a/demos/KINETIS/RT-MCHCK-K20-SPI/Makefile +++ b/demos/KINETIS/RT-MCHCK-K20-SPI/Makefile @@ -95,7 +95,8 @@ CSRC = $(PORTSRC) \ $(OSALSRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ - $(CHIBIOS)/os/various/chprintf.c \ + $(CHIBIOS)/os/hal/lib/streams/memstreams.c \ + $(CHIBIOS)/os/hal/lib/streams/chprintf.c \ main.c # C++ sources that can be compiled in ARM or THUMB mode depending on the global diff --git a/demos/SPC5/RT-SPC560B-EVB/Makefile b/demos/SPC5/RT-SPC560B-EVB/Makefile index dc0de9bf8..f6c6b5108 100644 --- a/demos/SPC5/RT-SPC560B-EVB/Makefile +++ b/demos/SPC5/RT-SPC560B-EVB/Makefile @@ -95,7 +95,8 @@ CSRC = $(PORTSRC) \ $(OSALSRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ - $(CHIBIOS)/os/various/chprintf.c \ + $(CHIBIOS)/os/hal/lib/streams/memstreams.c \ + $(CHIBIOS)/os/hal/lib/streams/chprintf.c \ $(CHIBIOS)/os/various/shell.c \ main.c diff --git a/demos/SPC5/RT-SPC560D-EVB/Makefile b/demos/SPC5/RT-SPC560D-EVB/Makefile index 210bcd1be..9a921552f 100644 --- a/demos/SPC5/RT-SPC560D-EVB/Makefile +++ b/demos/SPC5/RT-SPC560D-EVB/Makefile @@ -95,7 +95,8 @@ CSRC = $(PORTSRC) \ $(OSALSRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ - $(CHIBIOS)/os/various/chprintf.c \ + $(CHIBIOS)/os/hal/lib/streams/memstreams.c \ + $(CHIBIOS)/os/hal/lib/streams/chprintf.c \ $(CHIBIOS)/os/various/shell.c \ main.c diff --git a/demos/SPC5/RT-SPC560P-EVB/Makefile b/demos/SPC5/RT-SPC560P-EVB/Makefile index c20e65a77..766196a2f 100644 --- a/demos/SPC5/RT-SPC560P-EVB/Makefile +++ b/demos/SPC5/RT-SPC560P-EVB/Makefile @@ -95,7 +95,8 @@ CSRC = $(PORTSRC) \ $(OSALSRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ - $(CHIBIOS)/os/various/chprintf.c \ + $(CHIBIOS)/os/hal/lib/streams/memstreams.c \ + $(CHIBIOS)/os/hal/lib/streams/chprintf.c \ $(CHIBIOS)/os/various/shell.c \ main.c diff --git a/demos/SPC5/RT-SPC563M-EVB/Makefile b/demos/SPC5/RT-SPC563M-EVB/Makefile index 2e6f3734d..b5138e155 100644 --- a/demos/SPC5/RT-SPC563M-EVB/Makefile +++ b/demos/SPC5/RT-SPC563M-EVB/Makefile @@ -95,7 +95,8 @@ CSRC = $(PORTSRC) \ $(OSALSRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ - $(CHIBIOS)/os/various/chprintf.c \ + $(CHIBIOS)/os/hal/lib/streams/memstreams.c \ + $(CHIBIOS)/os/hal/lib/streams/chprintf.c \ $(CHIBIOS)/os/various/shell.c \ main.c diff --git a/demos/SPC5/RT-SPC564A-EVB/Makefile b/demos/SPC5/RT-SPC564A-EVB/Makefile index e72a00878..474bc259a 100644 --- a/demos/SPC5/RT-SPC564A-EVB/Makefile +++ b/demos/SPC5/RT-SPC564A-EVB/Makefile @@ -95,7 +95,8 @@ CSRC = $(PORTSRC) \ $(OSALSRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ - $(CHIBIOS)/os/various/chprintf.c \ + $(CHIBIOS)/os/hal/lib/streams/memstreams.c \ + $(CHIBIOS)/os/hal/lib/streams/chprintf.c \ $(CHIBIOS)/os/various/shell.c \ main.c diff --git a/demos/SPC5/RT-SPC56EC-EVB/Makefile b/demos/SPC5/RT-SPC56EC-EVB/Makefile index 9a18d1f05..55f1333a4 100644 --- a/demos/SPC5/RT-SPC56EC-EVB/Makefile +++ b/demos/SPC5/RT-SPC56EC-EVB/Makefile @@ -95,7 +95,8 @@ CSRC = $(PORTSRC) \ $(OSALSRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ - $(CHIBIOS)/os/various/chprintf.c \ + $(CHIBIOS)/os/hal/lib/streams/memstreams.c \ + $(CHIBIOS)/os/hal/lib/streams/chprintf.c \ $(CHIBIOS)/os/various/shell.c \ main.c diff --git a/demos/SPC5/RT-SPC56EL-EVB/Makefile b/demos/SPC5/RT-SPC56EL-EVB/Makefile index db3ac54fd..6df79a954 100644 --- a/demos/SPC5/RT-SPC56EL-EVB/Makefile +++ b/demos/SPC5/RT-SPC56EL-EVB/Makefile @@ -95,7 +95,8 @@ CSRC = $(PORTSRC) \ $(OSALSRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ - $(CHIBIOS)/os/various/chprintf.c \ + $(CHIBIOS)/os/hal/lib/streams/memstreams.c \ + $(CHIBIOS)/os/hal/lib/streams/chprintf.c \ $(CHIBIOS)/os/various/shell.c \ main.c diff --git a/demos/STM32/CMSIS-STM32F407-DISCOVERY/.cproject b/demos/STM32/CMSIS-STM32F407-DISCOVERY/.cproject index a1d0ba157..914646b39 100644 --- a/demos/STM32/CMSIS-STM32F407-DISCOVERY/.cproject +++ b/demos/STM32/CMSIS-STM32F407-DISCOVERY/.cproject @@ -1,7 +1,5 @@ - - - + diff --git a/demos/STM32/NIL-STM32F303-DISCOVERY/.cproject b/demos/STM32/NIL-STM32F303-DISCOVERY/.cproject index a32ef55e6..80e5e6c26 100644 --- a/demos/STM32/NIL-STM32F303-DISCOVERY/.cproject +++ b/demos/STM32/NIL-STM32F303-DISCOVERY/.cproject @@ -1,7 +1,5 @@ - - - + @@ -42,6 +40,8 @@ + + @@ -54,16 +54,6 @@ - - - - - - - - - - @@ -94,36 +84,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -208,6 +168,4 @@ - - diff --git a/demos/STM32/RT-STM32F072-DISCOVERY/Makefile b/demos/STM32/RT-STM32F072-DISCOVERY/Makefile index b0b36edb2..b720144f4 100644 --- a/demos/STM32/RT-STM32F072-DISCOVERY/Makefile +++ b/demos/STM32/RT-STM32F072-DISCOVERY/Makefile @@ -97,7 +97,8 @@ CSRC = $(PORTSRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ $(CHIBIOS)/os/various/shell.c \ - $(CHIBIOS)/os/various/chprintf.c \ + $(CHIBIOS)/os/hal/lib/streams/memstreams.c \ + $(CHIBIOS)/os/hal/lib/streams/chprintf.c \ main.c # C++ sources that can be compiled in ARM or THUMB mode depending on the global diff --git a/demos/STM32/RT-STM32F103-MAPLEMINI/Makefile b/demos/STM32/RT-STM32F103-MAPLEMINI/Makefile index 43e141ff8..ffc408a30 100644 --- a/demos/STM32/RT-STM32F103-MAPLEMINI/Makefile +++ b/demos/STM32/RT-STM32F103-MAPLEMINI/Makefile @@ -109,7 +109,8 @@ CSRC = $(PORTSRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ $(CHIBIOS)/os/various/shell.c \ - $(CHIBIOS)/os/various/chprintf.c \ + $(CHIBIOS)/os/hal/lib/streams/memstreams.c \ + $(CHIBIOS)/os/hal/lib/streams/chprintf.c \ usbcfg.c main.c # C++ sources that can be compiled in ARM or THUMB mode depending on the global diff --git a/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/Makefile b/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/Makefile index fac6c60c9..4f20569a9 100644 --- a/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/Makefile +++ b/demos/STM32/RT-STM32F103_INEMO_DISCOVERY/Makefile @@ -102,7 +102,8 @@ CSRC = $(PORTSRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ $(CHIBIOS)/os/various/shell.c \ - $(CHIBIOS)/os/various/chprintf.c \ + $(CHIBIOS)/os/hal/lib/streams/memstreams.c \ + $(CHIBIOS)/os/hal/lib/streams/chprintf.c \ usbcfg.c main.c # C++ sources that can be compiled in ARM or THUMB mode depending on the global diff --git a/demos/STM32/RT-STM32F401RE-NUCLEO/.cproject b/demos/STM32/RT-STM32F401RE-NUCLEO/.cproject index 1dd60e086..ad4a2d0ab 100644 --- a/demos/STM32/RT-STM32F401RE-NUCLEO/.cproject +++ b/demos/STM32/RT-STM32F401RE-NUCLEO/.cproject @@ -1,7 +1,5 @@ - - - + diff --git a/demos/STM32/RT-STM32F407-DISCOVERY-G++/Makefile b/demos/STM32/RT-STM32F407-DISCOVERY-G++/Makefile index 8d16de8c1..9b0322826 100644 --- a/demos/STM32/RT-STM32F407-DISCOVERY-G++/Makefile +++ b/demos/STM32/RT-STM32F407-DISCOVERY-G++/Makefile @@ -104,7 +104,8 @@ CSRC = $(PORTSRC) \ $(BOARDSRC) \ $(CHIBIOS)/os/various/devices_lib/accel/lis302dl.c \ $(CHIBIOS)/os/various/shell.c \ - $(CHIBIOS)/os/various/chprintf.c \ + $(CHIBIOS)/os/hal/lib/streams/memstreams.c \ + $(CHIBIOS)/os/hal/lib/streams/chprintf.c \ $(CHIBIOS)/os/various/syscalls.c \ # C++ sources that can be compiled in ARM or THUMB mode depending on the global diff --git a/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/Makefile b/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/Makefile index c8fefbd85..8e87a7212 100644 --- a/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/Makefile +++ b/demos/STM32/RT-STM32F407-DISCOVERY-MEMS/Makefile @@ -103,7 +103,8 @@ CSRC = $(PORTSRC) \ $(BOARDSRC) \ $(CHIBIOS)/os/various/devices_lib/accel/lis302dl.c \ $(CHIBIOS)/os/various/shell.c \ - $(CHIBIOS)/os/various/chprintf.c \ + $(CHIBIOS)/os/hal/lib/streams/memstreams.c \ + $(CHIBIOS)/os/hal/lib/streams/chprintf.c \ usbcfg.c main.c # C++ sources that can be compiled in ARM or THUMB mode depending on the global diff --git a/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/Makefile b/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/Makefile index e4cc74c07..d8f029d0e 100644 --- a/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/Makefile +++ b/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/Makefile @@ -106,7 +106,8 @@ CSRC = $(PORTSRC) \ $(LWSRC) \ $(FATFSSRC) \ $(CHIBIOS)/os/various/evtimer.c \ - $(CHIBIOS)/os/various/chprintf.c \ + $(CHIBIOS)/os/hal/lib/streams/memstreams.c \ + $(CHIBIOS)/os/hal/lib/streams/chprintf.c \ $(CHIBIOS)/os/various/shell.c \ web/web.c main.c diff --git a/demos/STM32/RT-STM32F429-DISCOVERY/Makefile b/demos/STM32/RT-STM32F429-DISCOVERY/Makefile index 453a2f150..b9f550e11 100644 --- a/demos/STM32/RT-STM32F429-DISCOVERY/Makefile +++ b/demos/STM32/RT-STM32F429-DISCOVERY/Makefile @@ -102,7 +102,8 @@ CSRC = $(PORTSRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ $(CHIBIOS)/os/various/shell.c \ - $(CHIBIOS)/os/various/chprintf.c \ + $(CHIBIOS)/os/hal/lib/streams/memstreams.c \ + $(CHIBIOS)/os/hal/lib/streams/chprintf.c \ usbcfg.c main.c # C++ sources that can be compiled in ARM or THUMB mode depending on the global diff --git a/demos/various/RT-Win32-Simulator/Makefile b/demos/various/RT-Win32-Simulator/Makefile index 7621091b1..5723fb09f 100644 --- a/demos/various/RT-Win32-Simulator/Makefile +++ b/demos/various/RT-Win32-Simulator/Makefile @@ -58,12 +58,12 @@ UADEFS = # Imported source files CHIBIOS = ../../.. include $(CHIBIOS)/os/hal/boards/simulator/board.mk -include ${CHIBIOS}/os/hal/hal.mk -include ${CHIBIOS}/os/hal/ports/simulator/win32/platform.mk +include $(CHIBIOS)/os/hal/hal.mk +include $(CHIBIOS)/os/hal/ports/simulator/win32/platform.mk include $(CHIBIOS)/os/hal/osal/rt/osal.mk -include ${CHIBIOS}/os/rt/ports/SIMIA32/compilers/GCC/port.mk -include ${CHIBIOS}/os/rt/rt.mk -include ${CHIBIOS}/test/rt/test.mk +include $(CHIBIOS)/os/rt/ports/SIMIA32/compilers/GCC/port.mk +include $(CHIBIOS)/os/rt/rt.mk +include $(CHIBIOS)/test/rt/test.mk # List C source files here SRC = $(PORTSRC) \ @@ -73,9 +73,9 @@ SRC = $(PORTSRC) \ $(OSALSRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ - ${CHIBIOS}/os/various/shell.c \ - ${CHIBIOS}/os/various/memstreams.c \ - ${CHIBIOS}/os/various/chprintf.c \ + $(CHIBIOS)/os/various/shell.c \ + $(CHIBIOS)/os/hal/lib/streams/memstreams.c \ + $(CHIBIOS)/os/hal/lib/streams/chprintf.c \ main.c # List ASM source files here @@ -84,7 +84,7 @@ ASRC = # List all user directories here UINCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \ $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \ - ${CHIBIOS}/os/various + $(CHIBIOS)/os/various # List the user directory to look for the libraries here ULIBDIR = @@ -99,7 +99,6 @@ OPT = -ggdb -O2 -fomit-frame-pointer # End of user defines ############################################################################################## - INCDIR = $(patsubst %,-I%,$(DINCDIR) $(UINCDIR)) LIBDIR = $(patsubst %,-L%,$(DLIBDIR) $(ULIBDIR)) DEFS = $(DDEFS) $(UDEFS) -- cgit v1.2.3