diff --git a/demos/SPC5/NIL-SPC560D-EVB/Makefile b/demos/SPC5/NIL-SPC560D-EVB/Makefile
index c28094040..4feb3a5c5 100644
--- a/demos/SPC5/NIL-SPC560D-EVB/Makefile
+++ b/demos/SPC5/NIL-SPC560D-EVB/Makefile
@@ -103,6 +103,7 @@ LDSCRIPT= $(STARTUPLD)/SPC560D40.ld
 # C sources here.
 CSRC = $(STARTUPSRC) \
        $(KERNSRC) \
+       $(LIBSRC) \
        $(PORTSRC) \
        $(OSALSRC) \
        $(HALSRC) \
@@ -119,7 +120,7 @@ ASMSRC =
 ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
 
 INCDIR = $(CHIBIOS)/os/license \
-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
+         $(STARTUPINC) $(KERNINC) $(LIBINC) $(PORTINC) $(OSALINC) \
          $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
          $(CHIBIOS)/os/various
 
diff --git a/demos/SPC5/NIL-SPC560D-EVB/main.c b/demos/SPC5/NIL-SPC560D-EVB/main.c
index 52e216f27..db2cc7a7f 100644
--- a/demos/SPC5/NIL-SPC560D-EVB/main.c
+++ b/demos/SPC5/NIL-SPC560D-EVB/main.c
@@ -123,7 +123,6 @@ THD_FUNCTION(Thread2, arg) {
  */
 THD_TABLE_BEGIN
   THD_TABLE_THREAD(0, "blinker",      waThread1,       Thread1,      NULL)
-  THD_TABLE_THREAD(1, "test_support", wa_test_support, test_support, (void *)&nil.threads[2])
   THD_TABLE_THREAD(2, "tester",       waThread2,       Thread2,      NULL)
 THD_TABLE_END
 
diff --git a/demos/SPC5/RT-SPC560B-EVB/Makefile b/demos/SPC5/RT-SPC560B-EVB/Makefile
index dd19139f6..3ce0defcd 100644
--- a/demos/SPC5/RT-SPC560B-EVB/Makefile
+++ b/demos/SPC5/RT-SPC560B-EVB/Makefile
@@ -82,6 +82,12 @@ PROJECT = ch
 
 # Imported source files and paths
 CHIBIOS = ../../..
+CONFDIR  := .
+BUILDDIR := ./build
+DEPDIR   := ./.dep
+
+# Licensing files.
+include $(CHIBIOS)/os/license/license.mk
 # Startup files.
 include $(CHIBIOS)/os/common/startup/e200/compilers/GCC/mk/startup_spc560bxx.mk
 # HAL-OSAL files (optional).
@@ -103,29 +109,18 @@ include $(CHIBIOS)/os/various/shell/shell.mk
 LDSCRIPT= $(STARTUPLD)/SPC560B60.ld
 
 # C sources here.
-CSRC = $(STARTUPSRC) \
-       $(KERNSRC) \
-       $(PORTSRC) \
-       $(OSALSRC) \
-       $(HALSRC) \
-       $(PLATFORMSRC) \
-       $(BOARDSRC) \
+CSRC = $(ALLCSRC) \
        $(TESTSRC) \
-       $(STREAMSSRC) \
-       $(SHELLSRC) \
        main.c
 
 # C++ sources here.
-CPPSRC =
+CPPSRC = $(ALLCPPSRC)
 
 # List ASM source files here
-ASMSRC =
-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
+ASMSRC = $(ALLASMSRC)
+ASMXSRC = $(ALLXASMSRC)
 
-INCDIR = $(CHIBIOS)/os/license \
-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
-         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
-         $(STREAMSINC) $(SHELLINC)
+INCDIR = $(ALLINC) $(TESTINC) $(CONFDIR)
 
 #
 # Project, sources and paths
diff --git a/demos/SPC5/RT-SPC560D-EVB/Makefile-ht b/demos/SPC5/RT-SPC560D-EVB/Makefile-ht
index d39994436..fda60bc9c 100644
--- a/demos/SPC5/RT-SPC560D-EVB/Makefile-ht
+++ b/demos/SPC5/RT-SPC560D-EVB/Makefile-ht
@@ -153,7 +153,7 @@ ULIBS =
 # Compiler settings
 #
 
-MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames # HighTec
+MCU  = e200zx -meabi -msdata=none -mregnames # HighTec
 #MCU  = e200z4 -meabi -msdata=none -mregnames # Free GCC
 
 TRGT = ppc-vle-
diff --git a/demos/SPC5/RT-SPC560P-EVB/Makefile b/demos/SPC5/RT-SPC560P-EVB/Makefile
index 2636d1633..a89e82977 100644
--- a/demos/SPC5/RT-SPC560P-EVB/Makefile
+++ b/demos/SPC5/RT-SPC560P-EVB/Makefile
@@ -82,6 +82,12 @@ PROJECT = ch
 
 # Imported source files and paths
 CHIBIOS = ../../..
+CONFDIR  := .
+BUILDDIR := ./build
+DEPDIR   := ./.dep
+
+# Licensing files.
+include $(CHIBIOS)/os/license/license.mk
 # Startup files.
 include $(CHIBIOS)/os/common/startup/e200/compilers/GCC/mk/startup_spc560pxx.mk
 # HAL-OSAL files (optional).
@@ -103,29 +109,18 @@ include $(CHIBIOS)/os/various/shell/shell.mk
 LDSCRIPT= $(STARTUPLD)/SPC560P50.ld
 
 # C sources here.
-CSRC = $(STARTUPSRC) \
-       $(KERNSRC) \
-       $(PORTSRC) \
-       $(OSALSRC) \
-       $(HALSRC) \
-       $(PLATFORMSRC) \
-       $(BOARDSRC) \
+CSRC = $(ALLCSRC) \
        $(TESTSRC) \
-       $(STREAMSSRC) \
-       $(SHELLSRC) \
        main.c
 
 # C++ sources here.
 CPPSRC =
 
 # List ASM source files here
-ASMSRC =
-ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
+ASMSRC = $(ALLASMSRC)
+ASMXSRC = $(ALLXASMSRC)
 
-INCDIR = $(CHIBIOS)/os/license \
-         $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
-         $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
-         $(STREAMSINC) $(SHELLINC)
+INCDIR = $(ALLINC) $(TESTINC) $(CONFDIR)
 
 #
 # Project, sources and paths
diff --git a/demos/SPC5/RT-SPC56EC-EVB/Makefile-ht b/demos/SPC5/RT-SPC56EC-EVB/Makefile-ht
index e7f63682a..0114e96c1 100644
--- a/demos/SPC5/RT-SPC56EC-EVB/Makefile-ht
+++ b/demos/SPC5/RT-SPC56EC-EVB/Makefile-ht
@@ -153,7 +153,7 @@ ULIBS =
 # Compiler settings
 #
 
-MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames # HighTec
+MCU  = e200zx -meabi -msdata=none -mregnames # HighTec
 #MCU  = e200z4 -meabi -msdata=none -mregnames # Free GCC
 
 TRGT = ppc-vle-
diff --git a/demos/STM32/NIL-STM32F051-DISCOVERY/cfg/chconf.h b/demos/STM32/NIL-STM32F051-DISCOVERY/cfg/chconf.h
index f5cd52c69..8e285c4ad 100644
--- a/demos/STM32/NIL-STM32F051-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/NIL-STM32F051-DISCOVERY/cfg/chconf.h
@@ -47,7 +47,7 @@
  * @note    This values also defines the number of available priorities
  *          (0..CH_CFG_MAX_THREADS-1).
  */
-#define CH_CFG_MAX_THREADS                  4
+#define CH_CFG_MAX_THREADS                  5
 
 /**
  * @brief   Auto starts threads when @p chSysInit() is invoked.
diff --git a/demos/STM32/NIL-STM32F051-DISCOVERY/main.c b/demos/STM32/NIL-STM32F051-DISCOVERY/main.c
index 81becd95d..4b6766a4a 100644
--- a/demos/STM32/NIL-STM32F051-DISCOVERY/main.c
+++ b/demos/STM32/NIL-STM32F051-DISCOVERY/main.c
@@ -86,7 +86,6 @@ THD_FUNCTION(Thread3, arg) {
 THD_TABLE_BEGIN
   THD_TABLE_THREAD(0, "blinker1",     waThread1,       Thread1,      NULL)
   THD_TABLE_THREAD(1, "blinker2",     waThread2,       Thread2,      NULL)
-  THD_TABLE_THREAD(2, "test_support", wa_test_support, test_support, (void *)&nil.threads[3])
   THD_TABLE_THREAD(3, "tester",       waThread3,       Thread3,      NULL)
 THD_TABLE_END
 
diff --git a/demos/STM32/NIL-STM32F746G-DISCOVERY/cfg/chconf.h b/demos/STM32/NIL-STM32F746G-DISCOVERY/cfg/chconf.h
index fc5a69c3d..64f826fc6 100644
--- a/demos/STM32/NIL-STM32F746G-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/NIL-STM32F746G-DISCOVERY/cfg/chconf.h
@@ -47,7 +47,7 @@
  * @note    This values also defines the number of available priorities
  *          (0..CH_CFG_MAX_THREADS-1).
  */
-#define CH_CFG_MAX_THREADS                  3
+#define CH_CFG_MAX_THREADS                  4
 
 /**
  * @brief   Auto starts threads when @p chSysInit() is invoked.
diff --git a/demos/STM32/NIL-STM32F746G-DISCOVERY/main.c b/demos/STM32/NIL-STM32F746G-DISCOVERY/main.c
index 68295e948..58255f259 100644
--- a/demos/STM32/NIL-STM32F746G-DISCOVERY/main.c
+++ b/demos/STM32/NIL-STM32F746G-DISCOVERY/main.c
@@ -72,7 +72,6 @@ THD_FUNCTION(Thread2, arg) {
  */
 THD_TABLE_BEGIN
   THD_TABLE_THREAD(0, "blinker1",     waThread1,       Thread1,      NULL)
-  THD_TABLE_THREAD(1, "test_support", wa_test_support, test_support, (void *)&nil.threads[2])
   THD_TABLE_THREAD(2, "tester",       waThread2,       Thread2,      NULL)
 THD_TABLE_END
 
diff --git a/demos/STM32/NIL-STM32L476-DISCOVERY/cfg/chconf.h b/demos/STM32/NIL-STM32L476-DISCOVERY/cfg/chconf.h
index bd2e50a45..fe15db689 100644
--- a/demos/STM32/NIL-STM32L476-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/NIL-STM32L476-DISCOVERY/cfg/chconf.h
@@ -47,7 +47,7 @@
  * @note    This values also defines the number of available priorities
  *          (0..CH_CFG_MAX_THREADS-1).
  */
-#define CH_CFG_MAX_THREADS                  4
+#define CH_CFG_MAX_THREADS                  5
 
 /**
  * @brief   Auto starts threads when @p chSysInit() is invoked.
@@ -284,21 +284,21 @@
  *
  * @note    The default is @p FALSE.
  */
-#define CH_DBG_SYSTEM_STATE_CHECK           TRUE
+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE
 
 /**
  * @brief   Debug option, parameters checks.
  *
  * @note    The default is @p FALSE.
  */
-#define CH_DBG_ENABLE_CHECKS                TRUE
+#define CH_DBG_ENABLE_CHECKS                FALSE
 
 /**
  * @brief   System assertions.
  *
  * @note    The default is @p FALSE.
  */
-#define CH_DBG_ENABLE_ASSERTS               TRUE
+#define CH_DBG_ENABLE_ASSERTS               FALSE
 
 /**
  * @brief   Stack check.
diff --git a/demos/STM32/NIL-STM32L476-DISCOVERY/main.c b/demos/STM32/NIL-STM32L476-DISCOVERY/main.c
index d2224ccea..4a53c1d1d 100644
--- a/demos/STM32/NIL-STM32L476-DISCOVERY/main.c
+++ b/demos/STM32/NIL-STM32L476-DISCOVERY/main.c
@@ -83,7 +83,6 @@ THD_FUNCTION(Thread3, arg) {
 THD_TABLE_BEGIN
   THD_TABLE_THREAD(0, "blinker1",     waThread1,       Thread1,      NULL)
   THD_TABLE_THREAD(1, "blinker2",     waThread2,       Thread2,      NULL)
-  THD_TABLE_THREAD(2, "test_support", wa_test_support, test_support, (void *)&nil.threads[3])
   THD_TABLE_THREAD(3, "tester",       waThread3,       Thread3,      NULL)
 THD_TABLE_END
 
diff --git a/os/hal/ports/SPC5/LLD/SIUL_v1/hal_pal_lld.c b/os/hal/ports/SPC5/LLD/SIUL_v1/hal_pal_lld.c
index 07d14556f..3c977f88c 100644
--- a/os/hal/ports/SPC5/LLD/SIUL_v1/hal_pal_lld.c
+++ b/os/hal/ports/SPC5/LLD/SIUL_v1/hal_pal_lld.c
@@ -34,10 +34,13 @@
 /* Driver exported variables.                                                */
 /*===========================================================================*/
 
+#if (PAL_USE_WAIT == TRUE) || (PAL_USE_CALLBACKS == TRUE) ||                \
+    defined(__DOXYGEN__)
 /**
  * @brief   Event records (to be implemented).
  */
 palevent_t _pal_events[1];
+#endif
 
 /*===========================================================================*/
 /* Driver local variables and types.                                         */
diff --git a/os/hal/ports/SPC5/LLD/SIUL_v1/hal_pal_lld.h b/os/hal/ports/SPC5/LLD/SIUL_v1/hal_pal_lld.h
index d7871701e..3304fb059 100644
--- a/os/hal/ports/SPC5/LLD/SIUL_v1/hal_pal_lld.h
+++ b/os/hal/ports/SPC5/LLD/SIUL_v1/hal_pal_lld.h
@@ -443,8 +443,10 @@ typedef struct {
 
 #if !defined(__DOXYGEN__)
 extern const PALConfig pal_default_config;
+#if (PAL_USE_WAIT == TRUE) || (PAL_USE_CALLBACKS == TRUE)
 extern palevent_t _pal_events[1];
 #endif
+#endif
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/test/lib/ch_test.c b/test/lib/ch_test.c
index f7eb8f453..7c6253674 100644
--- a/test/lib/ch_test.c
+++ b/test/lib/ch_test.c
@@ -255,7 +255,7 @@ msg_t test_execute(BaseSequentialStream *stream, const testsuite_t *tsp) {
   test_print("*** Test Board:   ");
   test_println(BOARD_NAME);
 #endif
-#if defined(__GNUC__) && !defined(TEST_SUPPRESS_SIZE_REPORT)
+#if defined(TEST_SIZE_REPORT)
   {
     extern uint8_t __text_base, __text_end,
                    _data_start, _data_end,