5 files changed, 22 insertions, 19 deletions
diff --git a/demos/STM32/RT-STM32F030R8-NUCLEO/Makefile b/demos/STM32/RT-STM32F030R8-NUCLEO/Makefile
index 3eb564744..d77e0fa18 100644
--- a/demos/STM32/RT-STM32F030R8-NUCLEO/Makefile
+++ b/demos/STM32/RT-STM32F030R8-NUCLEO/Makefile
@@ -76,26 +76,32 @@ PROJECT = ch
 
 # Imported source files and paths
 CHIBIOS = ../../..
+# Startup files.
+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f0xx.mk
+# HAL-OSAL files (optional).
 include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/hal/boards/ST_NUCLEO_F030R8/board.mk
 include $(CHIBIOS)/os/hal/ports/STM32/STM32F0xx/platform.mk
+include $(CHIBIOS)/os/hal/boards/ST_NUCLEO_F030R8/board.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk
+# RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f0xx.mk
+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk
+# Other files (optional).
 include $(CHIBIOS)/test/rt/test.mk
 
 # Define linker script file here
-LDSCRIPT= $(PORTLD)/STM32F030x8.ld
+LDSCRIPT= $(STARTUPLD)/STM32F030x8.ld
 
 # C sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CSRC = $(PORTSRC) \
+CSRC = $(STARTUPSRC) \
        $(KERNSRC) \
-       $(TESTSRC) \
-       $(HALSRC) \
+       $(PORTSRC) \
        $(OSALSRC) \
+       $(HALSRC) \
        $(PLATFORMSRC) \
        $(BOARDSRC) \
+       $(TESTSRC) \
        main.c
 
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
@@ -123,10 +129,10 @@ TCSRC =
 TCPPSRC =
 
 # List ASM source files here
-ASMSRC = $(PORTASM)
+ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
 
-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
-         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \
+INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
+         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
          $(CHIBIOS)/os/various
 
 #
diff --git a/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/main.c b/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/main.c
index 0e38e87a1..fd5b942d1 100644
--- a/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/main.c
+++ b/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/main.c
@@ -591,7 +591,7 @@ static void RemoveHandler(eventid_t id) {
  * Green LED blinker thread, times are in milliseconds.
  */
 static THD_WORKING_AREA(waThread1, 128);
-static msg_t Thread1(void *arg) {
+static THD_FUNCTION(Thread1, arg) {
 
   (void)arg;
   chRegSetThreadName("blinker");
@@ -599,8 +599,6 @@ static msg_t Thread1(void *arg) {
     palTogglePad(GPIOC, GPIOC_LED);
     chThdSleepMilliseconds(fs_ready ? 125 : 500);
   }
-
-  return MSG_OK; /* warning suppressor */
 }
 
 /*
diff --git a/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/web/web.c b/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/web/web.c
index 1c0ea7c03..46aac872f 100644
--- a/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/web/web.c
+++ b/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/web/web.c
@@ -87,7 +87,7 @@ THD_WORKING_AREA(wa_http_server, WEB_THREAD_STACK_SIZE);
 /**
  * HTTP server thread.
  */
-msg_t http_server(void *p) {
+THD_FUNCTION(http_server, p) {
   struct netconn *conn, *newconn;
   err_t err;
 
@@ -96,7 +96,7 @@ msg_t http_server(void *p) {
 
   /* Create a new TCP connection handle */
   conn = netconn_new(NETCONN_TCP);
-  LWIP_ERROR("http_server: invalid conn", (conn != NULL), return MSG_RESET;);
+  LWIP_ERROR("http_server: invalid conn", (conn != NULL), chThdExit(MSG_RESET););
 
   /* Bind to port 80 (HTTP) with default IP address */
   netconn_bind(conn, NULL, WEB_THREAD_PORT);
@@ -107,14 +107,13 @@ msg_t http_server(void *p) {
   /* Goes to the final priority after initialization.*/
   chThdSetPriority(WEB_THREAD_PRIORITY);
 
-  while(1) {
+  while (true) {
     err = netconn_accept(conn, &newconn);
     if (err != ERR_OK)
       continue;
     http_server_serve(newconn);
     netconn_delete(newconn);
   }
-  return MSG_OK;
 }
 
 #endif /* LWIP_NETCONN */
diff --git a/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/web/web.h b/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/web/web.h
index 2764242d4..ed0fffd59 100644
--- a/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/web/web.h
+++ b/demos/STM32/RT-STM32F407-OLIMEX_E407-LWIP-FATFS-USB/web/web.h
@@ -41,7 +41,7 @@ extern THD_WORKING_AREA(wa_http_server, WEB_THREAD_STACK_SIZE);
 #ifdef __cplusplus
 extern "C" {
 #endif
-  msg_t http_server(void *p);
+  THD_FUNCTION(http_server, p);
 #ifdef __cplusplus
 }
 #endif
diff --git a/demos/STM32/RT-STM32F429-DISCOVERY/main.c b/demos/STM32/RT-STM32F429-DISCOVERY/main.c
index e0a371611..4c23d280a 100644
--- a/demos/STM32/RT-STM32F429-DISCOVERY/main.c
+++ b/demos/STM32/RT-STM32F429-DISCOVERY/main.c
@@ -27,7 +27,7 @@
  * Red LED blinker thread, times are in milliseconds.
  */
 static THD_WORKING_AREA(waThread1, 128);
-static msg_t Thread1(void *arg) {
+static THD_FUNCTION(Thread1, arg) {
 
   (void)arg;
   chRegSetThreadName("blinker1");
@@ -43,7 +43,7 @@ static msg_t Thread1(void *arg) {
  * Green LED blinker thread, times are in milliseconds.
  */
 static THD_WORKING_AREA(waThread2, 128);
-static msg_t Thread2(void *arg) {
+static THD_FUNCTION(Thread2, arg) {
 
   (void)arg;
   chRegSetThreadName("blinker2");