Mass update of configuration files.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12575 110e8d01-0319-4d1e-a829-52ad28d1bb01
author: Giovanni Di Sirio <gdisirio@gmail.com> 2019-01-21 21:11:16 +0000
committer: Giovanni Di Sirio <gdisirio@gmail.com> 2019-01-21 21:11:16 +0000
commit: e351308f44bb293075c1ba40d1757047ee644874 (patch)
tree: 901c90c8f8fa878ed69f1d7d3df62658cabbe7bc /demos
parent: 9d21d501b5356dd7b85e1e8600846cee5a611ee5 (diff)
download: ChibiOS-e351308f44bb293075c1ba40d1757047ee644874.tar.gz
ChibiOS-e351308f44bb293075c1ba40d1757047ee644874.tar.bz2
ChibiOS-e351308f44bb293075c1ba40d1757047ee644874.zip
210 files changed, 1475 insertions, 1480 deletions
diff --git a/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/cfg/chconf.h b/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/cfg/chconf.h
index d936ca751..78a5205f9 100755
--- a/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/cfg/chconf.h
+++ b/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
@@ -53,7 +53,6 @@
  */
 #if !defined(CH_CFG_ST_FREQUENCY)
 #define CH_CFG_ST_FREQUENCY                 10000
-//#define CH_CFG_ST_FREQUENCY                 (83000000 / 32) /* tick-less. */
 #endif
 
 /**
@@ -361,7 +360,7 @@
 #endif
 
 /**
- * @brief  Objects FIFOs APIs.
+ * @brief   Objects FIFOs APIs.
  * @details If enabled then the objects FIFOs APIs are included
  *          in the kernel.
  *
@@ -597,7 +596,7 @@
  * @details User initialization code added to the @p chSysInit() function
  *          just before interrupts are enabled globally.
  */
-#define CH_CFG_SYSTEM_INIT_HOOK(tp) {                                       \
+#define CH_CFG_SYSTEM_INIT_HOOK() {                                         \
   /* Add threads initialization code here.*/                                \
 }
 
diff --git a/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/cfg/halconf.h b/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/cfg/halconf.h
index c802ce49c..ecd2ade5c 100644
--- a/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/cfg/halconf.h
+++ b/demos/ATSAMA5D2/RT-SAMA5D2-XPLAINED/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/AVR/NIL-ARDUINO-MEGA/chconf.h b/demos/AVR/NIL-ARDUINO-MEGA/chconf.h
index 7393d6167..d523c3de2 100644
--- a/demos/AVR/NIL-ARDUINO-MEGA/chconf.h
+++ b/demos/AVR/NIL-ARDUINO-MEGA/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    nil/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
@@ -29,7 +29,7 @@
 #define CHCONF_H
 
 #define _CHIBIOS_NIL_CONF_
-#define _CHIBIOS_NIL_CONF_VER_3_0_
+#define _CHIBIOS_NIL_CONF_VER_3_2_
 
 /*===========================================================================*/
 /**
diff --git a/demos/AVR/NIL-ARDUINO-MEGA/halconf.h b/demos/AVR/NIL-ARDUINO-MEGA/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/AVR/NIL-ARDUINO-MEGA/halconf.h
+++ b/demos/AVR/NIL-ARDUINO-MEGA/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/AVR/NIL-ARDUINO-MINI/chconf.h b/demos/AVR/NIL-ARDUINO-MINI/chconf.h
index e7ba7c007..91ba353a8 100644
--- a/demos/AVR/NIL-ARDUINO-MINI/chconf.h
+++ b/demos/AVR/NIL-ARDUINO-MINI/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    nil/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
@@ -29,7 +29,7 @@
 #define CHCONF_H
 
 #define _CHIBIOS_NIL_CONF_
-#define _CHIBIOS_NIL_CONF_VER_3_0_
+#define _CHIBIOS_NIL_CONF_VER_3_2_
 
 /*===========================================================================*/
 /**
diff --git a/demos/AVR/NIL-ARDUINO-MINI/halconf.h b/demos/AVR/NIL-ARDUINO-MINI/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/AVR/NIL-ARDUINO-MINI/halconf.h
+++ b/demos/AVR/NIL-ARDUINO-MINI/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/AVR/NIL-ARDUINO-NANO/chconf.h b/demos/AVR/NIL-ARDUINO-NANO/chconf.h
index 7393d6167..d523c3de2 100644
--- a/demos/AVR/NIL-ARDUINO-NANO/chconf.h
+++ b/demos/AVR/NIL-ARDUINO-NANO/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    nil/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
@@ -29,7 +29,7 @@
 #define CHCONF_H
 
 #define _CHIBIOS_NIL_CONF_
-#define _CHIBIOS_NIL_CONF_VER_3_0_
+#define _CHIBIOS_NIL_CONF_VER_3_2_
 
 /*===========================================================================*/
 /**
diff --git a/demos/AVR/NIL-ARDUINO-NANO/halconf.h b/demos/AVR/NIL-ARDUINO-NANO/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/AVR/NIL-ARDUINO-NANO/halconf.h
+++ b/demos/AVR/NIL-ARDUINO-NANO/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/AVR/NIL-ARDUINO-UNO/chconf.h b/demos/AVR/NIL-ARDUINO-UNO/chconf.h
index 7393d6167..d523c3de2 100644
--- a/demos/AVR/NIL-ARDUINO-UNO/chconf.h
+++ b/demos/AVR/NIL-ARDUINO-UNO/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    nil/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
@@ -29,7 +29,7 @@
 #define CHCONF_H
 
 #define _CHIBIOS_NIL_CONF_
-#define _CHIBIOS_NIL_CONF_VER_3_0_
+#define _CHIBIOS_NIL_CONF_VER_3_2_
 
 /*===========================================================================*/
 /**
diff --git a/demos/AVR/NIL-ARDUINO-UNO/halconf.h b/demos/AVR/NIL-ARDUINO-UNO/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/AVR/NIL-ARDUINO-UNO/halconf.h
+++ b/demos/AVR/NIL-ARDUINO-UNO/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/AVR/NIL-DIGISPARK-ATTINY-167/chconf.h b/demos/AVR/NIL-DIGISPARK-ATTINY-167/chconf.h
index 08e97d0b5..dfd77b7ce 100644
--- a/demos/AVR/NIL-DIGISPARK-ATTINY-167/chconf.h
+++ b/demos/AVR/NIL-DIGISPARK-ATTINY-167/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    nil/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
@@ -29,7 +29,7 @@
 #define CHCONF_H
 
 #define _CHIBIOS_NIL_CONF_
-#define _CHIBIOS_NIL_CONF_VER_3_0_
+#define _CHIBIOS_NIL_CONF_VER_3_2_
 
 /*===========================================================================*/
 /**
diff --git a/demos/AVR/NIL-DIGISPARK-ATTINY-167/halconf.h b/demos/AVR/NIL-DIGISPARK-ATTINY-167/halconf.h
index 9780b95b9..bdd0e412c 100644
--- a/demos/AVR/NIL-DIGISPARK-ATTINY-167/halconf.h
+++ b/demos/AVR/NIL-DIGISPARK-ATTINY-167/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/AVR/NIL-MT-DB-X4/chconf.h b/demos/AVR/NIL-MT-DB-X4/chconf.h
index a0237e7e6..6328fe918 100644
--- a/demos/AVR/NIL-MT-DB-X4/chconf.h
+++ b/demos/AVR/NIL-MT-DB-X4/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    nil/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
@@ -29,7 +29,7 @@
 #define CHCONF_H
 
 #define _CHIBIOS_NIL_CONF_
-#define _CHIBIOS_NIL_CONF_VER_3_0_
+#define _CHIBIOS_NIL_CONF_VER_3_2_
 
 /*===========================================================================*/
 /**
diff --git a/demos/AVR/NIL-MT-DB-X4/halconf.h b/demos/AVR/NIL-MT-DB-X4/halconf.h
index 55a7e420c..5698a3dde 100644
--- a/demos/AVR/NIL-MT-DB-X4/halconf.h
+++ b/demos/AVR/NIL-MT-DB-X4/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/AVR/RT-ARDUINO-LEONARDO/chconf.h b/demos/AVR/RT-ARDUINO-LEONARDO/chconf.h
index ef0b1ada9..fef4050a1 100644
--- a/demos/AVR/RT-ARDUINO-LEONARDO/chconf.h
+++ b/demos/AVR/RT-ARDUINO-LEONARDO/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/AVR/RT-ARDUINO-LEONARDO/halconf.h b/demos/AVR/RT-ARDUINO-LEONARDO/halconf.h
index 7d5863d9f..05f996432 100644
--- a/demos/AVR/RT-ARDUINO-LEONARDO/halconf.h
+++ b/demos/AVR/RT-ARDUINO-LEONARDO/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/AVR/RT-ARDUINO-MEGA/chconf.h b/demos/AVR/RT-ARDUINO-MEGA/chconf.h
index ef0b1ada9..fef4050a1 100644
--- a/demos/AVR/RT-ARDUINO-MEGA/chconf.h
+++ b/demos/AVR/RT-ARDUINO-MEGA/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/AVR/RT-ARDUINO-MEGA/halconf.h b/demos/AVR/RT-ARDUINO-MEGA/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/AVR/RT-ARDUINO-MEGA/halconf.h
+++ b/demos/AVR/RT-ARDUINO-MEGA/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/AVR/RT-ARDUINO-MINI/chconf.h b/demos/AVR/RT-ARDUINO-MINI/chconf.h
index ef0b1ada9..fef4050a1 100644
--- a/demos/AVR/RT-ARDUINO-MINI/chconf.h
+++ b/demos/AVR/RT-ARDUINO-MINI/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/AVR/RT-ARDUINO-MINI/halconf.h b/demos/AVR/RT-ARDUINO-MINI/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/AVR/RT-ARDUINO-MINI/halconf.h
+++ b/demos/AVR/RT-ARDUINO-MINI/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/AVR/RT-ARDUINO-NANO/chconf.h b/demos/AVR/RT-ARDUINO-NANO/chconf.h
index ef0b1ada9..fef4050a1 100644
--- a/demos/AVR/RT-ARDUINO-NANO/chconf.h
+++ b/demos/AVR/RT-ARDUINO-NANO/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/AVR/RT-ARDUINO-NANO/halconf.h b/demos/AVR/RT-ARDUINO-NANO/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/AVR/RT-ARDUINO-NANO/halconf.h
+++ b/demos/AVR/RT-ARDUINO-NANO/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/AVR/RT-ARDUINO-UNO/chconf.h b/demos/AVR/RT-ARDUINO-UNO/chconf.h
index ef0b1ada9..fef4050a1 100644
--- a/demos/AVR/RT-ARDUINO-UNO/chconf.h
+++ b/demos/AVR/RT-ARDUINO-UNO/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/AVR/RT-ARDUINO-UNO/halconf.h b/demos/AVR/RT-ARDUINO-UNO/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/AVR/RT-ARDUINO-UNO/halconf.h
+++ b/demos/AVR/RT-ARDUINO-UNO/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/AVR/RT-DIGISPARK-ATTINY-167/chconf.h b/demos/AVR/RT-DIGISPARK-ATTINY-167/chconf.h
index 627ac1062..c7942e8f6 100644
--- a/demos/AVR/RT-DIGISPARK-ATTINY-167/chconf.h
+++ b/demos/AVR/RT-DIGISPARK-ATTINY-167/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/AVR/RT-DIGISPARK-ATTINY-167/halconf.h b/demos/AVR/RT-DIGISPARK-ATTINY-167/halconf.h
index 9780b95b9..bdd0e412c 100644
--- a/demos/AVR/RT-DIGISPARK-ATTINY-167/halconf.h
+++ b/demos/AVR/RT-DIGISPARK-ATTINY-167/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/AVR/RT-MT-DB-X4/chconf.h b/demos/AVR/RT-MT-DB-X4/chconf.h
index 0d1f94c44..0f1b50780 100644
--- a/demos/AVR/RT-MT-DB-X4/chconf.h
+++ b/demos/AVR/RT-MT-DB-X4/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/AVR/RT-MT-DB-X4/halconf.h b/demos/AVR/RT-MT-DB-X4/halconf.h
index 55a7e420c..5698a3dde 100644
--- a/demos/AVR/RT-MT-DB-X4/halconf.h
+++ b/demos/AVR/RT-MT-DB-X4/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/AVR/RT-PRO-MICRO/chconf.h b/demos/AVR/RT-PRO-MICRO/chconf.h
index ef0b1ada9..fef4050a1 100644
--- a/demos/AVR/RT-PRO-MICRO/chconf.h
+++ b/demos/AVR/RT-PRO-MICRO/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/AVR/RT-PRO-MICRO/halconf.h b/demos/AVR/RT-PRO-MICRO/halconf.h
index 7d5863d9f..05f996432 100644
--- a/demos/AVR/RT-PRO-MICRO/halconf.h
+++ b/demos/AVR/RT-PRO-MICRO/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/AVR/RT-TEENSY2-USB/chconf.h b/demos/AVR/RT-TEENSY2-USB/chconf.h
index 32d86c11c..6b6cb8690 100644
--- a/demos/AVR/RT-TEENSY2-USB/chconf.h
+++ b/demos/AVR/RT-TEENSY2-USB/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/AVR/RT-TEENSY2-USB/halconf.h b/demos/AVR/RT-TEENSY2-USB/halconf.h
index 8b08a4bdc..7e606ff29 100644
--- a/demos/AVR/RT-TEENSY2-USB/halconf.h
+++ b/demos/AVR/RT-TEENSY2-USB/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/AVR/TEST-SUITE-NIL/chconf.h b/demos/AVR/TEST-SUITE-NIL/chconf.h
index 04a265a0a..68d27b78c 100644
--- a/demos/AVR/TEST-SUITE-NIL/chconf.h
+++ b/demos/AVR/TEST-SUITE-NIL/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    nil/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
@@ -29,7 +29,7 @@
 #define CHCONF_H
 
 #define _CHIBIOS_NIL_CONF_
-#define _CHIBIOS_NIL_CONF_VER_3_0_
+#define _CHIBIOS_NIL_CONF_VER_3_2_
 
 /*===========================================================================*/
 /**
diff --git a/demos/AVR/TEST-SUITE-NIL/halconf.h b/demos/AVR/TEST-SUITE-NIL/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/AVR/TEST-SUITE-NIL/halconf.h
+++ b/demos/AVR/TEST-SUITE-NIL/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/AVR/TEST-SUITE-OSLIB/chconf.h b/demos/AVR/TEST-SUITE-OSLIB/chconf.h
index ef0b1ada9..fef4050a1 100644
--- a/demos/AVR/TEST-SUITE-OSLIB/chconf.h
+++ b/demos/AVR/TEST-SUITE-OSLIB/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/AVR/TEST-SUITE-OSLIB/halconf.h b/demos/AVR/TEST-SUITE-OSLIB/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/AVR/TEST-SUITE-OSLIB/halconf.h
+++ b/demos/AVR/TEST-SUITE-OSLIB/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/AVR/TEST-SUITE-RT/chconf.h b/demos/AVR/TEST-SUITE-RT/chconf.h
index ef0b1ada9..fef4050a1 100644
--- a/demos/AVR/TEST-SUITE-RT/chconf.h
+++ b/demos/AVR/TEST-SUITE-RT/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/AVR/TEST-SUITE-RT/halconf.h b/demos/AVR/TEST-SUITE-RT/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/AVR/TEST-SUITE-RT/halconf.h
+++ b/demos/AVR/TEST-SUITE-RT/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/LPC21xx/RT-LPC214x-OLIMEX/chconf.h b/demos/LPC21xx/RT-LPC214x-OLIMEX/chconf.h
index a7b292fa7..864640bc1 100644
--- a/demos/LPC21xx/RT-LPC214x-OLIMEX/chconf.h
+++ b/demos/LPC21xx/RT-LPC214x-OLIMEX/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/LPC21xx/RT-LPC214x-OLIMEX/halconf.h b/demos/LPC21xx/RT-LPC214x-OLIMEX/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/LPC21xx/RT-LPC214x-OLIMEX/halconf.h
+++ b/demos/LPC21xx/RT-LPC214x-OLIMEX/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/SPC5/NIL-SPC560D-EVB/chconf.h b/demos/SPC5/NIL-SPC560D-EVB/chconf.h
index 3ffd3ceae..7efabe727 100644
--- a/demos/SPC5/NIL-SPC560D-EVB/chconf.h
+++ b/demos/SPC5/NIL-SPC560D-EVB/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    nil/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
@@ -29,7 +29,7 @@
 #define CHCONF_H
 
 #define _CHIBIOS_NIL_CONF_
-#define _CHIBIOS_NIL_CONF_VER_3_0_
+#define _CHIBIOS_NIL_CONF_VER_3_2_
 
 /*===========================================================================*/
 /**
diff --git a/demos/SPC5/NIL-SPC560D-EVB/halconf.h b/demos/SPC5/NIL-SPC560D-EVB/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/SPC5/NIL-SPC560D-EVB/halconf.h
+++ b/demos/SPC5/NIL-SPC560D-EVB/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/SPC5/RT-SPC560B-EVB/chconf.h b/demos/SPC5/RT-SPC560B-EVB/chconf.h
index a7b292fa7..864640bc1 100644
--- a/demos/SPC5/RT-SPC560B-EVB/chconf.h
+++ b/demos/SPC5/RT-SPC560B-EVB/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/SPC5/RT-SPC560B-EVB/halconf.h b/demos/SPC5/RT-SPC560B-EVB/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/SPC5/RT-SPC560B-EVB/halconf.h
+++ b/demos/SPC5/RT-SPC560B-EVB/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/SPC5/RT-SPC560D-EVB/chconf.h b/demos/SPC5/RT-SPC560D-EVB/chconf.h
index a7b292fa7..864640bc1 100644
--- a/demos/SPC5/RT-SPC560D-EVB/chconf.h
+++ b/demos/SPC5/RT-SPC560D-EVB/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/SPC5/RT-SPC560D-EVB/halconf.h b/demos/SPC5/RT-SPC560D-EVB/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/SPC5/RT-SPC560D-EVB/halconf.h
+++ b/demos/SPC5/RT-SPC560D-EVB/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/SPC5/RT-SPC560P-EVB/chconf.h b/demos/SPC5/RT-SPC560P-EVB/chconf.h
index a7b292fa7..864640bc1 100644
--- a/demos/SPC5/RT-SPC560P-EVB/chconf.h
+++ b/demos/SPC5/RT-SPC560P-EVB/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/SPC5/RT-SPC560P-EVB/halconf.h b/demos/SPC5/RT-SPC560P-EVB/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/SPC5/RT-SPC560P-EVB/halconf.h
+++ b/demos/SPC5/RT-SPC560P-EVB/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/SPC5/RT-SPC563M-EVB/chconf.h b/demos/SPC5/RT-SPC563M-EVB/chconf.h
index a7b292fa7..864640bc1 100644
--- a/demos/SPC5/RT-SPC563M-EVB/chconf.h
+++ b/demos/SPC5/RT-SPC563M-EVB/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/SPC5/RT-SPC563M-EVB/halconf.h b/demos/SPC5/RT-SPC563M-EVB/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/SPC5/RT-SPC563M-EVB/halconf.h
+++ b/demos/SPC5/RT-SPC563M-EVB/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/SPC5/RT-SPC564A-EVB/chconf.h b/demos/SPC5/RT-SPC564A-EVB/chconf.h
index a7b292fa7..864640bc1 100644
--- a/demos/SPC5/RT-SPC564A-EVB/chconf.h
+++ b/demos/SPC5/RT-SPC564A-EVB/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/SPC5/RT-SPC564A-EVB/halconf.h b/demos/SPC5/RT-SPC564A-EVB/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/SPC5/RT-SPC564A-EVB/halconf.h
+++ b/demos/SPC5/RT-SPC564A-EVB/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/SPC5/RT-SPC56EC-EVB/chconf.h b/demos/SPC5/RT-SPC56EC-EVB/chconf.h
index a7b292fa7..864640bc1 100644
--- a/demos/SPC5/RT-SPC56EC-EVB/chconf.h
+++ b/demos/SPC5/RT-SPC56EC-EVB/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/SPC5/RT-SPC56EC-EVB/halconf.h b/demos/SPC5/RT-SPC56EC-EVB/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/SPC5/RT-SPC56EC-EVB/halconf.h
+++ b/demos/SPC5/RT-SPC56EC-EVB/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/SPC5/RT-SPC56EL-EVB/chconf.h b/demos/SPC5/RT-SPC56EL-EVB/chconf.h
index a7b292fa7..864640bc1 100644
--- a/demos/SPC5/RT-SPC56EL-EVB/chconf.h
+++ b/demos/SPC5/RT-SPC56EL-EVB/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/SPC5/RT-SPC56EL-EVB/halconf.h b/demos/SPC5/RT-SPC56EL-EVB/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/SPC5/RT-SPC56EL-EVB/halconf.h
+++ b/demos/SPC5/RT-SPC56EL-EVB/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/CMSIS-STM32F407-DISCOVERY/cfg/chconf.h b/demos/STM32/CMSIS-STM32F407-DISCOVERY/cfg/chconf.h
index b31851f43..8deb2138c 100644
--- a/demos/STM32/CMSIS-STM32F407-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/CMSIS-STM32F407-DISCOVERY/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/CMSIS-STM32F407-DISCOVERY/cfg/halconf.h b/demos/STM32/CMSIS-STM32F407-DISCOVERY/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/CMSIS-STM32F407-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/CMSIS-STM32F407-DISCOVERY/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/HAL-STM32F407-DISCOVERY/cfg/halconf.h b/demos/STM32/HAL-STM32F407-DISCOVERY/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/HAL-STM32F407-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/HAL-STM32F407-DISCOVERY/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/cfg/chconf.h b/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/cfg/chconf.h
index a9b0ba426..b9085ba8c 100644
--- a/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
@@ -605,9 +605,7 @@
  * @details User fields added to the end of the @p thread_t structure.
  */
 #define CH_CFG_THREAD_EXTRA_FIELDS                                          \
