Sync ChibiOS demos with trunk system codebase

diff --git a/demos/chibios/apps/olimex_stm32_lcd_sd/Makefile b/demos/chibios/apps/olimex_stm32_lcd_sd/Makefile
index e32cf90f142fbf60810c1034252c42a1f969cea4..fcbef6a28c30ffefb5ae8793e226300a33c4bb3b 100644 (file)
--- a/demos/chibios/apps/olimex_stm32_lcd_sd/Makefile
+++ b/demos/chibios/apps/olimex_stm32_lcd_sd/Makefile
@@ -88,29 +88,35 @@ PROJECT = olimex_stm32_lcd_sd
 # Imported source files and paths\r
 include ../../boards/olimex_stm32_lcd/board.mk\r
 \r
+# Startup files.\r
+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f1xx.mk\r
+# HAL-OSAL files (optional).\r
 include $(CHIBIOS)/os/hal/hal.mk\r
 include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk\r
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk\r
+# RTOS files (optional).\r
 include $(CHIBIOS)/os/rt/rt.mk\r
-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk\r
+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk\r
+# Other files (optional).\r
 include $(CHIBIOS)/test/rt/test.mk\r
 \r
 # Define linker script file here\r
-LDSCRIPT = $(PORTLD)/STM32F103xD.ld\r
+LDSCRIPT= $(STARTUPLD)/STM32F103xD.ld\r
 \r
 # C sources that can be compiled in ARM or THUMB mode depending on the global\r
 # setting.\r
-CSRC = $(PORTSRC) \\r
+CSRC = $(STARTUPSRC) \\r
        $(KERNSRC) \\r
-       $(TESTSRC) \\r
-       $(HALSRC) \\r
+       $(PORTSRC) \\r
        $(OSALSRC) \\r
+       $(HALSRC) \\r
        $(PLATFORMSRC) \\r
        $(BOARDSRC) \\r
-       $(CHIBIOS)/os/various/chprintf.c \\r
+       $(TESTSRC) \\r
+       $(CHIBIOS)/os/hal/lib/streams/chprintf.c \\r
        $(CHIBIOS)/os/various/syscalls.c \\r
        main.c\r
-       \r
+\r
 CSRC += $(COMMON)/sdc_lwext4.c\r
 CSRC += $(COMMON)/test_lwext4.c\r
 CSRC += $(COMMON)/timings.c\r
@@ -140,11 +146,12 @@ TCSRC =
 TCPPSRC =\r
 \r
 # List ASM source files here\r
-ASMSRC = $(PORTASM)\r
+ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)\r
+\r
+INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \\r
+         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \\r
+         $(CHIBIOS)/os/various $(CHIBIOS)/os/hal/lib/streams\r
 \r
-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \\r
-         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \\r
-         $(CHIBIOS)/os/various\r
 \r
 #\r
 # Project, sources and paths\r

diff --git a/demos/chibios/apps/olimex_stm32_p107_sd/Makefile b/demos/chibios/apps/olimex_stm32_p107_sd/Makefile
index fe459ca91814495e7bb263efcf11bbd65368d520..32ac479eb43f07b6ec83a4f150cd6c6b53c081a9 100644 (file)
--- a/demos/chibios/apps/olimex_stm32_p107_sd/Makefile
+++ b/demos/chibios/apps/olimex_stm32_p107_sd/Makefile
@@ -88,29 +88,35 @@ PROJECT = olimex_stm32_p107_sd
 # Imported source files and paths\r
 include ../../boards/olimex_stm32_p107/board.mk\r
 \r
+# Startup files.\r
+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f1xx.mk\r
+# HAL-OSAL files (optional).\r
 include $(CHIBIOS)/os/hal/hal.mk\r
 include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk\r
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk\r
+# RTOS files (optional).\r
 include $(CHIBIOS)/os/rt/rt.mk\r
-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk\r
+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk\r
+# Other files (optional).\r
 include $(CHIBIOS)/test/rt/test.mk\r
 \r
 # Define linker script file here\r
-LDSCRIPT = $(PORTLD)/STM32F107xC.ld\r
+LDSCRIPT= $(STARTUPLD)/STM32F103xD.ld\r
 \r
 # C sources that can be compiled in ARM or THUMB mode depending on the global\r
 # setting.\r
-CSRC = $(PORTSRC) \\r
+CSRC = $(STARTUPSRC) \\r
        $(KERNSRC) \\r
-       $(TESTSRC) \\r
-       $(HALSRC) \\r
+       $(PORTSRC) \\r
        $(OSALSRC) \\r
+       $(HALSRC) \\r
        $(PLATFORMSRC) \\r
        $(BOARDSRC) \\r