-  /* Add threads custom fields here.*/                                      \
-  void *osal_delete_handler;
-
+  /* Add threads custom fields here.*/
 
 /**
  * @brief   Threads initialization hook.
diff --git a/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/cfg/halconf.h b/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/cfg/chconf.h b/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/cfg/chconf.h
index 4e2a63b87..c2c86d91a 100644
--- a/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
@@ -605,9 +605,7 @@
  * @details User fields added to the end of the @p thread_t structure.
  */
 #define CH_CFG_THREAD_EXTRA_FIELDS                                          \
-  /* Add threads custom fields here.*/                                      \
-  void *osal_delete_handler;
-
+  /* Add threads custom fields here.*/
 
 /**
  * @brief   Threads initialization hook.
diff --git a/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/cfg/halconf.h b/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/NIL-STM32F051-DISCOVERY/cfg/chconf.h b/demos/STM32/NIL-STM32F051-DISCOVERY/cfg/chconf.h
index 7d71078aa..593dbb296 100644
--- a/demos/STM32/NIL-STM32F051-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/NIL-STM32F051-DISCOVERY/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    nil/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
@@ -29,7 +29,7 @@
 #define CHCONF_H
 
 #define _CHIBIOS_NIL_CONF_
-#define _CHIBIOS_NIL_CONF_VER_3_0_
+#define _CHIBIOS_NIL_CONF_VER_3_2_
 
 /*===========================================================================*/
 /**
diff --git a/demos/STM32/NIL-STM32F051-DISCOVERY/cfg/halconf.h b/demos/STM32/NIL-STM32F051-DISCOVERY/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/NIL-STM32F051-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/NIL-STM32F051-DISCOVERY/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/NIL-STM32F100-DISCOVERY/cfg/chconf.h b/demos/STM32/NIL-STM32F100-DISCOVERY/cfg/chconf.h
index 9ee4d7f16..bfe1f8841 100644
--- a/demos/STM32/NIL-STM32F100-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/NIL-STM32F100-DISCOVERY/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    nil/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
@@ -29,7 +29,7 @@
 #define CHCONF_H
 
 #define _CHIBIOS_NIL_CONF_
-#define _CHIBIOS_NIL_CONF_VER_3_0_
+#define _CHIBIOS_NIL_CONF_VER_3_2_
 
 /*===========================================================================*/
 /**
diff --git a/demos/STM32/NIL-STM32F100-DISCOVERY/cfg/halconf.h b/demos/STM32/NIL-STM32F100-DISCOVERY/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/NIL-STM32F100-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/NIL-STM32F100-DISCOVERY/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/NIL-STM32F303-DISCOVERY/cfg/chconf.h b/demos/STM32/NIL-STM32F303-DISCOVERY/cfg/chconf.h
index cb42137c1..980648eed 100644
--- a/demos/STM32/NIL-STM32F303-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/NIL-STM32F303-DISCOVERY/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    nil/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
@@ -29,7 +29,7 @@
 #define CHCONF_H
 
 #define _CHIBIOS_NIL_CONF_
-#define _CHIBIOS_NIL_CONF_VER_3_0_
+#define _CHIBIOS_NIL_CONF_VER_3_2_
 
 /*===========================================================================*/
 /**
diff --git a/demos/STM32/NIL-STM32F303-DISCOVERY/cfg/halconf.h b/demos/STM32/NIL-STM32F303-DISCOVERY/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/NIL-STM32F303-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/NIL-STM32F303-DISCOVERY/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/NIL-STM32F373-STM32373C_EVAL/cfg/chconf.h b/demos/STM32/NIL-STM32F373-STM32373C_EVAL/cfg/chconf.h
index 4504b8fbd..5a9f9864e 100644
--- a/demos/STM32/NIL-STM32F373-STM32373C_EVAL/cfg/chconf.h
+++ b/demos/STM32/NIL-STM32F373-STM32373C_EVAL/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    nil/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
@@ -29,7 +29,7 @@
 #define CHCONF_H
 
 #define _CHIBIOS_NIL_CONF_
-#define _CHIBIOS_NIL_CONF_VER_3_0_
+#define _CHIBIOS_NIL_CONF_VER_3_2_
 
 /*===========================================================================*/
 /**
diff --git a/demos/STM32/NIL-STM32F373-STM32373C_EVAL/cfg/halconf.h b/demos/STM32/NIL-STM32F373-STM32373C_EVAL/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/NIL-STM32F373-STM32373C_EVAL/cfg/halconf.h
+++ b/demos/STM32/NIL-STM32F373-STM32373C_EVAL/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/NIL-STM32F746G-DISCOVERY/cfg/chconf.h b/demos/STM32/NIL-STM32F746G-DISCOVERY/cfg/chconf.h
index b0a850237..ae3504075 100644
--- a/demos/STM32/NIL-STM32F746G-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/NIL-STM32F746G-DISCOVERY/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    nil/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
@@ -29,7 +29,7 @@
 #define CHCONF_H
 
 #define _CHIBIOS_NIL_CONF_
-#define _CHIBIOS_NIL_CONF_VER_3_0_
+#define _CHIBIOS_NIL_CONF_VER_3_2_
 
 /*===========================================================================*/
 /**
diff --git a/demos/STM32/NIL-STM32F746G-DISCOVERY/cfg/halconf.h b/demos/STM32/NIL-STM32F746G-DISCOVERY/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/NIL-STM32F746G-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/NIL-STM32F746G-DISCOVERY/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/NIL-STM32L011K4-NUCLEO32/cfg/chconf.h b/demos/STM32/NIL-STM32L011K4-NUCLEO32/cfg/chconf.h
index b5c88b4ef..30bb03926 100644
--- a/demos/STM32/NIL-STM32L011K4-NUCLEO32/cfg/chconf.h
+++ b/demos/STM32/NIL-STM32L011K4-NUCLEO32/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    nil/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
@@ -29,7 +29,7 @@
 #define CHCONF_H
 
 #define _CHIBIOS_NIL_CONF_
-#define _CHIBIOS_NIL_CONF_VER_3_0_
+#define _CHIBIOS_NIL_CONF_VER_3_2_
 
 /*===========================================================================*/
 /**
diff --git a/demos/STM32/NIL-STM32L011K4-NUCLEO32/cfg/halconf.h b/demos/STM32/NIL-STM32L011K4-NUCLEO32/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/NIL-STM32L011K4-NUCLEO32/cfg/halconf.h
+++ b/demos/STM32/NIL-STM32L011K4-NUCLEO32/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/NIL-STM32L152-DISCOVERY/cfg/chconf.h b/demos/STM32/NIL-STM32L152-DISCOVERY/cfg/chconf.h
index 9ee4d7f16..bfe1f8841 100644
--- a/demos/STM32/NIL-STM32L152-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/NIL-STM32L152-DISCOVERY/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    nil/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
@@ -29,7 +29,7 @@
 #define CHCONF_H
 
 #define _CHIBIOS_NIL_CONF_
-#define _CHIBIOS_NIL_CONF_VER_3_0_
+#define _CHIBIOS_NIL_CONF_VER_3_2_
 
 /*===========================================================================*/
 /**
diff --git a/demos/STM32/NIL-STM32L152-DISCOVERY/cfg/halconf.h b/demos/STM32/NIL-STM32L152-DISCOVERY/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/NIL-STM32L152-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/NIL-STM32L152-DISCOVERY/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg/stm32f746_discovery/chconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg/stm32f746_discovery/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg/stm32f746_discovery/chconf.h
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg/stm32f746_discovery/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg/stm32f746_discovery/halconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg/stm32f746_discovery/halconf.h
index 26d40261f..3d536e0ae 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg/stm32f746_discovery/halconf.h
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg/stm32f746_discovery/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f107_goldbull/chconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f107_goldbull/chconf.h
index fc69e2019..2725e1491 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f107_goldbull/chconf.h
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f107_goldbull/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f107_goldbull/halconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f107_goldbull/halconf.h
index 44111c51c..563ef179c 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f107_goldbull/halconf.h
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f107_goldbull/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f407_olimex/chconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f407_olimex/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f407_olimex/chconf.h
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f407_olimex/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f407_olimex/halconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f407_olimex/halconf.h
index 26d40261f..3d536e0ae 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f407_olimex/halconf.h
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f407_olimex/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f746_discovery/chconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f746_discovery/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f746_discovery/chconf.h
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f746_discovery/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f746_discovery/halconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f746_discovery/halconf.h
index 26d40261f..3d536e0ae 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f746_discovery/halconf.h
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f746_discovery/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f769_discovery/chconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f769_discovery/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f769_discovery/chconf.h
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f769_discovery/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f769_discovery/halconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f769_discovery/halconf.h
index 26d40261f..3d536e0ae 100644
--- a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f769_discovery/halconf.h
+++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f769_discovery/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F030R8-NUCLEO64/cfg/chconf.h b/demos/STM32/RT-STM32F030R8-NUCLEO64/cfg/chconf.h
index 68b1e8a98..41e58ce96 100644
--- a/demos/STM32/RT-STM32F030R8-NUCLEO64/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F030R8-NUCLEO64/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F030R8-NUCLEO64/cfg/halconf.h b/demos/STM32/RT-STM32F030R8-NUCLEO64/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F030R8-NUCLEO64/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F030R8-NUCLEO64/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F031K6-NUCLEO32/cfg/chconf.h b/demos/STM32/RT-STM32F031K6-NUCLEO32/cfg/chconf.h
index 05955079e..787b09ba0 100644
--- a/demos/STM32/RT-STM32F031K6-NUCLEO32/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F031K6-NUCLEO32/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F031K6-NUCLEO32/cfg/halconf.h b/demos/STM32/RT-STM32F031K6-NUCLEO32/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F031K6-NUCLEO32/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F031K6-NUCLEO32/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F042K6-NUCLEO32/cfg/chconf.h b/demos/STM32/RT-STM32F042K6-NUCLEO32/cfg/chconf.h
index d0a50e1be..24691d739 100644
--- a/demos/STM32/RT-STM32F042K6-NUCLEO32/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F042K6-NUCLEO32/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F042K6-NUCLEO32/cfg/halconf.h b/demos/STM32/RT-STM32F042K6-NUCLEO32/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F042K6-NUCLEO32/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F042K6-NUCLEO32/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F051-DISCOVERY/cfg/chconf.h b/demos/STM32/RT-STM32F051-DISCOVERY/cfg/chconf.h
index d0a50e1be..24691d739 100644
--- a/demos/STM32/RT-STM32F051-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F051-DISCOVERY/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F051-DISCOVERY/cfg/halconf.h b/demos/STM32/RT-STM32F051-DISCOVERY/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F051-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F051-DISCOVERY/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F070RB-NUCLEO64/cfg/chconf.h b/demos/STM32/RT-STM32F070RB-NUCLEO64/cfg/chconf.h
index 401eb1a52..a82730eaf 100644
--- a/demos/STM32/RT-STM32F070RB-NUCLEO64/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F070RB-NUCLEO64/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F070RB-NUCLEO64/cfg/halconf.h b/demos/STM32/RT-STM32F070RB-NUCLEO64/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F070RB-NUCLEO64/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F070RB-NUCLEO64/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F072-DISCOVERY/cfg/chconf.h b/demos/STM32/RT-STM32F072-DISCOVERY/cfg/chconf.h
index d0a50e1be..24691d739 100644
--- a/demos/STM32/RT-STM32F072-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F072-DISCOVERY/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F072-DISCOVERY/cfg/halconf.h b/demos/STM32/RT-STM32F072-DISCOVERY/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F072-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F072-DISCOVERY/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F072RB-NUCLEO64/cfg/chconf.h b/demos/STM32/RT-STM32F072RB-NUCLEO64/cfg/chconf.h
index d0a50e1be..24691d739 100644
--- a/demos/STM32/RT-STM32F072RB-NUCLEO64/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F072RB-NUCLEO64/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F072RB-NUCLEO64/cfg/halconf.h b/demos/STM32/RT-STM32F072RB-NUCLEO64/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F072RB-NUCLEO64/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F072RB-NUCLEO64/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F091RC-NUCLEO64/cfg/chconf.h b/demos/STM32/RT-STM32F091RC-NUCLEO64/cfg/chconf.h
index d0a50e1be..24691d739 100644
--- a/demos/STM32/RT-STM32F091RC-NUCLEO64/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F091RC-NUCLEO64/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F091RC-NUCLEO64/cfg/halconf.h b/demos/STM32/RT-STM32F091RC-NUCLEO64/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F091RC-NUCLEO64/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F091RC-NUCLEO64/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F100-DISCOVERY/cfg/chconf.h b/demos/STM32/RT-STM32F100-DISCOVERY/cfg/chconf.h
index 68b1e8a98..41e58ce96 100644
--- a/demos/STM32/RT-STM32F100-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F100-DISCOVERY/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F100-DISCOVERY/cfg/halconf.h b/demos/STM32/RT-STM32F100-DISCOVERY/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F100-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F100-DISCOVERY/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F103-MAPLEMINI/cfg/chconf.h b/demos/STM32/RT-STM32F103-MAPLEMINI/cfg/chconf.h
index 72a90a84c..d0a1ac910 100644
--- a/demos/STM32/RT-STM32F103-MAPLEMINI/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F103-MAPLEMINI/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F103-MAPLEMINI/cfg/halconf.h b/demos/STM32/RT-STM32F103-MAPLEMINI/cfg/halconf.h
index 86d17e425..87dc5beb8 100644
--- a/demos/STM32/RT-STM32F103-MAPLEMINI/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F103-MAPLEMINI/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/cfg/chconf.h b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/cfg/chconf.h
index dcd31d1eb..4a80aeeb1 100755
--- a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/cfg/halconf.h b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/cfg/halconf.h
index c0eda40a0..17d92d3c1 100755
--- a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/cfg/chconf.h b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/cfg/chconf.h
index dcd31d1eb..4a80aeeb1 100644
--- a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/cfg/halconf.h b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/cfg/chconf.h b/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/cfg/chconf.h
index dcd31d1eb..4a80aeeb1 100644
--- a/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/cfg/halconf.h b/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/cfg/halconf.h
index 59b8fe277..bc1caf11b 100644
--- a/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F103-STM3210E_EVAL-FATFS-USB/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F103RB-NUCLEO64/cfg/chconf.h b/demos/STM32/RT-STM32F103RB-NUCLEO64/cfg/chconf.h
index 796ab5033..112d7289b 100644
--- a/demos/STM32/RT-STM32F103RB-NUCLEO64/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F103RB-NUCLEO64/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F103RB-NUCLEO64/cfg/halconf.h b/demos/STM32/RT-STM32F103RB-NUCLEO64/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F103RB-NUCLEO64/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F103RB-NUCLEO64/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/cfg/chconf.h b/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/cfg/chconf.h
index 6a8831526..78698eb78 100644
--- a/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/cfg/halconf.h b/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/cfg/halconf.h
index 8172f7817..a54e318ac 100644
--- a/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F207-DISCOVERY/cfg/chconf.h b/demos/STM32/RT-STM32F207-DISCOVERY/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32F207-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F207-DISCOVERY/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F207-DISCOVERY/cfg/halconf.h b/demos/STM32/RT-STM32F207-DISCOVERY/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F207-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F207-DISCOVERY/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F207ZG-NUCLEO144/cfg/chconf.h b/demos/STM32/RT-STM32F207ZG-NUCLEO144/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32F207ZG-NUCLEO144/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F207ZG-NUCLEO144/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F207ZG-NUCLEO144/cfg/halconf.h b/demos/STM32/RT-STM32F207ZG-NUCLEO144/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F207ZG-NUCLEO144/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F207ZG-NUCLEO144/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F302R8-NUCLEO64/cfg/chconf.h b/demos/STM32/RT-STM32F302R8-NUCLEO64/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32F302R8-NUCLEO64/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F302R8-NUCLEO64/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F302R8-NUCLEO64/cfg/halconf.h b/demos/STM32/RT-STM32F302R8-NUCLEO64/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F302R8-NUCLEO64/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F302R8-NUCLEO64/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F303-DISCOVERY/cfg/chconf.h b/demos/STM32/RT-STM32F303-DISCOVERY/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32F303-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F303-DISCOVERY/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F303-DISCOVERY/cfg/halconf.h b/demos/STM32/RT-STM32F303-DISCOVERY/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F303-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F303-DISCOVERY/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F303K8-NUCLEO32/cfg/chconf.h b/demos/STM32/RT-STM32F303K8-NUCLEO32/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32F303K8-NUCLEO32/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F303K8-NUCLEO32/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F303K8-NUCLEO32/cfg/halconf.h b/demos/STM32/RT-STM32F303K8-NUCLEO32/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F303K8-NUCLEO32/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F303K8-NUCLEO32/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F303RE-NUCLEO64/cfg/chconf.h b/demos/STM32/RT-STM32F303RE-NUCLEO64/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32F303RE-NUCLEO64/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F303RE-NUCLEO64/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F303RE-NUCLEO64/cfg/halconf.h b/demos/STM32/RT-STM32F303RE-NUCLEO64/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F303RE-NUCLEO64/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F303RE-NUCLEO64/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F303ZE-NUCLEO144/cfg/chconf.h b/demos/STM32/RT-STM32F303ZE-NUCLEO144/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32F303ZE-NUCLEO144/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F303ZE-NUCLEO144/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F303ZE-NUCLEO144/cfg/halconf.h b/demos/STM32/RT-STM32F303ZE-NUCLEO144/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F303ZE-NUCLEO144/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F303ZE-NUCLEO144/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F334-DISCOVERY/cfg/chconf.h b/demos/STM32/RT-STM32F334-DISCOVERY/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32F334-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F334-DISCOVERY/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F334-DISCOVERY/cfg/halconf.h b/demos/STM32/RT-STM32F334-DISCOVERY/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F334-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F334-DISCOVERY/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F334R8-NUCLEO64/cfg/chconf.h b/demos/STM32/RT-STM32F334R8-NUCLEO64/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32F334R8-NUCLEO64/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F334R8-NUCLEO64/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F334R8-NUCLEO64/cfg/halconf.h b/demos/STM32/RT-STM32F334R8-NUCLEO64/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F334R8-NUCLEO64/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F334R8-NUCLEO64/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F373-STM32373C_EVAL/cfg/chconf.h b/demos/STM32/RT-STM32F373-STM32373C_EVAL/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32F373-STM32373C_EVAL/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F373-STM32373C_EVAL/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F373-STM32373C_EVAL/cfg/halconf.h b/demos/STM32/RT-STM32F373-STM32373C_EVAL/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F373-STM32373C_EVAL/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F373-STM32373C_EVAL/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F401C-DISCOVERY/cfg/chconf.h b/demos/STM32/RT-STM32F401C-DISCOVERY/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32F401C-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F401C-DISCOVERY/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F401C-DISCOVERY/cfg/halconf.h b/demos/STM32/RT-STM32F401C-DISCOVERY/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F401C-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F401C-DISCOVERY/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F401RE-NUCLEO64/cfg/chconf.h b/demos/STM32/RT-STM32F401RE-NUCLEO64/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32F401RE-NUCLEO64/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F401RE-NUCLEO64/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F401RE-NUCLEO64/cfg/halconf.h b/demos/STM32/RT-STM32F401RE-NUCLEO64/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F401RE-NUCLEO64/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F401RE-NUCLEO64/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F407-DISCOVERY-G++/cfg/chconf.h b/demos/STM32/RT-STM32F407-DISCOVERY-G++/cfg/chconf.h
index 8834a80c0..e50f15cce 100644
--- a/demos/STM32/RT-STM32F407-DISCOVERY-G++/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F407-DISCOVERY-G++/cfg/chconf.h
@@ -1,714 +1,714 @@
-/*
-    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/**
- * @file    templates/chconf.h
- * @brief   Configuration file template.
- * @details A copy of this file must be placed in each project directory, it
- *          contains the application specific kernel settings.
- *
- * @addtogroup config
- * @details Kernel related settings and hooks.
- * @{
- */
-
-#ifndef CHCONF_H
-#define CHCONF_H
-
-#define _CHIBIOS_RT_CONF_
-#define _CHIBIOS_RT_CONF_VER_6_0_
-
-/*===========================================================================*/
-/**
- * @name System timers settings
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   System time counter resolution.
- * @note    Allowed values are 16 or 32 bits.
- */
-#if !defined(CH_CFG_ST_RESOLUTION)
-#define CH_CFG_ST_RESOLUTION                32
-#endif
-
-/**
- * @brief   System tick frequency.
- * @details Frequency of the system timer that drives the system ticks. This
- *          setting also defines the system tick time unit.
- */
-#if !defined(CH_CFG_ST_FREQUENCY)
-#define CH_CFG_ST_FREQUENCY                 10000
-#endif
-
-/**
- * @brief   Time intervals data size.
- * @note    Allowed values are 16, 32 or 64 bits.
- */
-#if !defined(CH_CFG_INTERVALS_SIZE)
-#define CH_CFG_INTERVALS_SIZE               32
-#endif
-
-/**
- * @brief   Time types data size.
- * @note    Allowed values are 16 or 32 bits.
- */
-#if !defined(CH_CFG_TIME_TYPES_SIZE)
-#define CH_CFG_TIME_TYPES_SIZE              32
-#endif
-
-/**
- * @brief   Time delta constant for the tick-less mode.
- * @note    If this value is zero then the system uses the classic
- *          periodic tick. This value represents the minimum number
- *          of ticks that is safe to specify in a timeout directive.
- *          The value one is not valid, timeouts are rounded up to
- *          this value.
- */
-#if !defined(CH_CFG_ST_TIMEDELTA)
-#define CH_CFG_ST_TIMEDELTA                 2
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Kernel parameters and options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   Round robin interval.
- * @details This constant is the number of system ticks allowed for the
- *          threads before preemption occurs. Setting this value to zero
- *          disables the preemption for threads with equal priority and the
- *          round robin becomes cooperative. Note that higher priority
- *          threads can still preempt, the kernel is always preemptive.
- * @note    Disabling the round robin preemption makes the kernel more compact
- *          and generally faster.
- * @note    The round robin preemption is not supported in tickless mode and
- *          must be set to zero in that case.
- */
-#if !defined(CH_CFG_TIME_QUANTUM)
-#define CH_CFG_TIME_QUANTUM                 0
-#endif
-
-/**
- * @brief   Managed RAM size.
- * @details Size of the RAM area to be managed by the OS. If set to zero
- *          then the whole available RAM is used. The core memory is made
- *          available to the heap allocator and/or can be used directly through
- *          the simplified core memory allocator.
- *
- * @note    In order to let the OS manage the whole RAM the linker script must
- *          provide the @p __heap_base__ and @p __heap_end__ symbols.
- * @note    Requires @p CH_CFG_USE_MEMCORE.
- */
-#if !defined(CH_CFG_MEMCORE_SIZE)
-#define CH_CFG_MEMCORE_SIZE                 0
-#endif
-
-/**
- * @brief   Idle thread automatic spawn suppression.
- * @details When this option is activated the function @p chSysInit()
- *          does not spawn the idle thread. The application @p main()
- *          function becomes the idle thread and must implement an
- *          infinite loop.
- */
-#if !defined(CH_CFG_NO_IDLE_THREAD)
-#define CH_CFG_NO_IDLE_THREAD               FALSE
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Performance options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   OS optimization.
- * @details If enabled then time efficient rather than space efficient code
- *          is used when two possible implementations exist.
- *
- * @note    This is not related to the compiler optimization options.
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_CFG_OPTIMIZE_SPEED)
-#define CH_CFG_OPTIMIZE_SPEED               TRUE
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Subsystem options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   Time Measurement APIs.
- * @details If enabled then the time measurement APIs are included in
- *          the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_CFG_USE_TM)
-#define CH_CFG_USE_TM                       TRUE
-#endif
-
-/**
- * @brief   Threads registry APIs.
- * @details If enabled then the registry APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_CFG_USE_REGISTRY)
-#define CH_CFG_USE_REGISTRY                 TRUE
-#endif
-
-/**
- * @brief   Threads synchronization APIs.
- * @details If enabled then the @p chThdWait() function is included in
- *          the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_CFG_USE_WAITEXIT)
-#define CH_CFG_USE_WAITEXIT                 TRUE
-#endif
-
-/**
- * @brief   Semaphores APIs.
- * @details If enabled then the Semaphores APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_CFG_USE_SEMAPHORES)
-#define CH_CFG_USE_SEMAPHORES               TRUE
-#endif
-
-/**
- * @brief   Semaphores queuing mode.
- * @details If enabled then the threads are enqueued on semaphores by
- *          priority rather than in FIFO order.
- *
- * @note    The default is @p FALSE. Enable this if you have special
- *          requirements.
- * @note    Requires @p CH_CFG_USE_SEMAPHORES.
- */
-#if !defined(CH_CFG_USE_SEMAPHORES_PRIORITY)
-#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE
-#endif
-
-/**
- * @brief   Mutexes APIs.
- * @details If enabled then the mutexes APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_CFG_USE_MUTEXES)
-#define CH_CFG_USE_MUTEXES                  TRUE
-#endif
-
-/**
- * @brief   Enables recursive behavior on mutexes.
- * @note    Recursive mutexes are heavier and have an increased
- *          memory footprint.
- *
- * @note    The default is @p FALSE.
- * @note    Requires @p CH_CFG_USE_MUTEXES.
- */
-#if !defined(CH_CFG_USE_MUTEXES_RECURSIVE)
-#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE
-#endif
-
-/**
- * @brief   Conditional Variables APIs.
- * @details If enabled then the conditional variables APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_CFG_USE_MUTEXES.
- */
-#if !defined(CH_CFG_USE_CONDVARS)
-#define CH_CFG_USE_CONDVARS                 TRUE
-#endif
-
-/**
- * @brief   Conditional Variables APIs with timeout.
- * @details If enabled then the conditional variables APIs with timeout
- *          specification are included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_CFG_USE_CONDVARS.
- */
-#if !defined(CH_CFG_USE_CONDVARS_TIMEOUT)
-#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE
-#endif
-
-/**
- * @brief   Events Flags APIs.
- * @details If enabled then the event flags APIs are included in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_CFG_USE_EVENTS)
-#define CH_CFG_USE_EVENTS                   TRUE
-#endif
-
-/**
- * @brief   Events Flags APIs with timeout.
- * @details If enabled then the events APIs with timeout specification
- *          are included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_CFG_USE_EVENTS.
- */
-#if !defined(CH_CFG_USE_EVENTS_TIMEOUT)
-#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE
-#endif
-
-/**
- * @brief   Synchronous Messages APIs.
- * @details If enabled then the synchronous messages APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_CFG_USE_MESSAGES)
-#define CH_CFG_USE_MESSAGES                 TRUE
-#endif
-
-/**
- * @brief   Synchronous Messages queuing mode.
- * @details If enabled then messages are served by priority rather than in
- *          FIFO order.
- *
- * @note    The default is @p FALSE. Enable this if you have special
- *          requirements.
- * @note    Requires @p CH_CFG_USE_MESSAGES.
- */
-#if !defined(CH_CFG_USE_MESSAGES_PRIORITY)
-#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE
-#endif
-
-/**
- * @brief   Mailboxes APIs.
- * @details If enabled then the asynchronous messages (mailboxes) APIs are
- *          included in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_CFG_USE_SEMAPHORES.
- */
-#if !defined(CH_CFG_USE_MAILBOXES)
-#define CH_CFG_USE_MAILBOXES                TRUE
-#endif
-
-/**
- * @brief   Core Memory Manager APIs.
- * @details If enabled then the core memory manager APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_CFG_USE_MEMCORE)
-#define CH_CFG_USE_MEMCORE                  TRUE
-#endif
-
-/**
- * @brief   Heap Allocator APIs.
- * @details If enabled then the memory heap allocator APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_CFG_USE_MEMCORE and either @p CH_CFG_USE_MUTEXES or
- *          @p CH_CFG_USE_SEMAPHORES.
- * @note    Mutexes are recommended.
- */
-#if !defined(CH_CFG_USE_HEAP)
-#define CH_CFG_USE_HEAP                     TRUE
-#endif
-
-/**
- * @brief   Memory Pools Allocator APIs.
- * @details If enabled then the memory pools allocator APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_CFG_USE_MEMPOOLS)
-#define CH_CFG_USE_MEMPOOLS                 TRUE
-#endif
-
-/**
- * @brief   Objects FIFOs APIs.
- * @details If enabled then the objects FIFOs APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_CFG_USE_OBJ_FIFOS)
-#define CH_CFG_USE_OBJ_FIFOS                TRUE
-#endif
-
-/**
- * @brief   Pipes APIs.
- * @details If enabled then the pipes APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- */
-#if !defined(CH_CFG_USE_PIPES)
-#define CH_CFG_USE_PIPES                    TRUE
-#endif
-
-/**
- * @brief   Dynamic Threads APIs.
- * @details If enabled then the dynamic threads creation APIs are included
- *          in the kernel.
- *
- * @note    The default is @p TRUE.
- * @note    Requires @p CH_CFG_USE_WAITEXIT.
- * @note    Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
- */
-#if !defined(CH_CFG_USE_DYNAMIC)
-#define CH_CFG_USE_DYNAMIC                  TRUE
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Objects factory options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   Objects Factory APIs.
- * @details If enabled then the objects factory APIs are included in the
- *          kernel.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_CFG_USE_FACTORY)
-#define CH_CFG_USE_FACTORY                  TRUE
-#endif
-
-/**
- * @brief   Maximum length for object names.
- * @details If the specified length is zero then the name is stored by
- *          pointer but this could have unintended side effects.
- */
-#if !defined(CH_CFG_FACTORY_MAX_NAMES_LENGTH)
-#define CH_CFG_FACTORY_MAX_NAMES_LENGTH     8
-#endif
-
-/**
- * @brief   Enables the registry of generic objects.
- */
-#if !defined(CH_CFG_FACTORY_OBJECTS_REGISTRY)
-#define CH_CFG_FACTORY_OBJECTS_REGISTRY     TRUE
-#endif
-
-/**
- * @brief   Enables factory for generic buffers.
- */
-#if !defined(CH_CFG_FACTORY_GENERIC_BUFFERS)
-#define CH_CFG_FACTORY_GENERIC_BUFFERS      TRUE
-#endif
-
-/**
- * @brief   Enables factory for semaphores.
- */
-#if !defined(CH_CFG_FACTORY_SEMAPHORES)
-#define CH_CFG_FACTORY_SEMAPHORES           TRUE
-#endif
-
-/**
- * @brief   Enables factory for mailboxes.
- */
-#if !defined(CH_CFG_FACTORY_MAILBOXES)
-#define CH_CFG_FACTORY_MAILBOXES            TRUE
-#endif
-
-/**
- * @brief   Enables factory for objects FIFOs.
- */
-#if !defined(CH_CFG_FACTORY_OBJ_FIFOS)
-#define CH_CFG_FACTORY_OBJ_FIFOS            TRUE
-#endif
-
-/**
- * @brief   Enables factory for Pipes.
- */
-#if !defined(CH_CFG_FACTORY_PIPES) || defined(__DOXYGEN__)
-#define CH_CFG_FACTORY_PIPES                TRUE
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Debug options
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   Debug option, kernel statistics.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_STATISTICS)
-#define CH_DBG_STATISTICS                   FALSE
-#endif
-
-/**
- * @brief   Debug option, system state check.
- * @details If enabled the correct call protocol for system APIs is checked
- *          at runtime.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_SYSTEM_STATE_CHECK)
-#define CH_DBG_SYSTEM_STATE_CHECK           FALSE
-#endif
-
-/**
- * @brief   Debug option, parameters checks.
- * @details If enabled then the checks on the API functions input
- *          parameters are activated.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_CHECKS)
-#define CH_DBG_ENABLE_CHECKS                FALSE
-#endif
-
-/**
- * @brief   Debug option, consistency checks.
- * @details If enabled then all the assertions in the kernel code are
- *          activated. This includes consistency checks inside the kernel,
- *          runtime anomalies and port-defined checks.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_ENABLE_ASSERTS)
-#define CH_DBG_ENABLE_ASSERTS               FALSE
-#endif
-
-/**
- * @brief   Debug option, trace buffer.
- * @details If enabled then the trace buffer is activated.
- *
- * @note    The default is @p CH_DBG_TRACE_MASK_DISABLED.
- */
-#if !defined(CH_DBG_TRACE_MASK)
-#define CH_DBG_TRACE_MASK                   CH_DBG_TRACE_MASK_DISABLED
-#endif
-
-/**
- * @brief   Trace buffer entries.
- * @note    The trace buffer is only allocated if @p CH_DBG_TRACE_MASK is
- *          different from @p CH_DBG_TRACE_MASK_DISABLED.
- */
-#if !defined(CH_DBG_TRACE_BUFFER_SIZE)
-#define CH_DBG_TRACE_BUFFER_SIZE            128
-#endif
-
-/**
- * @brief   Debug option, stack checks.
- * @details If enabled then a runtime stack check is performed.
- *
- * @note    The default is @p FALSE.
- * @note    The stack check is performed in a architecture/port dependent way.
- *          It may not be implemented or some ports.
- * @note    The default failure mode is to halt the system with the global
- *          @p panic_msg variable set to @p NULL.
- */
-#if !defined(CH_DBG_ENABLE_STACK_CHECK)
-#define CH_DBG_ENABLE_STACK_CHECK           FALSE
-#endif
-
-/**
- * @brief   Debug option, stacks initialization.
- * @details If enabled then the threads working area is filled with a byte
- *          value when a thread is created. This can be useful for the
- *          runtime measurement of the used stack.
- *
- * @note    The default is @p FALSE.
- */
-#if !defined(CH_DBG_FILL_THREADS)
-#define CH_DBG_FILL_THREADS                 FALSE
-#endif
-
-/**
- * @brief   Debug option, threads profiling.
- * @details If enabled then a field is added to the @p thread_t structure that
- *          counts the system ticks occurred while executing the thread.
- *
- * @note    The default is @p FALSE.
- * @note    This debug option is not currently compatible with the
- *          tickless mode.
- */
-#if !defined(CH_DBG_THREADS_PROFILING)
-#define CH_DBG_THREADS_PROFILING            FALSE
-#endif
-
-/** @} */
-
-/*===========================================================================*/
-/**
- * @name Kernel hooks
- * @{
- */
-/*===========================================================================*/
-
-/**
- * @brief   System structure extension.
- * @details User fields added to the end of the @p ch_system_t structure.
- */
-#define CH_CFG_SYSTEM_EXTRA_FIELDS                                          \
-  /* Add threads custom fields here.*/
-
-/**
- * @brief   System initialization hook.
- * @details User initialization code added to the @p chSysInit() function
- *          just before interrupts are enabled globally.
- */
-#define CH_CFG_SYSTEM_INIT_HOOK() {                                         \
-  /* Add threads initialization code here.*/                                \
-}
-
-/**
- * @brief   Threads descriptor structure extension.
- * @details User fields added to the end of the @p thread_t structure.
- */
-#define CH_CFG_THREAD_EXTRA_FIELDS                                          \
-  /* Add threads custom fields here.*/
-
-/**
- * @brief   Threads initialization hook.
- * @details User initialization code added to the @p _thread_init() function.
- *
- * @note    It is invoked from within @p _thread_init() and implicitly from all
- *          the threads creation APIs.
- */
-#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \
-  /* Add threads initialization code here.*/                                \
-}
-
-/**
- * @brief   Threads finalization hook.
- * @details User finalization code added to the @p chThdExit() API.
- */
-#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \
-  /* Add threads finalization code here.*/                                  \
-}
-
-/**
- * @brief   Context switch hook.
- * @details This hook is invoked just before switching between threads.
- */
-#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) {                              \
-  /* Context switch code here.*/                                            \
-}
-
-/**
- * @brief   ISR enter hook.
- */
-#define CH_CFG_IRQ_PROLOGUE_HOOK() {                                        \
-  /* IRQ prologue code here.*/                                              \
-}
-
-/**
- * @brief   ISR exit hook.
- */
-#define CH_CFG_IRQ_EPILOGUE_HOOK() {                                        \
-  /* IRQ epilogue code here.*/                                              \
-}
-
-/**
- * @brief   Idle thread enter hook.
- * @note    This hook is invoked within a critical zone, no OS functions
- *          should be invoked from here.
- * @note    This macro can be used to activate a power saving mode.
- */
-#define CH_CFG_IDLE_ENTER_HOOK() {                                          \
-  /* Idle-enter code here.*/                                                \
-}
-
-/**
- * @brief   Idle thread leave hook.
- * @note    This hook is invoked within a critical zone, no OS functions
- *          should be invoked from here.
- * @note    This macro can be used to deactivate a power saving mode.
- */
-#define CH_CFG_IDLE_LEAVE_HOOK() {                                          \
-  /* Idle-leave code here.*/                                                \
-}
-
-/**
- * @brief   Idle Loop hook.
- * @details This hook is continuously invoked by the idle thread loop.
- */
-#define CH_CFG_IDLE_LOOP_HOOK() {                                           \
-  /* Idle loop code here.*/                                                 \
-}
-
-/**
- * @brief   System tick event hook.
- * @details This hook is invoked in the system tick handler immediately
- *          after processing the virtual timers queue.
- */
-#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \
-  /* System tick event code here.*/                                         \
-}
-
-/**
- * @brief   System halt hook.
- * @details This hook is invoked in case to a system halting error before
- *          the system is halted.
- */
-#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \
-  /* System halt code here.*/                                               \
-}
-
-/**
- * @brief   Trace hook.
- * @details This hook is invoked each time a new record is written in the
- *          trace buffer.
- */
-#define CH_CFG_TRACE_HOOK(tep) {                                            \
-  /* Trace code here.*/                                                     \
-}
-
-/** @} */
-
-/*===========================================================================*/
-/* Port-specific settings (override port settings defaulted in chcore.h).    */
-/*===========================================================================*/
-
-#endif  /* CHCONF_H */
-
-/** @} */
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    rt/templates/chconf.h
+ * @brief   Configuration file template.
+ * @details A copy of this file must be placed in each project directory, it
+ *          contains the application specific kernel settings.
+ *
+ * @addtogroup config
+ * @details Kernel related settings and hooks.
+ * @{
+ */
+
+#ifndef CHCONF_H
+#define CHCONF_H
+
+#define _CHIBIOS_RT_CONF_
+#define _CHIBIOS_RT_CONF_VER_6_0_
+
+/*===========================================================================*/
+/**
+ * @name System timers settings
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System time counter resolution.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_ST_RESOLUTION)
+#define CH_CFG_ST_RESOLUTION                32
+#endif
+
+/**
+ * @brief   System tick frequency.
+ * @details Frequency of the system timer that drives the system ticks. This
+ *          setting also defines the system tick time unit.
+ */
+#if !defined(CH_CFG_ST_FREQUENCY)
+#define CH_CFG_ST_FREQUENCY                 10000
+#endif
+
+/**
+ * @brief   Time intervals data size.
+ * @note    Allowed values are 16, 32 or 64 bits.
+ */
+#if !defined(CH_CFG_INTERVALS_SIZE)
+#define CH_CFG_INTERVALS_SIZE               32
+#endif
+
+/**
+ * @brief   Time types data size.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_TIME_TYPES_SIZE)
+#define CH_CFG_TIME_TYPES_SIZE              32
+#endif
+
+/**
+ * @brief   Time delta constant for the tick-less mode.
+ * @note    If this value is zero then the system uses the classic
+ *          periodic tick. This value represents the minimum number
+ *          of ticks that is safe to specify in a timeout directive.
+ *          The value one is not valid, timeouts are rounded up to
+ *          this value.
+ */
+#if !defined(CH_CFG_ST_TIMEDELTA)
+#define CH_CFG_ST_TIMEDELTA                 2
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel parameters and options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Round robin interval.
+ * @details This constant is the number of system ticks allowed for the
+ *          threads before preemption occurs. Setting this value to zero
+ *          disables the preemption for threads with equal priority and the
+ *          round robin becomes cooperative. Note that higher priority
+ *          threads can still preempt, the kernel is always preemptive.
+ * @note    Disabling the round robin preemption makes the kernel more compact
+ *          and generally faster.
+ * @note    The round robin preemption is not supported in tickless mode and
+ *          must be set to zero in that case.
+ */
+#if !defined(CH_CFG_TIME_QUANTUM)
+#define CH_CFG_TIME_QUANTUM                 0
+#endif
+
+/**
+ * @brief   Managed RAM size.
+ * @details Size of the RAM area to be managed by the OS. If set to zero
+ *          then the whole available RAM is used. The core memory is made
+ *          available to the heap allocator and/or can be used directly through
+ *          the simplified core memory allocator.
+ *
+ * @note    In order to let the OS manage the whole RAM the linker script must
+ *          provide the @p __heap_base__ and @p __heap_end__ symbols.
+ * @note    Requires @p CH_CFG_USE_MEMCORE.
+ */
+#if !defined(CH_CFG_MEMCORE_SIZE)
+#define CH_CFG_MEMCORE_SIZE                 0
+#endif
+
+/**
+ * @brief   Idle thread automatic spawn suppression.
+ * @details When this option is activated the function @p chSysInit()
+ *          does not spawn the idle thread. The application @p main()
+ *          function becomes the idle thread and must implement an
+ *          infinite loop.
+ */
+#if !defined(CH_CFG_NO_IDLE_THREAD)
+#define CH_CFG_NO_IDLE_THREAD               FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Performance options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   OS optimization.
+ * @details If enabled then time efficient rather than space efficient code
+ *          is used when two possible implementations exist.
+ *
+ * @note    This is not related to the compiler optimization options.
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_OPTIMIZE_SPEED)
+#define CH_CFG_OPTIMIZE_SPEED               TRUE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Subsystem options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Time Measurement APIs.
+ * @details If enabled then the time measurement APIs are included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_TM)
+#define CH_CFG_USE_TM                       TRUE
+#endif
+
+/**
+ * @brief   Threads registry APIs.
+ * @details If enabled then the registry APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_REGISTRY)
+#define CH_CFG_USE_REGISTRY                 TRUE
+#endif
+
+/**
+ * @brief   Threads synchronization APIs.
+ * @details If enabled then the @p chThdWait() function is included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_WAITEXIT)
+#define CH_CFG_USE_WAITEXIT                 TRUE
+#endif
+
+/**
+ * @brief   Semaphores APIs.
+ * @details If enabled then the Semaphores APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES)
+#define CH_CFG_USE_SEMAPHORES               TRUE
+#endif
+
+/**
+ * @brief   Semaphores queuing mode.
+ * @details If enabled then the threads are enqueued on semaphores by
+ *          priority rather than in FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES_PRIORITY)
+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE
+#endif
+
+/**
+ * @brief   Mutexes APIs.
+ * @details If enabled then the mutexes APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MUTEXES)
+#define CH_CFG_USE_MUTEXES                  TRUE
+#endif
+
+/**
+ * @brief   Enables recursive behavior on mutexes.
+ * @note    Recursive mutexes are heavier and have an increased
+ *          memory footprint.
+ *
+ * @note    The default is @p FALSE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_MUTEXES_RECURSIVE)
+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs.
+ * @details If enabled then the conditional variables APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_CONDVARS)
+#define CH_CFG_USE_CONDVARS                 TRUE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs with timeout.
+ * @details If enabled then the conditional variables APIs with timeout
+ *          specification are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_CONDVARS.
+ */
+#if !defined(CH_CFG_USE_CONDVARS_TIMEOUT)
+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE
+#endif
+
+/**
+ * @brief   Events Flags APIs.
+ * @details If enabled then the event flags APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_EVENTS)
+#define CH_CFG_USE_EVENTS                   TRUE
+#endif
+
+/**
+ * @brief   Events Flags APIs with timeout.
+ * @details If enabled then the events APIs with timeout specification
+ *          are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_EVENTS.
+ */
+#if !defined(CH_CFG_USE_EVENTS_TIMEOUT)
+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages APIs.
+ * @details If enabled then the synchronous messages APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MESSAGES)
+#define CH_CFG_USE_MESSAGES                 TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages queuing mode.
+ * @details If enabled then messages are served by priority rather than in
+ *          FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_MESSAGES.
+ */
+#if !defined(CH_CFG_USE_MESSAGES_PRIORITY)
+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE
+#endif
+
+/**
+ * @brief   Mailboxes APIs.
+ * @details If enabled then the asynchronous messages (mailboxes) APIs are
+ *          included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_MAILBOXES)
+#define CH_CFG_USE_MAILBOXES                TRUE
+#endif
+
+/**
+ * @brief   Core Memory Manager APIs.
+ * @details If enabled then the core memory manager APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMCORE)
+#define CH_CFG_USE_MEMCORE                  TRUE
+#endif
+
+/**
+ * @brief   Heap Allocator APIs.
+ * @details If enabled then the memory heap allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MEMCORE and either @p CH_CFG_USE_MUTEXES or
+ *          @p CH_CFG_USE_SEMAPHORES.
+ * @note    Mutexes are recommended.
+ */
+#if !defined(CH_CFG_USE_HEAP)
+#define CH_CFG_USE_HEAP                     TRUE
+#endif
+
+/**
+ * @brief   Memory Pools Allocator APIs.
+ * @details If enabled then the memory pools allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMPOOLS)
+#define CH_CFG_USE_MEMPOOLS                 TRUE
+#endif
+
+/**
+ * @brief   Objects FIFOs APIs.
+ * @details If enabled then the objects FIFOs APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_OBJ_FIFOS)
+#define CH_CFG_USE_OBJ_FIFOS                TRUE
+#endif
+
+/**
+ * @brief   Pipes APIs.
+ * @details If enabled then the pipes APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_PIPES)
+#define CH_CFG_USE_PIPES                    TRUE
+#endif
+
+/**
+ * @brief   Dynamic Threads APIs.
+ * @details If enabled then the dynamic threads creation APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_WAITEXIT.
+ * @note    Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
+ */
+#if !defined(CH_CFG_USE_DYNAMIC)
+#define CH_CFG_USE_DYNAMIC                  TRUE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Objects factory options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Objects Factory APIs.
+ * @details If enabled then the objects factory APIs are included in the
+ *          kernel.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_CFG_USE_FACTORY)
+#define CH_CFG_USE_FACTORY                  TRUE
+#endif
+
+/**
+ * @brief   Maximum length for object names.
+ * @details If the specified length is zero then the name is stored by
+ *          pointer but this could have unintended side effects.
+ */
+#if !defined(CH_CFG_FACTORY_MAX_NAMES_LENGTH)
+#define CH_CFG_FACTORY_MAX_NAMES_LENGTH     8
+#endif
+
+/**
+ * @brief   Enables the registry of generic objects.
+ */
+#if !defined(CH_CFG_FACTORY_OBJECTS_REGISTRY)
+#define CH_CFG_FACTORY_OBJECTS_REGISTRY     TRUE
+#endif
+
+/**
+ * @brief   Enables factory for generic buffers.
+ */
+#if !defined(CH_CFG_FACTORY_GENERIC_BUFFERS)
+#define CH_CFG_FACTORY_GENERIC_BUFFERS      TRUE
+#endif
+
+/**
+ * @brief   Enables factory for semaphores.
+ */
+#if !defined(CH_CFG_FACTORY_SEMAPHORES)
+#define CH_CFG_FACTORY_SEMAPHORES           TRUE
+#endif
+
+/**
+ * @brief   Enables factory for mailboxes.
+ */
+#if !defined(CH_CFG_FACTORY_MAILBOXES)
+#define CH_CFG_FACTORY_MAILBOXES            TRUE
+#endif
+
+/**
+ * @brief   Enables factory for objects FIFOs.
+ */
+#if !defined(CH_CFG_FACTORY_OBJ_FIFOS)
+#define CH_CFG_FACTORY_OBJ_FIFOS            TRUE
+#endif
+
+/**
+ * @brief   Enables factory for Pipes.
+ */
+#if !defined(CH_CFG_FACTORY_PIPES) || defined(__DOXYGEN__)
+#define CH_CFG_FACTORY_PIPES                TRUE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Debug options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Debug option, kernel statistics.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_STATISTICS)
+#define CH_DBG_STATISTICS                   FALSE
+#endif
+
+/**
+ * @brief   Debug option, system state check.
+ * @details If enabled the correct call protocol for system APIs is checked
+ *          at runtime.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_SYSTEM_STATE_CHECK)
+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, parameters checks.
+ * @details If enabled then the checks on the API functions input
+ *          parameters are activated.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_CHECKS)
+#define CH_DBG_ENABLE_CHECKS                FALSE
+#endif
+
+/**
+ * @brief   Debug option, consistency checks.
+ * @details If enabled then all the assertions in the kernel code are
+ *          activated. This includes consistency checks inside the kernel,
+ *          runtime anomalies and port-defined checks.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_ASSERTS)
+#define CH_DBG_ENABLE_ASSERTS               FALSE
+#endif
+
+/**
+ * @brief   Debug option, trace buffer.
+ * @details If enabled then the trace buffer is activated.
+ *
+ * @note    The default is @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_MASK)
+#define CH_DBG_TRACE_MASK                   CH_DBG_TRACE_MASK_DISABLED
+#endif
+
+/**
+ * @brief   Trace buffer entries.
+ * @note    The trace buffer is only allocated if @p CH_DBG_TRACE_MASK is
+ *          different from @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_BUFFER_SIZE)
+#define CH_DBG_TRACE_BUFFER_SIZE            128
+#endif
+
+/**
+ * @brief   Debug option, stack checks.
+ * @details If enabled then a runtime stack check is performed.
+ *
+ * @note    The default is @p FALSE.
+ * @note    The stack check is performed in a architecture/port dependent way.
+ *          It may not be implemented or some ports.
+ * @note    The default failure mode is to halt the system with the global
+ *          @p panic_msg variable set to @p NULL.
+ */
+#if !defined(CH_DBG_ENABLE_STACK_CHECK)
+#define CH_DBG_ENABLE_STACK_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, stacks initialization.
+ * @details If enabled then the threads working area is filled with a byte
+ *          value when a thread is created. This can be useful for the
+ *          runtime measurement of the used stack.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_FILL_THREADS)
+#define CH_DBG_FILL_THREADS                 FALSE
+#endif
+
+/**
+ * @brief   Debug option, threads profiling.
+ * @details If enabled then a field is added to the @p thread_t structure that
+ *          counts the system ticks occurred while executing the thread.
+ *
+ * @note    The default is @p FALSE.
+ * @note    This debug option is not currently compatible with the
+ *          tickless mode.
+ */
+#if !defined(CH_DBG_THREADS_PROFILING)
+#define CH_DBG_THREADS_PROFILING            FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel hooks
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System structure extension.
+ * @details User fields added to the end of the @p ch_system_t structure.
+ */
+#define CH_CFG_SYSTEM_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   System initialization hook.
+ * @details User initialization code added to the @p chSysInit() function
+ *          just before interrupts are enabled globally.
+ */
+#define CH_CFG_SYSTEM_INIT_HOOK() {                                         \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads descriptor structure extension.
+ * @details User fields added to the end of the @p thread_t structure.
+ */
+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   Threads initialization hook.
+ * @details User initialization code added to the @p _thread_init() function.
+ *
+ * @note    It is invoked from within @p _thread_init() and implicitly from all
+ *          the threads creation APIs.
+ */
+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads finalization hook.
+ * @details User finalization code added to the @p chThdExit() API.
+ */
+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \
+  /* Add threads finalization code here.*/                                  \
+}
+
+/**
+ * @brief   Context switch hook.
+ * @details This hook is invoked just before switching between threads.
+ */
+#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) {                              \
+  /* Context switch code here.*/                                            \
+}
+
+/**
+ * @brief   ISR enter hook.
+ */
+#define CH_CFG_IRQ_PROLOGUE_HOOK() {                                        \
+  /* IRQ prologue code here.*/                                              \
+}
+
+/**
+ * @brief   ISR exit hook.
+ */
+#define CH_CFG_IRQ_EPILOGUE_HOOK() {                                        \
+  /* IRQ epilogue code here.*/                                              \
+}
+
+/**
+ * @brief   Idle thread enter hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to activate a power saving mode.
+ */
+#define CH_CFG_IDLE_ENTER_HOOK() {                                          \
+  /* Idle-enter code here.*/                                                \
+}
+
+/**
+ * @brief   Idle thread leave hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to deactivate a power saving mode.
+ */
+#define CH_CFG_IDLE_LEAVE_HOOK() {                                          \
+  /* Idle-leave code here.*/                                                \
+}
+
+/**
+ * @brief   Idle Loop hook.
+ * @details This hook is continuously invoked by the idle thread loop.
+ */
+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \
+  /* Idle loop code here.*/                                                 \
+}
+
+/**
+ * @brief   System tick event hook.
+ * @details This hook is invoked in the system tick handler immediately
+ *          after processing the virtual timers queue.
+ */
+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \
+  /* System tick event code here.*/                                         \
+}
+
+/**
+ * @brief   System halt hook.
+ * @details This hook is invoked in case to a system halting error before
+ *          the system is halted.
+ */
+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \
+  /* System halt code here.*/                                               \
+}
+
+/**
+ * @brief   Trace hook.
+ * @details This hook is invoked each time a new record is written in the
+ *          trace buffer.
+ */
+#define CH_CFG_TRACE_HOOK(tep) {                                            \
+  /* Trace code here.*/                                                     \
+}
+
+/** @} */
+
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h).    */
+/*===========================================================================*/
+
+#endif  /* CHCONF_H */
+
+/** @} */
diff --git a/demos/STM32/RT-STM32F407-DISCOVERY-G++/cfg/halconf.h b/demos/STM32/RT-STM32F407-DISCOVERY-G++/cfg/halconf.h
index b10dccbb4..69f4a34be 100644
--- a/demos/STM32/RT-STM32F407-DISCOVERY-G++/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F407-DISCOVERY-G++/cfg/halconf.h
@@ -1,532 +1,532 @@
-/*
-    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/**
- * @file    templates/halconf.h
- * @brief   HAL configuration header.
- * @details HAL configuration file, this file allows to enable or disable the
- *          various device drivers from your application. You may also use
- *          this file in order to override the device drivers default settings.
- *
- * @addtogroup HAL_CONF
- * @{
- */
-
-#ifndef HALCONF_H
-#define HALCONF_H
-
-#define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
-
-#include "mcuconf.h"
-
-/**
- * @brief   Enables the PAL subsystem.
- */
-#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)
-#define HAL_USE_PAL                         TRUE
-#endif
-
-/**
- * @brief   Enables the ADC subsystem.
- */
-#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
-#define HAL_USE_ADC                         FALSE
-#endif
-
-/**
- * @brief   Enables the CAN subsystem.
- */
-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
-#define HAL_USE_CAN                         FALSE
-#endif
-
-/**
- * @brief   Enables the cryptographic subsystem.
- */
-#if !defined(HAL_USE_CRY) || defined(__DOXYGEN__)
-#define HAL_USE_CRY                         FALSE
-#endif
-
-/**
- * @brief   Enables the DAC subsystem.
- */
-#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
-#define HAL_USE_DAC                         FALSE
-#endif
-
-/**
- * @brief   Enables the EXT subsystem.
- */
-#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)
-#define HAL_USE_EXT                         FALSE
-#endif
-
-/**
- * @brief   Enables the GPT subsystem.
- */
-#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
-#define HAL_USE_GPT                         FALSE
-#endif
-
-/**
- * @brief   Enables the I2C subsystem.
- */
-#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
-#define HAL_USE_I2C                         FALSE
-#endif
-
-/**
- * @brief   Enables the I2S subsystem.
- */
-#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)
-#define HAL_USE_I2S                         FALSE
-#endif
-
-/**
- * @brief   Enables the ICU subsystem.
- */
-#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
-#define HAL_USE_ICU                         FALSE
-#endif
-
-/**
- * @brief   Enables the MAC subsystem.
- */
-#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
-#define HAL_USE_MAC                         FALSE
-#endif
-
-/**
- * @brief   Enables the MMC_SPI subsystem.
- */
-#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
-#define HAL_USE_MMC_SPI                     FALSE
-#endif
-
-/**
- * @brief   Enables the PWM subsystem.
- */
-#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
-#define HAL_USE_PWM                         TRUE
-#endif
-
-/**
- * @brief   Enables the RTC subsystem.
- */
-#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
-#define HAL_USE_RTC                         FALSE
-#endif
-
-/**
- * @brief   Enables the SDC subsystem.
- */
-#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
-#define HAL_USE_SDC                         FALSE
-#endif
-
-/**
- * @brief   Enables the SERIAL subsystem.
- */
-#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL                      TRUE
-#endif
-
-/**
- * @brief   Enables the SERIAL over USB subsystem.
- */
-#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL_USB                  FALSE
-#endif
-
-/**
- * @brief   Enables the SIO subsystem.
- */
-#if !defined(HAL_USE_SIO) || defined(__DOXYGEN__)
-#define HAL_USE_SIO                         FALSE
-#endif
-
-/**
- * @brief   Enables the SPI subsystem.
- */
-#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
-#define HAL_USE_SPI                         FALSE
-#endif
-
-/**
- * @brief   Enables the TRNG subsystem.
- */
-#if !defined(HAL_USE_TRNG) || defined(__DOXYGEN__)
-#define HAL_USE_TRNG                        FALSE
-#endif
-
-/**
- * @brief   Enables the UART subsystem.
- */
-#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
-#define HAL_USE_UART                        FALSE
-#endif
-
-/**
- * @brief   Enables the USB subsystem.
- */
-#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
-#define HAL_USE_USB                         FALSE
-#endif
-
-/**
- * @brief   Enables the WDG subsystem.
- */
-#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__)
-#define HAL_USE_WDG                         FALSE
-#endif
-
-/**
- * @brief   Enables the WSPI subsystem.
- */
-#if !defined(HAL_USE_WSPI) || defined(__DOXYGEN__)
-#define HAL_USE_WSPI                        FALSE
-#endif
-
-/*===========================================================================*/
-/* PAL driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__)
-#define PAL_USE_CALLBACKS                   FALSE
-#endif
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(PAL_USE_WAIT) || defined(__DOXYGEN__)
-#define PAL_USE_WAIT                        FALSE
-#endif
-
-/*===========================================================================*/
-/* ADC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
-#define ADC_USE_WAIT                        TRUE
-#endif
-
-/**
- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define ADC_USE_MUTUAL_EXCLUSION            TRUE
-#endif
-
-/*===========================================================================*/
-/* CAN driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Sleep mode related APIs inclusion switch.
- */
-#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
-#define CAN_USE_SLEEP_MODE                  TRUE
-#endif
-
-/**
- * @brief   Enforces the driver to use direct callbacks rather than OSAL events.
- */
-#if !defined(CAN_ENFORCE_USE_CALLBACKS) || defined(__DOXYGEN__)
-#define CAN_ENFORCE_USE_CALLBACKS           FALSE
-#endif
-
-/*===========================================================================*/
-/* CRY driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables the SW fall-back of the cryptographic driver.
- * @details When enabled, this option, activates a fall-back software
- *          implementation for algorithms not supported by the underlying
- *          hardware.
- * @note    Fall-back implementations may not be present for all algorithms.
- */
-#if !defined(HAL_CRY_USE_FALLBACK) || defined(__DOXYGEN__)
-#define HAL_CRY_USE_FALLBACK                FALSE
-#endif
-
-/**
- * @brief   Makes the driver forcibly use the fall-back implementations.
- */
-#if !defined(HAL_CRY_ENFORCE_FALLBACK) || defined(__DOXYGEN__)
-#define HAL_CRY_ENFORCE_FALLBACK            FALSE
-#endif
-
-/*===========================================================================*/
-/* DAC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(DAC_USE_WAIT) || defined(__DOXYGEN__)
-#define DAC_USE_WAIT                        TRUE
-#endif
-
-/**
- * @brief   Enables the @p dacAcquireBus() and @p dacReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(DAC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define DAC_USE_MUTUAL_EXCLUSION            TRUE
-#endif
-
-/*===========================================================================*/
-/* I2C driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables the mutual exclusion APIs on the I2C bus.
- */
-#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define I2C_USE_MUTUAL_EXCLUSION            TRUE
-#endif
-
-/*===========================================================================*/
-/* MAC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables the zero-copy API.
- */
-#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
-#define MAC_USE_ZERO_COPY                   FALSE
-#endif
-
-/**
- * @brief   Enables an event sources for incoming packets.
- */
-#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
-#define MAC_USE_EVENTS                      TRUE
-#endif
-
-/*===========================================================================*/
-/* MMC_SPI driver related settings.                                          */
-/*===========================================================================*/
-
-/**
- * @brief   Delays insertions.
- * @details If enabled this options inserts delays into the MMC waiting
- *          routines releasing some extra CPU time for the threads with
- *          lower priority, this may slow down the driver a bit however.
- *          This option is recommended also if the SPI driver does not
- *          use a DMA channel and heavily loads the CPU.
- */
-#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
-#define MMC_NICE_WAITING                    TRUE
-#endif
-
-/*===========================================================================*/
-/* SDC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Number of initialization attempts before rejecting the card.
- * @note    Attempts are performed at 10mS intervals.
- */
-#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
-#define SDC_INIT_RETRY                      100
-#endif
-
-/**
- * @brief   Include support for MMC cards.
- * @note    MMC support is not yet implemented so this option must be kept
- *          at @p FALSE.
- */
-#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
-#define SDC_MMC_SUPPORT                     FALSE
-#endif
-
-/**
- * @brief   Delays insertions.
- * @details If enabled this options inserts delays into the MMC waiting
- *          routines releasing some extra CPU time for the threads with
- *          lower priority, this may slow down the driver a bit however.
- */
-#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
-#define SDC_NICE_WAITING                    TRUE
-#endif
-
-/**
- * @brief   OCR initialization constant for V20 cards.
- */
-#if !defined(SDC_INIT_OCR_V20) || defined(__DOXYGEN__)
-#define SDC_INIT_OCR_V20                    0x50FF8000U
-#endif
-
-/**
- * @brief   OCR initialization constant for non-V20 cards.
- */
-#if !defined(SDC_INIT_OCR) || defined(__DOXYGEN__)
-#define SDC_INIT_OCR                        0x80100000U
-#endif
-
-/*===========================================================================*/
-/* SERIAL driver related settings.                                           */
-/*===========================================================================*/
-
-/**
- * @brief   Default bit rate.
- * @details Configuration parameter, this is the baud rate selected for the
- *          default configuration.
- */
-#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
-#define SERIAL_DEFAULT_BITRATE              38400
-#endif
-
-/**
- * @brief   Serial buffers size.
- * @details Configuration parameter, you can change the depth of the queue
- *          buffers depending on the requirements of your application.
- * @note    The default is 16 bytes for both the transmission and receive
- *          buffers.
- */
-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
-#define SERIAL_BUFFERS_SIZE                 16
-#endif
-
-/*===========================================================================*/
-/* SERIAL_USB driver related setting.                                        */
-/*===========================================================================*/
-
-/**
- * @brief   Serial over USB buffers size.
- * @details Configuration parameter, the buffer size must be a multiple of
- *          the USB data endpoint maximum packet size.
- * @note    The default is 256 bytes for both the transmission and receive
- *          buffers.
- */
-#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)
-#define SERIAL_USB_BUFFERS_SIZE             256
-#endif
-
-/**
- * @brief   Serial over USB number of buffers.
- * @note    The default is 2 buffers.
- */
-#if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
-#define SERIAL_USB_BUFFERS_NUMBER           2
-#endif
-
-/*===========================================================================*/
-/* SPI driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
-#define SPI_USE_WAIT                        TRUE
-#endif
-
-/**
- * @brief   Enables circular transfers APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(SPI_USE_CIRCULAR) || defined(__DOXYGEN__)
-#define SPI_USE_CIRCULAR                    FALSE
-#endif
-
-
-/**
- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define SPI_USE_MUTUAL_EXCLUSION            TRUE
-#endif
-
-/**
- * @brief   Handling method for SPI CS line.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(SPI_SELECT_MODE) || defined(__DOXYGEN__)
-#define SPI_SELECT_MODE                     SPI_SELECT_MODE_PAD
-#endif
-
-/*===========================================================================*/
-/* UART driver related settings.                                             */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(UART_USE_WAIT) || defined(__DOXYGEN__)
-#define UART_USE_WAIT                       FALSE
-#endif
-
-/**
- * @brief   Enables the @p uartAcquireBus() and @p uartReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(UART_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define UART_USE_MUTUAL_EXCLUSION           FALSE
-#endif
-
-/*===========================================================================*/
-/* USB driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(USB_USE_WAIT) || defined(__DOXYGEN__)
-#define USB_USE_WAIT                        FALSE
-#endif
-
-/*===========================================================================*/
-/* WSPI driver related settings.                                             */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(WSPI_USE_WAIT) || defined(__DOXYGEN__)
-#define WSPI_USE_WAIT                       TRUE
-#endif
-
-/**
- * @brief   Enables the @p wspiAcquireBus() and @p wspiReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#if !defined(WSPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define WSPI_USE_MUTUAL_EXCLUSION           TRUE
-#endif
-
-#endif /* HALCONF_H */
-
-/** @} */
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    templates/halconf.h
+ * @brief   HAL configuration header.
+ * @details HAL configuration file, this file allows to enable or disable the
+ *          various device drivers from your application. You may also use
+ *          this file in order to override the device drivers default settings.
+ *
+ * @addtogroup HAL_CONF
+ * @{
+ */
+
+#ifndef HALCONF_H
+#define HALCONF_H
+
+#define _CHIBIOS_HAL_CONF_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
+
+#include "mcuconf.h"
+
+/**
+ * @brief   Enables the PAL subsystem.
+ */
+#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)
+#define HAL_USE_PAL                         TRUE
+#endif
+
+/**
+ * @brief   Enables the ADC subsystem.
+ */
+#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
+#define HAL_USE_ADC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the CAN subsystem.
+ */
+#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
+#define HAL_USE_CAN                         FALSE
+#endif
+
+/**
+ * @brief   Enables the cryptographic subsystem.
+ */
+#if !defined(HAL_USE_CRY) || defined(__DOXYGEN__)
+#define HAL_USE_CRY                         FALSE
+#endif
+
+/**
+ * @brief   Enables the DAC subsystem.
+ */
+#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
+#define HAL_USE_DAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the EXT subsystem.
+ */
+#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__)
+#define HAL_USE_EXT                         FALSE
+#endif
+
+/**
+ * @brief   Enables the GPT subsystem.
+ */
+#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
+#define HAL_USE_GPT                         FALSE
+#endif
+
+/**
+ * @brief   Enables the I2C subsystem.
+ */
+#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
+#define HAL_USE_I2C                         FALSE
+#endif
+
+/**
+ * @brief   Enables the I2S subsystem.
+ */
+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)
+#define HAL_USE_I2S                         FALSE
+#endif
+
+/**
+ * @brief   Enables the ICU subsystem.
+ */
+#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
+#define HAL_USE_ICU                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MAC subsystem.
+ */
+#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
+#define HAL_USE_MAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MMC_SPI subsystem.
+ */
+#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_MMC_SPI                     FALSE
+#endif
+
+/**
+ * @brief   Enables the PWM subsystem.
+ */
+#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
+#define HAL_USE_PWM                         TRUE
+#endif
+
+/**
+ * @brief   Enables the RTC subsystem.
+ */
+#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
+#define HAL_USE_RTC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SDC subsystem.
+ */
+#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
+#define HAL_USE_SDC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL subsystem.
+ */
+#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL                      TRUE
+#endif
+
+/**
+ * @brief   Enables the SERIAL over USB subsystem.
+ */
+#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL_USB                  FALSE
+#endif
+
+/**
+ * @brief   Enables the SIO subsystem.
+ */
+#if !defined(HAL_USE_SIO) || defined(__DOXYGEN__)
+#define HAL_USE_SIO                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SPI subsystem.
+ */
+#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_SPI                         FALSE
+#endif
+
+/**
+ * @brief   Enables the TRNG subsystem.
+ */
+#if !defined(HAL_USE_TRNG) || defined(__DOXYGEN__)
+#define HAL_USE_TRNG                        FALSE
+#endif
+
+/**
+ * @brief   Enables the UART subsystem.
+ */
+#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
+#define HAL_USE_UART                        FALSE
+#endif
+
+/**
+ * @brief   Enables the USB subsystem.
+ */
+#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
+#define HAL_USE_USB                         FALSE
+#endif
+
+/**
+ * @brief   Enables the WDG subsystem.
+ */
+#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__)
+#define HAL_USE_WDG                         FALSE
+#endif
+
+/**
+ * @brief   Enables the WSPI subsystem.
+ */
+#if !defined(HAL_USE_WSPI) || defined(__DOXYGEN__)
+#define HAL_USE_WSPI                        FALSE
+#endif
+
+/*===========================================================================*/
+/* PAL driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define PAL_USE_CALLBACKS                   FALSE
+#endif
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_WAIT) || defined(__DOXYGEN__)
+#define PAL_USE_WAIT                        FALSE
+#endif
+
+/*===========================================================================*/
+/* ADC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
+#define ADC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define ADC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* CAN driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Sleep mode related APIs inclusion switch.
+ */
+#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
+#define CAN_USE_SLEEP_MODE                  TRUE
+#endif
+
+/**
+ * @brief   Enforces the driver to use direct callbacks rather than OSAL events.
+ */
+#if !defined(CAN_ENFORCE_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define CAN_ENFORCE_USE_CALLBACKS           FALSE
+#endif
+
+/*===========================================================================*/
+/* CRY driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the SW fall-back of the cryptographic driver.
+ * @details When enabled, this option, activates a fall-back software
+ *          implementation for algorithms not supported by the underlying
+ *          hardware.
+ * @note    Fall-back implementations may not be present for all algorithms.
+ */
+#if !defined(HAL_CRY_USE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_USE_FALLBACK                FALSE
+#endif
+
+/**
+ * @brief   Makes the driver forcibly use the fall-back implementations.
+ */
+#if !defined(HAL_CRY_ENFORCE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_ENFORCE_FALLBACK            FALSE
+#endif
+
+/*===========================================================================*/
+/* DAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_WAIT) || defined(__DOXYGEN__)
+#define DAC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p dacAcquireBus() and @p dacReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define DAC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* I2C driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the mutual exclusion APIs on the I2C bus.
+ */
+#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define I2C_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* MAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the zero-copy API.
+ */
+#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
+#define MAC_USE_ZERO_COPY                   FALSE
+#endif
+
+/**
+ * @brief   Enables an event sources for incoming packets.
+ */
+#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
+#define MAC_USE_EVENTS                      TRUE
+#endif
+
+/*===========================================================================*/
+/* MMC_SPI driver related settings.                                          */
+/*===========================================================================*/
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ *          This option is recommended also if the SPI driver does not
+ *          use a DMA channel and heavily loads the CPU.
+ */
+#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
+#define MMC_NICE_WAITING                    TRUE
+#endif
+
+/*===========================================================================*/
+/* SDC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Number of initialization attempts before rejecting the card.
+ * @note    Attempts are performed at 10mS intervals.
+ */
+#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
+#define SDC_INIT_RETRY                      100
+#endif
+
+/**
+ * @brief   Include support for MMC cards.
+ * @note    MMC support is not yet implemented so this option must be kept
+ *          at @p FALSE.
+ */
+#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
+#define SDC_MMC_SUPPORT                     FALSE
+#endif
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ */
+#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
+#define SDC_NICE_WAITING                    TRUE
+#endif
+
+/**
+ * @brief   OCR initialization constant for V20 cards.
+ */
+#if !defined(SDC_INIT_OCR_V20) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR_V20                    0x50FF8000U
+#endif
+
+/**
+ * @brief   OCR initialization constant for non-V20 cards.
+ */
+#if !defined(SDC_INIT_OCR) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR                        0x80100000U
+#endif
+
+/*===========================================================================*/
+/* SERIAL driver related settings.                                           */
+/*===========================================================================*/
+
+/**
+ * @brief   Default bit rate.
+ * @details Configuration parameter, this is the baud rate selected for the
+ *          default configuration.
+ */
+#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
+#define SERIAL_DEFAULT_BITRATE              38400
+#endif
+
+/**
+ * @brief   Serial buffers size.
+ * @details Configuration parameter, you can change the depth of the queue
+ *          buffers depending on the requirements of your application.
+ * @note    The default is 16 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_BUFFERS_SIZE                 16
+#endif
+
+/*===========================================================================*/
+/* SERIAL_USB driver related setting.                                        */
+/*===========================================================================*/
+
+/**
+ * @brief   Serial over USB buffers size.
+ * @details Configuration parameter, the buffer size must be a multiple of
+ *          the USB data endpoint maximum packet size.
+ * @note    The default is 256 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_SIZE             256
+#endif
+
+/**
+ * @brief   Serial over USB number of buffers.
+ * @note    The default is 2 buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_NUMBER           2
+#endif
+
+/*===========================================================================*/
+/* SPI driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
+#define SPI_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables circular transfers APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_CIRCULAR) || defined(__DOXYGEN__)
+#define SPI_USE_CIRCULAR                    FALSE
+#endif
+
+
+/**
+ * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define SPI_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/**
+ * @brief   Handling method for SPI CS line.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_SELECT_MODE) || defined(__DOXYGEN__)
+#define SPI_SELECT_MODE                     SPI_SELECT_MODE_PAD
+#endif
+
+/*===========================================================================*/
+/* UART driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_WAIT) || defined(__DOXYGEN__)
+#define UART_USE_WAIT                       FALSE
+#endif
+
+/**
+ * @brief   Enables the @p uartAcquireBus() and @p uartReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define UART_USE_MUTUAL_EXCLUSION           FALSE
+#endif
+
+/*===========================================================================*/
+/* USB driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(USB_USE_WAIT) || defined(__DOXYGEN__)
+#define USB_USE_WAIT                        FALSE
+#endif
+
+/*===========================================================================*/
+/* WSPI driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_WAIT) || defined(__DOXYGEN__)
+#define WSPI_USE_WAIT                       TRUE
+#endif
+
+/**
+ * @brief   Enables the @p wspiAcquireBus() and @p wspiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define WSPI_USE_MUTUAL_EXCLUSION           TRUE
+#endif
+
+#endif /* HALCONF_H */
+
+/** @} */
diff --git a/demos/STM32/RT-STM32F407-DISCOVERY/cfg/chconf.h b/demos/STM32/RT-STM32F407-DISCOVERY/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32F407-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F407-DISCOVERY/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F407-DISCOVERY/cfg/halconf.h b/demos/STM32/RT-STM32F407-DISCOVERY/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F407-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F407-DISCOVERY/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F410RB-NUCLEO64/cfg/chconf.h b/demos/STM32/RT-STM32F410RB-NUCLEO64/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32F410RB-NUCLEO64/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F410RB-NUCLEO64/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F410RB-NUCLEO64/cfg/halconf.h b/demos/STM32/RT-STM32F410RB-NUCLEO64/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F410RB-NUCLEO64/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F410RB-NUCLEO64/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F411RE-NUCLEO64/cfg/chconf.h b/demos/STM32/RT-STM32F411RE-NUCLEO64/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32F411RE-NUCLEO64/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F411RE-NUCLEO64/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F411RE-NUCLEO64/cfg/halconf.h b/demos/STM32/RT-STM32F411RE-NUCLEO64/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F411RE-NUCLEO64/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F411RE-NUCLEO64/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F412ZG-NUCLEO144/cfg/chconf.h b/demos/STM32/RT-STM32F412ZG-NUCLEO144/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32F412ZG-NUCLEO144/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F412ZG-NUCLEO144/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F412ZG-NUCLEO144/cfg/halconf.h b/demos/STM32/RT-STM32F412ZG-NUCLEO144/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F412ZG-NUCLEO144/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F412ZG-NUCLEO144/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F413ZH-NUCLEO144/cfg/chconf.h b/demos/STM32/RT-STM32F413ZH-NUCLEO144/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32F413ZH-NUCLEO144/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F413ZH-NUCLEO144/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F413ZH-NUCLEO144/cfg/halconf.h b/demos/STM32/RT-STM32F413ZH-NUCLEO144/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F413ZH-NUCLEO144/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F413ZH-NUCLEO144/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F429-DISCOVERY/cfg/chconf.h b/demos/STM32/RT-STM32F429-DISCOVERY/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32F429-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F429-DISCOVERY/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F429-DISCOVERY/cfg/halconf.h b/demos/STM32/RT-STM32F429-DISCOVERY/cfg/halconf.h
index 86d17e425..87dc5beb8 100644
--- a/demos/STM32/RT-STM32F429-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F429-DISCOVERY/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F429ZI-NUCLEO144/cfg/chconf.h b/demos/STM32/RT-STM32F429ZI-NUCLEO144/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32F429ZI-NUCLEO144/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F429ZI-NUCLEO144/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F429ZI-NUCLEO144/cfg/halconf.h b/demos/STM32/RT-STM32F429ZI-NUCLEO144/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F429ZI-NUCLEO144/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F429ZI-NUCLEO144/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F446RE-NUCLEO64/cfg/chconf.h b/demos/STM32/RT-STM32F446RE-NUCLEO64/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32F446RE-NUCLEO64/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F446RE-NUCLEO64/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F446RE-NUCLEO64/cfg/halconf.h b/demos/STM32/RT-STM32F446RE-NUCLEO64/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F446RE-NUCLEO64/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F446RE-NUCLEO64/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F446ZE-NUCLEO144/cfg/chconf.h b/demos/STM32/RT-STM32F446ZE-NUCLEO144/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32F446ZE-NUCLEO144/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F446ZE-NUCLEO144/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F446ZE-NUCLEO144/cfg/halconf.h b/demos/STM32/RT-STM32F446ZE-NUCLEO144/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F446ZE-NUCLEO144/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F446ZE-NUCLEO144/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F469I-DISCOVERY/cfg/chconf.h b/demos/STM32/RT-STM32F469I-DISCOVERY/cfg/chconf.h
index 6f7e309c7..be5b9a62c 100644
--- a/demos/STM32/RT-STM32F469I-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F469I-DISCOVERY/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F469I-DISCOVERY/cfg/halconf.h b/demos/STM32/RT-STM32F469I-DISCOVERY/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F469I-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F469I-DISCOVERY/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F722ZE-NUCLEO144/cfg/chconf.h b/demos/STM32/RT-STM32F722ZE-NUCLEO144/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32F722ZE-NUCLEO144/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F722ZE-NUCLEO144/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F722ZE-NUCLEO144/cfg/halconf.h b/demos/STM32/RT-STM32F722ZE-NUCLEO144/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F722ZE-NUCLEO144/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F722ZE-NUCLEO144/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY/cfg/chconf.h b/demos/STM32/RT-STM32F746G-DISCOVERY/cfg/chconf.h
index 6f7e309c7..be5b9a62c 100644
--- a/demos/STM32/RT-STM32F746G-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F746G-DISCOVERY/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY/cfg/halconf.h b/demos/STM32/RT-STM32F746G-DISCOVERY/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F746G-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F746G-DISCOVERY/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F746ZG-NUCLEO144/cfg/chconf.h b/demos/STM32/RT-STM32F746ZG-NUCLEO144/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32F746ZG-NUCLEO144/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F746ZG-NUCLEO144/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F746ZG-NUCLEO144/cfg/halconf.h b/demos/STM32/RT-STM32F746ZG-NUCLEO144/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F746ZG-NUCLEO144/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F746ZG-NUCLEO144/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F756ZG-NUCLEO144/cfg/chconf.h b/demos/STM32/RT-STM32F756ZG-NUCLEO144/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32F756ZG-NUCLEO144/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F756ZG-NUCLEO144/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F756ZG-NUCLEO144/cfg/halconf.h b/demos/STM32/RT-STM32F756ZG-NUCLEO144/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F756ZG-NUCLEO144/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F756ZG-NUCLEO144/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F767ZI-NUCLEO144/cfg/chconf.h b/demos/STM32/RT-STM32F767ZI-NUCLEO144/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32F767ZI-NUCLEO144/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F767ZI-NUCLEO144/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F767ZI-NUCLEO144/cfg/halconf.h b/demos/STM32/RT-STM32F767ZI-NUCLEO144/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F767ZI-NUCLEO144/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F767ZI-NUCLEO144/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32F769I-DISCOVERY/cfg/chconf.h b/demos/STM32/RT-STM32F769I-DISCOVERY/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32F769I-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/RT-STM32F769I-DISCOVERY/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32F769I-DISCOVERY/cfg/halconf.h b/demos/STM32/RT-STM32F769I-DISCOVERY/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32F769I-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F769I-DISCOVERY/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32H743I-NUCLEO144/cfg/chconf.h b/demos/STM32/RT-STM32H743I-NUCLEO144/cfg/chconf.h
index 6f7e309c7..be5b9a62c 100644
--- a/demos/STM32/RT-STM32H743I-NUCLEO144/cfg/chconf.h
+++ b/demos/STM32/RT-STM32H743I-NUCLEO144/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32H743I-NUCLEO144/cfg/halconf.h b/demos/STM32/RT-STM32H743I-NUCLEO144/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32H743I-NUCLEO144/cfg/halconf.h
+++ b/demos/STM32/RT-STM32H743I-NUCLEO144/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32L031K6-NUCLEO32/cfg/chconf.h b/demos/STM32/RT-STM32L031K6-NUCLEO32/cfg/chconf.h
index 68b1e8a98..41e58ce96 100644
--- a/demos/STM32/RT-STM32L031K6-NUCLEO32/cfg/chconf.h
+++ b/demos/STM32/RT-STM32L031K6-NUCLEO32/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32L031K6-NUCLEO32/cfg/halconf.h b/demos/STM32/RT-STM32L031K6-NUCLEO32/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32L031K6-NUCLEO32/cfg/halconf.h
+++ b/demos/STM32/RT-STM32L031K6-NUCLEO32/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32L053-DISCOVERY/cfg/chconf.h b/demos/STM32/RT-STM32L053-DISCOVERY/cfg/chconf.h
index 68b1e8a98..41e58ce96 100644
--- a/demos/STM32/RT-STM32L053-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/RT-STM32L053-DISCOVERY/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32L053-DISCOVERY/cfg/halconf.h b/demos/STM32/RT-STM32L053-DISCOVERY/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32L053-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/RT-STM32L053-DISCOVERY/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32L053R8-NUCLEO64/cfg/chconf.h b/demos/STM32/RT-STM32L053R8-NUCLEO64/cfg/chconf.h
index 68b1e8a98..41e58ce96 100644
--- a/demos/STM32/RT-STM32L053R8-NUCLEO64/cfg/chconf.h
+++ b/demos/STM32/RT-STM32L053R8-NUCLEO64/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32L053R8-NUCLEO64/cfg/halconf.h b/demos/STM32/RT-STM32L053R8-NUCLEO64/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32L053R8-NUCLEO64/cfg/halconf.h
+++ b/demos/STM32/RT-STM32L053R8-NUCLEO64/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32L073RZ-NUCLEO64/cfg/chconf.h b/demos/STM32/RT-STM32L073RZ-NUCLEO64/cfg/chconf.h
index 68b1e8a98..41e58ce96 100644
--- a/demos/STM32/RT-STM32L073RZ-NUCLEO64/cfg/chconf.h
+++ b/demos/STM32/RT-STM32L073RZ-NUCLEO64/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32L073RZ-NUCLEO64/cfg/halconf.h b/demos/STM32/RT-STM32L073RZ-NUCLEO64/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32L073RZ-NUCLEO64/cfg/halconf.h
+++ b/demos/STM32/RT-STM32L073RZ-NUCLEO64/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32L152-DISCOVERY/cfg/chconf.h b/demos/STM32/RT-STM32L152-DISCOVERY/cfg/chconf.h
index 45c6d83a5..da10c0bc2 100644
--- a/demos/STM32/RT-STM32L152-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/RT-STM32L152-DISCOVERY/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32L152-DISCOVERY/cfg/halconf.h b/demos/STM32/RT-STM32L152-DISCOVERY/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32L152-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/RT-STM32L152-DISCOVERY/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32L152RE-NUCLEO64/cfg/chconf.h b/demos/STM32/RT-STM32L152RE-NUCLEO64/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32L152RE-NUCLEO64/cfg/chconf.h
+++ b/demos/STM32/RT-STM32L152RE-NUCLEO64/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32L152RE-NUCLEO64/cfg/halconf.h b/demos/STM32/RT-STM32L152RE-NUCLEO64/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32L152RE-NUCLEO64/cfg/halconf.h
+++ b/demos/STM32/RT-STM32L152RE-NUCLEO64/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32L432KC-NUCLEO32/cfg/chconf.h b/demos/STM32/RT-STM32L432KC-NUCLEO32/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32L432KC-NUCLEO32/cfg/chconf.h
+++ b/demos/STM32/RT-STM32L432KC-NUCLEO32/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32L432KC-NUCLEO32/cfg/halconf.h b/demos/STM32/RT-STM32L432KC-NUCLEO32/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32L432KC-NUCLEO32/cfg/halconf.h
+++ b/demos/STM32/RT-STM32L432KC-NUCLEO32/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32L476-DISCOVERY/cfg/chconf.h b/demos/STM32/RT-STM32L476-DISCOVERY/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32L476-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/RT-STM32L476-DISCOVERY/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32L476-DISCOVERY/cfg/halconf.h b/demos/STM32/RT-STM32L476-DISCOVERY/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32L476-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/RT-STM32L476-DISCOVERY/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32L476RG-NUCLEO64/cfg/chconf.h b/demos/STM32/RT-STM32L476RG-NUCLEO64/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32L476RG-NUCLEO64/cfg/chconf.h
+++ b/demos/STM32/RT-STM32L476RG-NUCLEO64/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32L476RG-NUCLEO64/cfg/halconf.h b/demos/STM32/RT-STM32L476RG-NUCLEO64/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32L476RG-NUCLEO64/cfg/halconf.h
+++ b/demos/STM32/RT-STM32L476RG-NUCLEO64/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32L496ZG-NUCLEO144/cfg/chconf.h b/demos/STM32/RT-STM32L496ZG-NUCLEO144/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32L496ZG-NUCLEO144/cfg/chconf.h
+++ b/demos/STM32/RT-STM32L496ZG-NUCLEO144/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32L496ZG-NUCLEO144/cfg/halconf.h b/demos/STM32/RT-STM32L496ZG-NUCLEO144/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32L496ZG-NUCLEO144/cfg/halconf.h
+++ b/demos/STM32/RT-STM32L496ZG-NUCLEO144/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/chconf.h b/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/chconf.h
+++ b/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/halconf.h b/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/halconf.h
+++ b/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/STM32/RT-STM32L4R9-DISCOVERY/cfg/chconf.h b/demos/STM32/RT-STM32L4R9-DISCOVERY/cfg/chconf.h
index a7343edc2..e50f15cce 100644
--- a/demos/STM32/RT-STM32L4R9-DISCOVERY/cfg/chconf.h
+++ b/demos/STM32/RT-STM32L4R9-DISCOVERY/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/STM32/RT-STM32L4R9-DISCOVERY/cfg/halconf.h b/demos/STM32/RT-STM32L4R9-DISCOVERY/cfg/halconf.h
index 89be0946a..62efc9d90 100644
--- a/demos/STM32/RT-STM32L4R9-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/RT-STM32L4R9-DISCOVERY/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/various/NIL-ARMCM0-GENERIC/cfg/chconf.h b/demos/various/NIL-ARMCM0-GENERIC/cfg/chconf.h
index c6507a891..a9f28f1ad 100644
--- a/demos/various/NIL-ARMCM0-GENERIC/cfg/chconf.h
+++ b/demos/various/NIL-ARMCM0-GENERIC/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    nil/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
@@ -29,7 +29,7 @@
 #define CHCONF_H
 
 #define _CHIBIOS_NIL_CONF_
-#define _CHIBIOS_NIL_CONF_VER_3_0_
+#define _CHIBIOS_NIL_CONF_VER_3_2_
 
 /*===========================================================================*/
 /**
diff --git a/demos/various/NIL-ARMCM4-GENERIC/cfg/chconf.h b/demos/various/NIL-ARMCM4-GENERIC/cfg/chconf.h
index c6507a891..a9f28f1ad 100644
--- a/demos/various/NIL-ARMCM4-GENERIC/cfg/chconf.h
+++ b/demos/various/NIL-ARMCM4-GENERIC/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    nil/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
@@ -29,7 +29,7 @@
 #define CHCONF_H
 
 #define _CHIBIOS_NIL_CONF_
-#define _CHIBIOS_NIL_CONF_VER_3_0_
+#define _CHIBIOS_NIL_CONF_VER_3_2_
 
 /*===========================================================================*/
 /**
diff --git a/demos/various/RT-ARM7-GENERIC/chconf.h b/demos/various/RT-ARM7-GENERIC/chconf.h
index 99a414275..070151bdb 100644
--- a/demos/various/RT-ARM7-GENERIC/chconf.h
+++ b/demos/various/RT-ARM7-GENERIC/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/various/RT-ARMCM0-GENERIC/cfg/chconf.h b/demos/various/RT-ARMCM0-GENERIC/cfg/chconf.h
index 99a414275..070151bdb 100644
--- a/demos/various/RT-ARMCM0-GENERIC/cfg/chconf.h
+++ b/demos/various/RT-ARMCM0-GENERIC/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/various/RT-ARMCM4-GENERIC/cfg/chconf.h b/demos/various/RT-ARMCM4-GENERIC/cfg/chconf.h
index 6a8831526..78698eb78 100644
--- a/demos/various/RT-ARMCM4-GENERIC/cfg/chconf.h
+++ b/demos/various/RT-ARMCM4-GENERIC/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/various/RT-Posix-Simulator/cfg/chconf.h b/demos/various/RT-Posix-Simulator/cfg/chconf.h
index 0175ebce3..668319c11 100755
--- a/demos/various/RT-Posix-Simulator/cfg/chconf.h
+++ b/demos/various/RT-Posix-Simulator/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/various/RT-Posix-Simulator/cfg/halconf.h b/demos/various/RT-Posix-Simulator/cfg/halconf.h
index a8bc758c1..dce268583 100755
--- a/demos/various/RT-Posix-Simulator/cfg/halconf.h
+++ b/demos/various/RT-Posix-Simulator/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
 
diff --git a/demos/various/RT-Win32-Simulator/cfg/chconf.h b/demos/various/RT-Win32-Simulator/cfg/chconf.h
index bbff2e4b3..8e61a6261 100644
--- a/demos/various/RT-Win32-Simulator/cfg/chconf.h
+++ b/demos/various/RT-Win32-Simulator/cfg/chconf.h
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    templates/chconf.h
+ * @file    rt/templates/chconf.h
  * @brief   Configuration file template.
  * @details A copy of this file must be placed in each project directory, it
  *          contains the application specific kernel settings.
diff --git a/demos/various/RT-Win32-Simulator/cfg/halconf.h b/demos/various/RT-Win32-Simulator/cfg/halconf.h
index a8bc758c1..dce268583 100644
--- a/demos/various/RT-Win32-Simulator/cfg/halconf.h
+++ b/demos/various/RT-Win32-Simulator/cfg/halconf.h
@@ -29,7 +29,7 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
 #include "mcuconf.h"
author	Giovanni Di Sirio <gdisirio@gmail.com>	2019-01-21 21:11:16 +0000
committer	Giovanni Di Sirio <gdisirio@gmail.com>	2019-01-21 21:11:16 +0000
commit	e351308f44bb293075c1ba40d1757047ee644874 (patch)
tree	901c90c8f8fa878ed69f1d7d3df62658cabbe7bc /demos
parent	9d21d501b5356dd7b85e1e8600846cee5a611ee5 (diff)
download	ChibiOS-e351308f44bb293075c1ba40d1757047ee644874.tar.gz ChibiOS-e351308f44bb293075c1ba40d1757047ee644874.tar.bz2 ChibiOS-e351308f44bb293075c1ba40d1757047ee644874.zip