-       $(CHIBIOS)/os/various/chprintf.c \\r
+       $(TESTSRC) \\r
+       $(CHIBIOS)/os/hal/lib/streams/chprintf.c \\r
        $(CHIBIOS)/os/various/syscalls.c \\r
        main.c\r
-       \r
+\r
 CSRC += $(COMMON)/spi_lwext4.c\r
 CSRC += $(COMMON)/test_lwext4.c\r
 CSRC += $(COMMON)/timings.c\r
@@ -140,11 +146,12 @@ TCSRC =
 TCPPSRC =\r
 \r
 # List ASM source files here\r
-ASMSRC = $(PORTASM)\r
+ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)\r
+\r
+INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \\r
+         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \\r
+         $(CHIBIOS)/os/various $(CHIBIOS)/os/hal/lib/streams\r
 \r
-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \\r
-         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \\r
-         $(CHIBIOS)/os/various\r
 \r
 #\r
 # Project, sources and paths\r

diff --git a/demos/chibios/apps/redbull_v1_sd/Makefile b/demos/chibios/apps/redbull_v1_sd/Makefile
index a6c370c24dbedce285072ce1ec9fc80922529bf6..6fb6d2b8fe70f5c91e8e3c26f961821f65d68e70 100644 (file)
--- a/demos/chibios/apps/redbull_v1_sd/Makefile
+++ b/demos/chibios/apps/redbull_v1_sd/Makefile
@@ -88,29 +88,35 @@ PROJECT = redbull_v1_sd
 # Imported source files and paths\r
 include ../../boards/redbull_v1/board.mk\r
 \r
+# Startup files.\r
+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f1xx.mk\r
+# HAL-OSAL files (optional).\r
 include $(CHIBIOS)/os/hal/hal.mk\r
 include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk\r
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk\r
+# RTOS files (optional).\r
 include $(CHIBIOS)/os/rt/rt.mk\r
-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f1xx.mk\r
+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk\r
+# Other files (optional).\r
 include $(CHIBIOS)/test/rt/test.mk\r
 \r
 # Define linker script file here\r
-LDSCRIPT = $(PORTLD)/STM32F103xD.ld\r
+LDSCRIPT= $(STARTUPLD)/STM32F103xD.ld\r
 \r
 # C sources that can be compiled in ARM or THUMB mode depending on the global\r
 # setting.\r
-CSRC = $(PORTSRC) \\r
+CSRC = $(STARTUPSRC) \\r
        $(KERNSRC) \\r
-       $(TESTSRC) \\r
-       $(HALSRC) \\r
+       $(PORTSRC) \\r
        $(OSALSRC) \\r
+       $(HALSRC) \\r
        $(PLATFORMSRC) \\r
        $(BOARDSRC) \\r
-       $(CHIBIOS)/os/various/chprintf.c \\r
+       $(TESTSRC) \\r
+       $(CHIBIOS)/os/hal/lib/streams/chprintf.c \\r
        $(CHIBIOS)/os/various/syscalls.c \\r
        main.c\r
-       \r
+\r
 CSRC += $(COMMON)/sdc_lwext4.c\r
 CSRC += $(COMMON)/test_lwext4.c\r
 CSRC += $(COMMON)/timings.c\r
@@ -140,12 +146,11 @@ TCSRC =
 TCPPSRC =\r
 \r
 # List ASM source files here\r
-ASMSRC = $(PORTASM)\r
-\r
-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \\r
-         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \\r
-         $(CHIBIOS)/os/various\r
+ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)\r
 \r
+INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \\r
+         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \\r
+         $(CHIBIOS)/os/various $(CHIBIOS)/os/hal/lib/streams\r
 #\r
 # Project, sources and paths\r
 ##############################################################################\r
@@ -194,7 +199,7 @@ CPPWARN = -Wall -Wextra
 #\r
 \r
 # List all user C define here, like -D_DEBUG=1\r
-UDEFS = -DSTDOUT_SD=SD1\r
+UDEFS = -DSTDOUT_SD=SD1 \r
 \r
 # Define ASM defines here\r
 UADEFS =\r

diff --git a/demos/chibios/apps/redbull_v1_sd/main.c b/demos/chibios/apps/redbull_v1_sd/main.c
index 1a49a72067d5b32c04173607008f75955b31bff0..c5b6d5547b0828c64ca998638abd5e8f936aa432 100644 (file)
--- a/demos/chibios/apps/redbull_v1_sd/main.c
+++ b/demos/chibios/apps/redbull_v1_sd/main.c
@@ -25,7 +25,6 @@ static THD_FUNCTION(led_task, arg)
         palClearPad(GPIOF, 6);\r
         chThdSleepMilliseconds(500);\r
     }\r
-    return 0;\r
 }\r
 \r
 #define TEST_DELAY_MS    1000\r