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 /testhal/STM32
parent: 9d21d501b5356dd7b85e1e8600846cee5a611ee5 (diff)
download: ChibiOS-e351308f44bb293075c1ba40d1757047ee644874.tar.gz
ChibiOS-e351308f44bb293075c1ba40d1757047ee644874.tar.bz2
ChibiOS-e351308f44bb293075c1ba40d1757047ee644874.zip
216 files changed, 220 insertions, 220 deletions
diff --git a/testhal/STM32/STM32F0xx/ADC/chconf.h b/testhal/STM32/STM32F0xx/ADC/chconf.h
index a52e9a5ed..c24e675df 100644
--- a/testhal/STM32/STM32F0xx/ADC/chconf.h
+++ b/testhal/STM32/STM32F0xx/ADC/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/testhal/STM32/STM32F0xx/ADC/halconf.h b/testhal/STM32/STM32F0xx/ADC/halconf.h
index f148b8978..14e276a95 100644
--- a/testhal/STM32/STM32F0xx/ADC/halconf.h
+++ b/testhal/STM32/STM32F0xx/ADC/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/testhal/STM32/STM32F0xx/CAN/chconf.h b/testhal/STM32/STM32F0xx/CAN/chconf.h
index a52e9a5ed..c24e675df 100644
--- a/testhal/STM32/STM32F0xx/CAN/chconf.h
+++ b/testhal/STM32/STM32F0xx/CAN/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/testhal/STM32/STM32F0xx/CAN/halconf.h b/testhal/STM32/STM32F0xx/CAN/halconf.h
index 42441804d..e2272d207 100644
--- a/testhal/STM32/STM32F0xx/CAN/halconf.h
+++ b/testhal/STM32/STM32F0xx/CAN/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/testhal/STM32/STM32F0xx/IRQ_STORM/chconf.h b/testhal/STM32/STM32F0xx/IRQ_STORM/chconf.h
index a52e9a5ed..c24e675df 100644
--- a/testhal/STM32/STM32F0xx/IRQ_STORM/chconf.h
+++ b/testhal/STM32/STM32F0xx/IRQ_STORM/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/testhal/STM32/STM32F0xx/IRQ_STORM/halconf.h b/testhal/STM32/STM32F0xx/IRQ_STORM/halconf.h
index 34923a64c..0ecdd8744 100644
--- a/testhal/STM32/STM32F0xx/IRQ_STORM/halconf.h
+++ b/testhal/STM32/STM32F0xx/IRQ_STORM/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/testhal/STM32/STM32F0xx/PWM-ICU/chconf.h b/testhal/STM32/STM32F0xx/PWM-ICU/chconf.h
index a52e9a5ed..c24e675df 100644
--- a/testhal/STM32/STM32F0xx/PWM-ICU/chconf.h
+++ b/testhal/STM32/STM32F0xx/PWM-ICU/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/testhal/STM32/STM32F0xx/PWM-ICU/halconf.h b/testhal/STM32/STM32F0xx/PWM-ICU/halconf.h
index ff7f355c7..2a2b50405 100644
--- a/testhal/STM32/STM32F0xx/PWM-ICU/halconf.h
+++ b/testhal/STM32/STM32F0xx/PWM-ICU/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/testhal/STM32/STM32F0xx/USB_CDC/chconf.h b/testhal/STM32/STM32F0xx/USB_CDC/chconf.h
index a52e9a5ed..c24e675df 100644
--- a/testhal/STM32/STM32F0xx/USB_CDC/chconf.h
+++ b/testhal/STM32/STM32F0xx/USB_CDC/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/testhal/STM32/STM32F0xx/USB_CDC/halconf.h b/testhal/STM32/STM32F0xx/USB_CDC/halconf.h
index 86d17e425..87dc5beb8 100644
--- a/testhal/STM32/STM32F0xx/USB_CDC/halconf.h
+++ b/testhal/STM32/STM32F0xx/USB_CDC/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/testhal/STM32/STM32F0xx/WDG/chconf.h b/testhal/STM32/STM32F0xx/WDG/chconf.h
index a52e9a5ed..c24e675df 100644
--- a/testhal/STM32/STM32F0xx/WDG/chconf.h
+++ b/testhal/STM32/STM32F0xx/WDG/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/testhal/STM32/STM32F0xx/WDG/halconf.h b/testhal/STM32/STM32F0xx/WDG/halconf.h
index f839dcf23..15c1ec246 100644
--- a/testhal/STM32/STM32F0xx/WDG/halconf.h
+++ b/testhal/STM32/STM32F0xx/WDG/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/testhal/STM32/STM32F1xx/ADC/chconf.h b/testhal/STM32/STM32F1xx/ADC/chconf.h
index cfff73a88..09396bd88 100644
--- a/testhal/STM32/STM32F1xx/ADC/chconf.h
+++ b/testhal/STM32/STM32F1xx/ADC/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/testhal/STM32/STM32F1xx/ADC/halconf.h b/testhal/STM32/STM32F1xx/ADC/halconf.h
index f148b8978..14e276a95 100644
--- a/testhal/STM32/STM32F1xx/ADC/halconf.h
+++ b/testhal/STM32/STM32F1xx/ADC/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/testhal/STM32/STM32F1xx/CAN/chconf.h b/testhal/STM32/STM32F1xx/CAN/chconf.h
index cfff73a88..09396bd88 100644
--- a/testhal/STM32/STM32F1xx/CAN/chconf.h
+++ b/testhal/STM32/STM32F1xx/CAN/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/testhal/STM32/STM32F1xx/CAN/halconf.h b/testhal/STM32/STM32F1xx/CAN/halconf.h
index 42441804d..e2272d207 100644
--- a/testhal/STM32/STM32F1xx/CAN/halconf.h
+++ b/testhal/STM32/STM32F1xx/CAN/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/testhal/STM32/STM32F1xx/I2C/chconf.h b/testhal/STM32/STM32F1xx/I2C/chconf.h
index cfff73a88..09396bd88 100644
--- a/testhal/STM32/STM32F1xx/I2C/chconf.h
+++ b/testhal/STM32/STM32F1xx/I2C/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/testhal/STM32/STM32F1xx/I2C/halconf.h b/testhal/STM32/STM32F1xx/I2C/halconf.h
index 35d657aa1..3ab975bd3 100644
--- a/testhal/STM32/STM32F1xx/I2C/halconf.h
+++ b/testhal/STM32/STM32F1xx/I2C/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/testhal/STM32/STM32F1xx/IRQ_STORM/chconf.h b/testhal/STM32/STM32F1xx/IRQ_STORM/chconf.h
index cfff73a88..09396bd88 100644
--- a/testhal/STM32/STM32F1xx/IRQ_STORM/chconf.h
+++ b/testhal/STM32/STM32F1xx/IRQ_STORM/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/testhal/STM32/STM32F1xx/IRQ_STORM/halconf.h b/testhal/STM32/STM32F1xx/IRQ_STORM/halconf.h
index 34923a64c..0ecdd8744 100644
--- a/testhal/STM32/STM32F1xx/IRQ_STORM/halconf.h
+++ b/testhal/STM32/STM32F1xx/IRQ_STORM/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/testhal/STM32/STM32F1xx/PWM-ICU/chconf.h b/testhal/STM32/STM32F1xx/PWM-ICU/chconf.h
index cfff73a88..09396bd88 100644
--- a/testhal/STM32/STM32F1xx/PWM-ICU/chconf.h
+++ b/testhal/STM32/STM32F1xx/PWM-ICU/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/testhal/STM32/STM32F1xx/PWM-ICU/halconf.h b/testhal/STM32/STM32F1xx/PWM-ICU/halconf.h
index ff7f355c7..2a2b50405 100644
--- a/testhal/STM32/STM32F1xx/PWM-ICU/halconf.h
+++ b/testhal/STM32/STM32F1xx/PWM-ICU/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/testhal/STM32/STM32F1xx/RTC/chconf.h b/testhal/STM32/STM32F1xx/RTC/chconf.h
index 004b376eb..ecc981d20 100644
--- a/testhal/STM32/STM32F1xx/RTC/chconf.h
+++ b/testhal/STM32/STM32F1xx/RTC/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/testhal/STM32/STM32F1xx/RTC/halconf.h b/testhal/STM32/STM32F1xx/RTC/halconf.h
index fdaf3cb71..453c847d7 100644
--- a/testhal/STM32/STM32F1xx/RTC/halconf.h
+++ b/testhal/STM32/STM32F1xx/RTC/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/testhal/STM32/STM32F1xx/SPI/chconf.h b/testhal/STM32/STM32F1xx/SPI/chconf.h
index cfff73a88..09396bd88 100644
--- a/testhal/STM32/STM32F1xx/SPI/chconf.h
+++ b/testhal/STM32/STM32F1xx/SPI/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/testhal/STM32/STM32F1xx/SPI/halconf.h b/testhal/STM32/STM32F1xx/SPI/halconf.h
index 36d32eddb..b77451a2f 100644
--- a/testhal/STM32/STM32F1xx/SPI/halconf.h
+++ b/testhal/STM32/STM32F1xx/SPI/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/testhal/STM32/STM32F1xx/UART/chconf.h b/testhal/STM32/STM32F1xx/UART/chconf.h
index cfff73a88..09396bd88 100644
--- a/testhal/STM32/STM32F1xx/UART/chconf.h
+++ b/testhal/STM32/STM32F1xx/UART/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/testhal/STM32/STM32F1xx/UART/halconf.h b/testhal/STM32/STM32F1xx/UART/halconf.h
index 9780b95b9..bdd0e412c 100644
--- a/testhal/STM32/STM32F1xx/UART/halconf.h
+++ b/testhal/STM32/STM32F1xx/UART/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/testhal/STM32/STM32F1xx/USB_CDC/chconf.h b/testhal/STM32/STM32F1xx/USB_CDC/chconf.h
index cfff73a88..09396bd88 100644
--- a/testhal/STM32/STM32F1xx/USB_CDC/chconf.h
+++ b/testhal/STM32/STM32F1xx/USB_CDC/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/testhal/STM32/STM32F1xx/USB_CDC/halconf.h b/testhal/STM32/STM32F1xx/USB_CDC/halconf.h
index 86d17e425..87dc5beb8 100644
--- a/testhal/STM32/STM32F1xx/USB_CDC/halconf.h
+++ b/testhal/STM32/STM32F1xx/USB_CDC/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/testhal/STM32/STM32F1xx/USB_CDC_F107/chconf.h b/testhal/STM32/STM32F1xx/USB_CDC_F107/chconf.h
index d26540eab..603680cd6 100644
--- a/testhal/STM32/STM32F1xx/USB_CDC_F107/chconf.h
+++ b/testhal/STM32/STM32F1xx/USB_CDC_F107/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/testhal/STM32/STM32F1xx/USB_CDC_F107/halconf.h b/testhal/STM32/STM32F1xx/USB_CDC_F107/halconf.h
index 039b6f3b0..daadfcee8 100644
--- a/testhal/STM32/STM32F1xx/USB_CDC_F107/halconf.h
+++ b/testhal/STM32/STM32F1xx/USB_CDC_F107/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/testhal/STM32/STM32F2xx/PWM-ICU/chconf.h b/testhal/STM32/STM32F2xx/PWM-ICU/chconf.h
index a7343edc2..e50f15cce 100644
--- a/testhal/STM32/STM32F2xx/PWM-ICU/chconf.h
+++ b/testhal/STM32/STM32F2xx/PWM-ICU/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/testhal/STM32/STM32F2xx/PWM-ICU/halconf.h b/testhal/STM32/STM32F2xx/PWM-ICU/halconf.h
index ff7f355c7..2a2b50405 100644
--- a/testhal/STM32/STM32F2xx/PWM-ICU/halconf.h
+++ b/testhal/STM32/STM32F2xx/PWM-ICU/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/testhal/STM32/STM32F2xx/USB_CDC/chconf.h b/testhal/STM32/STM32F2xx/USB_CDC/chconf.h
index a7343edc2..e50f15cce 100644
--- a/testhal/STM32/STM32F2xx/USB_CDC/chconf.h
+++ b/testhal/STM32/STM32F2xx/USB_CDC/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/testhal/STM32/STM32F2xx/USB_CDC/halconf.h b/testhal/STM32/STM32F2xx/USB_CDC/halconf.h
index 0e67cb52a..334fe37ce 100644
--- a/testhal/STM32/STM32F2xx/USB_CDC/halconf.h
+++ b/testhal/STM32/STM32F2xx/USB_CDC/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/testhal/STM32/STM32F37x/ADC/chconf.h b/testhal/STM32/STM32F37x/ADC/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F37x/ADC/chconf.h
+++ b/testhal/STM32/STM32F37x/ADC/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/testhal/STM32/STM32F37x/ADC/halconf.h b/testhal/STM32/STM32F37x/ADC/halconf.h
index f148b8978..14e276a95 100644
--- a/testhal/STM32/STM32F37x/ADC/halconf.h
+++ b/testhal/STM32/STM32F37x/ADC/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/testhal/STM32/STM32F37x/CAN/chconf.h b/testhal/STM32/STM32F37x/CAN/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F37x/CAN/chconf.h
+++ b/testhal/STM32/STM32F37x/CAN/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/testhal/STM32/STM32F37x/CAN/halconf.h b/testhal/STM32/STM32F37x/CAN/halconf.h
index 42441804d..e2272d207 100644
--- a/testhal/STM32/STM32F37x/CAN/halconf.h
+++ b/testhal/STM32/STM32F37x/CAN/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/testhal/STM32/STM32F37x/I2C/chconf.h b/testhal/STM32/STM32F37x/I2C/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F37x/I2C/chconf.h
+++ b/testhal/STM32/STM32F37x/I2C/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/testhal/STM32/STM32F37x/I2C/halconf.h b/testhal/STM32/STM32F37x/I2C/halconf.h
index 35d657aa1..3ab975bd3 100644
--- a/testhal/STM32/STM32F37x/I2C/halconf.h
+++ b/testhal/STM32/STM32F37x/I2C/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/testhal/STM32/STM32F37x/IRQ_STORM/chconf.h b/testhal/STM32/STM32F37x/IRQ_STORM/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F37x/IRQ_STORM/chconf.h
+++ b/testhal/STM32/STM32F37x/IRQ_STORM/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/testhal/STM32/STM32F37x/IRQ_STORM/halconf.h b/testhal/STM32/STM32F37x/IRQ_STORM/halconf.h
index 34923a64c..0ecdd8744 100644
--- a/testhal/STM32/STM32F37x/IRQ_STORM/halconf.h
+++ b/testhal/STM32/STM32F37x/IRQ_STORM/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/testhal/STM32/STM32F37x/PWM-ICU/chconf.h b/testhal/STM32/STM32F37x/PWM-ICU/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F37x/PWM-ICU/chconf.h
+++ b/testhal/STM32/STM32F37x/PWM-ICU/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/testhal/STM32/STM32F37x/PWM-ICU/halconf.h b/testhal/STM32/STM32F37x/PWM-ICU/halconf.h
index ff7f355c7..2a2b50405 100644
--- a/testhal/STM32/STM32F37x/PWM-ICU/halconf.h
+++ b/testhal/STM32/STM32F37x/PWM-ICU/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/testhal/STM32/STM32F37x/SDADC/chconf.h b/testhal/STM32/STM32F37x/SDADC/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F37x/SDADC/chconf.h
+++ b/testhal/STM32/STM32F37x/SDADC/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/testhal/STM32/STM32F37x/SDADC/halconf.h b/testhal/STM32/STM32F37x/SDADC/halconf.h
index f148b8978..14e276a95 100644
--- a/testhal/STM32/STM32F37x/SDADC/halconf.h
+++ b/testhal/STM32/STM32F37x/SDADC/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/testhal/STM32/STM32F37x/SPI/chconf.h b/testhal/STM32/STM32F37x/SPI/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F37x/SPI/chconf.h
+++ b/testhal/STM32/STM32F37x/SPI/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/testhal/STM32/STM32F37x/SPI/halconf.h b/testhal/STM32/STM32F37x/SPI/halconf.h
index 36d32eddb..b77451a2f 100644
--- a/testhal/STM32/STM32F37x/SPI/halconf.h
+++ b/testhal/STM32/STM32F37x/SPI/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/testhal/STM32/STM32F37x/UART/chconf.h b/testhal/STM32/STM32F37x/UART/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F37x/UART/chconf.h
+++ b/testhal/STM32/STM32F37x/UART/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/testhal/STM32/STM32F37x/UART/halconf.h b/testhal/STM32/STM32F37x/UART/halconf.h
index 9780b95b9..bdd0e412c 100644
--- a/testhal/STM32/STM32F37x/UART/halconf.h
+++ b/testhal/STM32/STM32F37x/UART/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/testhal/STM32/STM32F37x/USB_CDC/chconf.h b/testhal/STM32/STM32F37x/USB_CDC/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F37x/USB_CDC/chconf.h
+++ b/testhal/STM32/STM32F37x/USB_CDC/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/testhal/STM32/STM32F37x/USB_CDC/halconf.h b/testhal/STM32/STM32F37x/USB_CDC/halconf.h
index 86d17e425..87dc5beb8 100644
--- a/testhal/STM32/STM32F37x/USB_CDC/halconf.h
+++ b/testhal/STM32/STM32F37x/USB_CDC/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/testhal/STM32/STM32F3xx/ADC/chconf.h b/testhal/STM32/STM32F3xx/ADC/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F3xx/ADC/chconf.h
+++ b/testhal/STM32/STM32F3xx/ADC/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/testhal/STM32/STM32F3xx/ADC/halconf.h b/testhal/STM32/STM32F3xx/ADC/halconf.h
index f148b8978..14e276a95 100644
--- a/testhal/STM32/STM32F3xx/ADC/halconf.h
+++ b/testhal/STM32/STM32F3xx/ADC/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/testhal/STM32/STM32F3xx/ADC_DUAL/chconf.h b/testhal/STM32/STM32F3xx/ADC_DUAL/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F3xx/ADC_DUAL/chconf.h
+++ b/testhal/STM32/STM32F3xx/ADC_DUAL/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/testhal/STM32/STM32F3xx/ADC_DUAL/halconf.h b/testhal/STM32/STM32F3xx/ADC_DUAL/halconf.h
index f148b8978..14e276a95 100644
--- a/testhal/STM32/STM32F3xx/ADC_DUAL/halconf.h
+++ b/testhal/STM32/STM32F3xx/ADC_DUAL/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/testhal/STM32/STM32F3xx/CAN/chconf.h b/testhal/STM32/STM32F3xx/CAN/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F3xx/CAN/chconf.h
+++ b/testhal/STM32/STM32F3xx/CAN/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/testhal/STM32/STM32F3xx/CAN/halconf.h b/testhal/STM32/STM32F3xx/CAN/halconf.h
index 42441804d..e2272d207 100644
--- a/testhal/STM32/STM32F3xx/CAN/halconf.h
+++ b/testhal/STM32/STM32F3xx/CAN/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/testhal/STM32/STM32F3xx/DAC/chconf.h b/testhal/STM32/STM32F3xx/DAC/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F3xx/DAC/chconf.h
+++ b/testhal/STM32/STM32F3xx/DAC/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/testhal/STM32/STM32F3xx/DAC/halconf.h b/testhal/STM32/STM32F3xx/DAC/halconf.h
index 6545cc1ec..11b5dbf7b 100644
--- a/testhal/STM32/STM32F3xx/DAC/halconf.h
+++ b/testhal/STM32/STM32F3xx/DAC/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/testhal/STM32/STM32F3xx/IRQ_STORM/chconf.h b/testhal/STM32/STM32F3xx/IRQ_STORM/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F3xx/IRQ_STORM/chconf.h
+++ b/testhal/STM32/STM32F3xx/IRQ_STORM/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/testhal/STM32/STM32F3xx/IRQ_STORM/halconf.h b/testhal/STM32/STM32F3xx/IRQ_STORM/halconf.h
index 34923a64c..0ecdd8744 100644
--- a/testhal/STM32/STM32F3xx/IRQ_STORM/halconf.h
+++ b/testhal/STM32/STM32F3xx/IRQ_STORM/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/testhal/STM32/STM32F3xx/PWM-ICU/chconf.h b/testhal/STM32/STM32F3xx/PWM-ICU/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F3xx/PWM-ICU/chconf.h
+++ b/testhal/STM32/STM32F3xx/PWM-ICU/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/testhal/STM32/STM32F3xx/PWM-ICU/halconf.h b/testhal/STM32/STM32F3xx/PWM-ICU/halconf.h
index ff7f355c7..2a2b50405 100644
--- a/testhal/STM32/STM32F3xx/PWM-ICU/halconf.h
+++ b/testhal/STM32/STM32F3xx/PWM-ICU/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/testhal/STM32/STM32F3xx/USB_CDC_IAD/chconf.h b/testhal/STM32/STM32F3xx/USB_CDC_IAD/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F3xx/USB_CDC_IAD/chconf.h
+++ b/testhal/STM32/STM32F3xx/USB_CDC_IAD/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/testhal/STM32/STM32F3xx/USB_CDC_IAD/halconf.h b/testhal/STM32/STM32F3xx/USB_CDC_IAD/halconf.h
index 86d17e425..87dc5beb8 100644
--- a/testhal/STM32/STM32F3xx/USB_CDC_IAD/halconf.h
+++ b/testhal/STM32/STM32F3xx/USB_CDC_IAD/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/testhal/STM32/STM32F3xx/WDG/chconf.h b/testhal/STM32/STM32F3xx/WDG/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F3xx/WDG/chconf.h
+++ b/testhal/STM32/STM32F3xx/WDG/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/testhal/STM32/STM32F3xx/WDG/halconf.h b/testhal/STM32/STM32F3xx/WDG/halconf.h
index f839dcf23..15c1ec246 100644
--- a/testhal/STM32/STM32F3xx/WDG/halconf.h
+++ b/testhal/STM32/STM32F3xx/WDG/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/testhal/STM32/STM32F4xx/ADC/chconf.h b/testhal/STM32/STM32F4xx/ADC/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F4xx/ADC/chconf.h
+++ b/testhal/STM32/STM32F4xx/ADC/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/testhal/STM32/STM32F4xx/ADC/halconf.h b/testhal/STM32/STM32F4xx/ADC/halconf.h
index f148b8978..14e276a95 100644
--- a/testhal/STM32/STM32F4xx/ADC/halconf.h
+++ b/testhal/STM32/STM32F4xx/ADC/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/testhal/STM32/STM32F4xx/CAN/chconf.h b/testhal/STM32/STM32F4xx/CAN/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F4xx/CAN/chconf.h
+++ b/testhal/STM32/STM32F4xx/CAN/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/testhal/STM32/STM32F4xx/CAN/halconf.h b/testhal/STM32/STM32F4xx/CAN/halconf.h
index 42441804d..e2272d207 100644
--- a/testhal/STM32/STM32F4xx/CAN/halconf.h
+++ b/testhal/STM32/STM32F4xx/CAN/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/testhal/STM32/STM32F4xx/DAC/chconf.h b/testhal/STM32/STM32F4xx/DAC/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F4xx/DAC/chconf.h
+++ b/testhal/STM32/STM32F4xx/DAC/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/testhal/STM32/STM32F4xx/DAC/halconf.h b/testhal/STM32/STM32F4xx/DAC/halconf.h
index 6545cc1ec..11b5dbf7b 100644
--- a/testhal/STM32/STM32F4xx/DAC/halconf.h
+++ b/testhal/STM32/STM32F4xx/DAC/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/testhal/STM32/STM32F4xx/DAC_DUAL/chconf.h b/testhal/STM32/STM32F4xx/DAC_DUAL/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F4xx/DAC_DUAL/chconf.h
+++ b/testhal/STM32/STM32F4xx/DAC_DUAL/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/testhal/STM32/STM32F4xx/DAC_DUAL/halconf.h b/testhal/STM32/STM32F4xx/DAC_DUAL/halconf.h
index 6545cc1ec..11b5dbf7b 100644
--- a/testhal/STM32/STM32F4xx/DAC_DUAL/halconf.h
+++ b/testhal/STM32/STM32F4xx/DAC_DUAL/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/testhal/STM32/STM32F4xx/DMA_STORM/chconf.h b/testhal/STM32/STM32F4xx/DMA_STORM/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F4xx/DMA_STORM/chconf.h
+++ b/testhal/STM32/STM32F4xx/DMA_STORM/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/testhal/STM32/STM32F4xx/DMA_STORM/halconf.h b/testhal/STM32/STM32F4xx/DMA_STORM/halconf.h
index 9aa01eb18..e4a7c3338 100644
--- a/testhal/STM32/STM32F4xx/DMA_STORM/halconf.h
+++ b/testhal/STM32/STM32F4xx/DMA_STORM/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/testhal/STM32/STM32F4xx/GPT/chconf.h b/testhal/STM32/STM32F4xx/GPT/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F4xx/GPT/chconf.h
+++ b/testhal/STM32/STM32F4xx/GPT/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/testhal/STM32/STM32F4xx/GPT/halconf.h b/testhal/STM32/STM32F4xx/GPT/halconf.h
index 89cba9548..bc21cd8e8 100644
--- a/testhal/STM32/STM32F4xx/GPT/halconf.h
+++ b/testhal/STM32/STM32F4xx/GPT/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/testhal/STM32/STM32F4xx/I2S/chconf.h b/testhal/STM32/STM32F4xx/I2S/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F4xx/I2S/chconf.h
+++ b/testhal/STM32/STM32F4xx/I2S/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/testhal/STM32/STM32F4xx/I2S/halconf.h b/testhal/STM32/STM32F4xx/I2S/halconf.h
index 9455dcd56..3e7287fdd 100644
--- a/testhal/STM32/STM32F4xx/I2S/halconf.h
+++ b/testhal/STM32/STM32F4xx/I2S/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/testhal/STM32/STM32F4xx/IRQ_STORM/chconf.h b/testhal/STM32/STM32F4xx/IRQ_STORM/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F4xx/IRQ_STORM/chconf.h
+++ b/testhal/STM32/STM32F4xx/IRQ_STORM/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/testhal/STM32/STM32F4xx/IRQ_STORM/halconf.h b/testhal/STM32/STM32F4xx/IRQ_STORM/halconf.h
index 34923a64c..0ecdd8744 100644
--- a/testhal/STM32/STM32F4xx/IRQ_STORM/halconf.h
+++ b/testhal/STM32/STM32F4xx/IRQ_STORM/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/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/chconf.h b/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/chconf.h
+++ b/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/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/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/halconf.h b/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/halconf.h
index 34923a64c..0ecdd8744 100644
--- a/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/halconf.h
+++ b/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/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/testhal/STM32/STM32F4xx/PWM-ICU/chconf.h b/testhal/STM32/STM32F4xx/PWM-ICU/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F4xx/PWM-ICU/chconf.h
+++ b/testhal/STM32/STM32F4xx/PWM-ICU/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/testhal/STM32/STM32F4xx/PWM-ICU/halconf.h b/testhal/STM32/STM32F4xx/PWM-ICU/halconf.h
index ff7f355c7..2a2b50405 100644
--- a/testhal/STM32/STM32F4xx/PWM-ICU/halconf.h
+++ b/testhal/STM32/STM32F4xx/PWM-ICU/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/testhal/STM32/STM32F4xx/RTC/chconf.h b/testhal/STM32/STM32F4xx/RTC/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F4xx/RTC/chconf.h
+++ b/testhal/STM32/STM32F4xx/RTC/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/testhal/STM32/STM32F4xx/RTC/halconf.h b/testhal/STM32/STM32F4xx/RTC/halconf.h
index f0caf266e..14185ff18 100644
--- a/testhal/STM32/STM32F4xx/RTC/halconf.h
+++ b/testhal/STM32/STM32F4xx/RTC/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/testhal/STM32/STM32F4xx/SDC/chconf.h b/testhal/STM32/STM32F4xx/SDC/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F4xx/SDC/chconf.h
+++ b/testhal/STM32/STM32F4xx/SDC/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/testhal/STM32/STM32F4xx/SDC/halconf.h b/testhal/STM32/STM32F4xx/SDC/halconf.h
index a54b0b90e..d3d2eb67e 100644
--- a/testhal/STM32/STM32F4xx/SDC/halconf.h
+++ b/testhal/STM32/STM32F4xx/SDC/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/testhal/STM32/STM32F4xx/USB_CDC_IAD/chconf.h b/testhal/STM32/STM32F4xx/USB_CDC_IAD/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F4xx/USB_CDC_IAD/chconf.h
+++ b/testhal/STM32/STM32F4xx/USB_CDC_IAD/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/testhal/STM32/STM32F4xx/USB_CDC_IAD/halconf.h b/testhal/STM32/STM32F4xx/USB_CDC_IAD/halconf.h
index 86d17e425..87dc5beb8 100644
--- a/testhal/STM32/STM32F4xx/USB_CDC_IAD/halconf.h
+++ b/testhal/STM32/STM32F4xx/USB_CDC_IAD/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/testhal/STM32/STM32F4xx/WDG/chconf.h b/testhal/STM32/STM32F4xx/WDG/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F4xx/WDG/chconf.h
+++ b/testhal/STM32/STM32F4xx/WDG/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/testhal/STM32/STM32F4xx/WDG/halconf.h b/testhal/STM32/STM32F4xx/WDG/halconf.h
index f839dcf23..15c1ec246 100644
--- a/testhal/STM32/STM32F4xx/WDG/halconf.h
+++ b/testhal/STM32/STM32F4xx/WDG/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/testhal/STM32/STM32F7xx/GPT-ADC/chconf.h b/testhal/STM32/STM32F7xx/GPT-ADC/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F7xx/GPT-ADC/chconf.h
+++ b/testhal/STM32/STM32F7xx/GPT-ADC/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/testhal/STM32/STM32F7xx/GPT-ADC/halconf.h b/testhal/STM32/STM32F7xx/GPT-ADC/halconf.h
index 5280fc86d..905d1b1aa 100644
--- a/testhal/STM32/STM32F7xx/GPT-ADC/halconf.h
+++ b/testhal/STM32/STM32F7xx/GPT-ADC/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/testhal/STM32/STM32F7xx/IRQ_STORM/chconf.h b/testhal/STM32/STM32F7xx/IRQ_STORM/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F7xx/IRQ_STORM/chconf.h
+++ b/testhal/STM32/STM32F7xx/IRQ_STORM/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/testhal/STM32/STM32F7xx/IRQ_STORM/halconf.h b/testhal/STM32/STM32F7xx/IRQ_STORM/halconf.h
index 34923a64c..0ecdd8744 100644
--- a/testhal/STM32/STM32F7xx/IRQ_STORM/halconf.h
+++ b/testhal/STM32/STM32F7xx/IRQ_STORM/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/testhal/STM32/STM32F7xx/PWM-ICU/chconf.h b/testhal/STM32/STM32F7xx/PWM-ICU/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F7xx/PWM-ICU/chconf.h
+++ b/testhal/STM32/STM32F7xx/PWM-ICU/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/testhal/STM32/STM32F7xx/PWM-ICU/halconf.h b/testhal/STM32/STM32F7xx/PWM-ICU/halconf.h
index 8d713195b..210af4230 100644
--- a/testhal/STM32/STM32F7xx/PWM-ICU/halconf.h
+++ b/testhal/STM32/STM32F7xx/PWM-ICU/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/testhal/STM32/STM32F7xx/SPI/chconf.h b/testhal/STM32/STM32F7xx/SPI/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F7xx/SPI/chconf.h
+++ b/testhal/STM32/STM32F7xx/SPI/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/testhal/STM32/STM32F7xx/SPI/halconf.h b/testhal/STM32/STM32F7xx/SPI/halconf.h
index f3150b346..f7eb404c3 100644
--- a/testhal/STM32/STM32F7xx/SPI/halconf.h
+++ b/testhal/STM32/STM32F7xx/SPI/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/testhal/STM32/STM32F7xx/USB_RAW/chconf.h b/testhal/STM32/STM32F7xx/USB_RAW/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/STM32F7xx/USB_RAW/chconf.h
+++ b/testhal/STM32/STM32F7xx/USB_RAW/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/testhal/STM32/STM32F7xx/USB_RAW/halconf.h b/testhal/STM32/STM32F7xx/USB_RAW/halconf.h
index fca261c2d..b03485bea 100644
--- a/testhal/STM32/STM32F7xx/USB_RAW/halconf.h
+++ b/testhal/STM32/STM32F7xx/USB_RAW/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/testhal/STM32/STM32L0xx/ADC/chconf.h b/testhal/STM32/STM32L0xx/ADC/chconf.h
index 37b93c9fd..31378edec 100644
--- a/testhal/STM32/STM32L0xx/ADC/chconf.h
+++ b/testhal/STM32/STM32L0xx/ADC/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/testhal/STM32/STM32L0xx/ADC/halconf.h b/testhal/STM32/STM32L0xx/ADC/halconf.h
index f148b8978..14e276a95 100644
--- a/testhal/STM32/STM32L0xx/ADC/halconf.h
+++ b/testhal/STM32/STM32L0xx/ADC/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/testhal/STM32/STM32L0xx/SPI/chconf.h b/testhal/STM32/STM32L0xx/SPI/chconf.h
index 37b93c9fd..31378edec 100644
--- a/testhal/STM32/STM32L0xx/SPI/chconf.h
+++ b/testhal/STM32/STM32L0xx/SPI/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/testhal/STM32/STM32L0xx/SPI/halconf.h b/testhal/STM32/STM32L0xx/SPI/halconf.h
index 36d32eddb..b77451a2f 100644
--- a/testhal/STM32/STM32L0xx/SPI/halconf.h
+++ b/testhal/STM32/STM32L0xx/SPI/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/testhal/STM32/STM32L0xx/USB_CDC/chconf.h b/testhal/STM32/STM32L0xx/USB_CDC/chconf.h
index 0132be6b5..14679b071 100644
--- a/testhal/STM32/STM32L0xx/USB_CDC/chconf.h
+++ b/testhal/STM32/STM32L0xx/USB_CDC/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/testhal/STM32/STM32L0xx/USB_CDC/halconf.h b/testhal/STM32/STM32L0xx/USB_CDC/halconf.h
index af007d157..2aefb8619 100644
--- a/testhal/STM32/STM32L0xx/USB_CDC/halconf.h
+++ b/testhal/STM32/STM32L0xx/USB_CDC/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/testhal/STM32/STM32L1xx/ADC/chconf.h b/testhal/STM32/STM32L1xx/ADC/chconf.h
index b30daa6d6..e9007b689 100644
--- a/testhal/STM32/STM32L1xx/ADC/chconf.h
+++ b/testhal/STM32/STM32L1xx/ADC/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/testhal/STM32/STM32L1xx/ADC/halconf.h b/testhal/STM32/STM32L1xx/ADC/halconf.h
index f148b8978..14e276a95 100644
--- a/testhal/STM32/STM32L1xx/ADC/halconf.h
+++ b/testhal/STM32/STM32L1xx/ADC/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/testhal/STM32/STM32L1xx/DAC/chconf.h b/testhal/STM32/STM32L1xx/DAC/chconf.h
index b30daa6d6..e9007b689 100644
--- a/testhal/STM32/STM32L1xx/DAC/chconf.h
+++ b/testhal/STM32/STM32L1xx/DAC/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/testhal/STM32/STM32L1xx/DAC/halconf.h b/testhal/STM32/STM32L1xx/DAC/halconf.h
index 6545cc1ec..11b5dbf7b 100644
--- a/testhal/STM32/STM32L1xx/DAC/halconf.h
+++ b/testhal/STM32/STM32L1xx/DAC/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/testhal/STM32/STM32L1xx/IRQ_STORM/chconf.h b/testhal/STM32/STM32L1xx/IRQ_STORM/chconf.h
index b30daa6d6..e9007b689 100644
--- a/testhal/STM32/STM32L1xx/IRQ_STORM/chconf.h
+++ b/testhal/STM32/STM32L1xx/IRQ_STORM/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/testhal/STM32/STM32L1xx/IRQ_STORM/halconf.h b/testhal/STM32/STM32L1xx/IRQ_STORM/halconf.h
index 34923a64c..0ecdd8744 100644
--- a/testhal/STM32/STM32L1xx/IRQ_STORM/halconf.h
+++ b/testhal/STM32/STM32L1xx/IRQ_STORM/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/testhal/STM32/STM32L1xx/PWM-ICU/chconf.h b/testhal/STM32/STM32L1xx/PWM-ICU/chconf.h
index b30daa6d6..e9007b689 100644
--- a/testhal/STM32/STM32L1xx/PWM-ICU/chconf.h
+++ b/testhal/STM32/STM32L1xx/PWM-ICU/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/testhal/STM32/STM32L1xx/PWM-ICU/halconf.h b/testhal/STM32/STM32L1xx/PWM-ICU/halconf.h
index ff7f355c7..2a2b50405 100644
--- a/testhal/STM32/STM32L1xx/PWM-ICU/halconf.h
+++ b/testhal/STM32/STM32L1xx/PWM-ICU/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/testhal/STM32/STM32L1xx/SPI/chconf.h b/testhal/STM32/STM32L1xx/SPI/chconf.h
index b30daa6d6..e9007b689 100644
--- a/testhal/STM32/STM32L1xx/SPI/chconf.h
+++ b/testhal/STM32/STM32L1xx/SPI/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/testhal/STM32/STM32L1xx/SPI/halconf.h b/testhal/STM32/STM32L1xx/SPI/halconf.h
index 36d32eddb..b77451a2f 100644
--- a/testhal/STM32/STM32L1xx/SPI/halconf.h
+++ b/testhal/STM32/STM32L1xx/SPI/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/testhal/STM32/STM32L1xx/UART/chconf.h b/testhal/STM32/STM32L1xx/UART/chconf.h
index b30daa6d6..e9007b689 100644
--- a/testhal/STM32/STM32L1xx/UART/chconf.h
+++ b/testhal/STM32/STM32L1xx/UART/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/testhal/STM32/STM32L1xx/UART/halconf.h b/testhal/STM32/STM32L1xx/UART/halconf.h
index 9780b95b9..bdd0e412c 100644
--- a/testhal/STM32/STM32L1xx/UART/halconf.h
+++ b/testhal/STM32/STM32L1xx/UART/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/testhal/STM32/STM32L4xx/CAN/chconf.h b/testhal/STM32/STM32L4xx/CAN/chconf.h
index a7343edc2..e50f15cce 100644
--- a/testhal/STM32/STM32L4xx/CAN/chconf.h
+++ b/testhal/STM32/STM32L4xx/CAN/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/testhal/STM32/STM32L4xx/CAN/halconf.h b/testhal/STM32/STM32L4xx/CAN/halconf.h
index 42441804d..e2272d207 100644
--- a/testhal/STM32/STM32L4xx/CAN/halconf.h
+++ b/testhal/STM32/STM32L4xx/CAN/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/testhal/STM32/STM32L4xx/IRQ_STORM/chconf.h b/testhal/STM32/STM32L4xx/IRQ_STORM/chconf.h
index a7343edc2..e50f15cce 100644
--- a/testhal/STM32/STM32L4xx/IRQ_STORM/chconf.h
+++ b/testhal/STM32/STM32L4xx/IRQ_STORM/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/testhal/STM32/STM32L4xx/IRQ_STORM/halconf.h b/testhal/STM32/STM32L4xx/IRQ_STORM/halconf.h
index 34923a64c..0ecdd8744 100644
--- a/testhal/STM32/STM32L4xx/IRQ_STORM/halconf.h
+++ b/testhal/STM32/STM32L4xx/IRQ_STORM/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/testhal/STM32/multi/ADC/cfg/stm32h743_nucleo144/chconf.h b/testhal/STM32/multi/ADC/cfg/stm32h743_nucleo144/chconf.h
index a52e9a5ed..c24e675df 100644
--- a/testhal/STM32/multi/ADC/cfg/stm32h743_nucleo144/chconf.h
+++ b/testhal/STM32/multi/ADC/cfg/stm32h743_nucleo144/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/testhal/STM32/multi/ADC/cfg/stm32h743_nucleo144/halconf.h b/testhal/STM32/multi/ADC/cfg/stm32h743_nucleo144/halconf.h
index f24d3bc0c..cc4bb1b4d 100644
--- a/testhal/STM32/multi/ADC/cfg/stm32h743_nucleo144/halconf.h
+++ b/testhal/STM32/multi/ADC/cfg/stm32h743_nucleo144/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/testhal/STM32/multi/ADC/cfg/stm32l476_discovery/chconf.h b/testhal/STM32/multi/ADC/cfg/stm32l476_discovery/chconf.h
index 33701dbc2..9cd5cbf1f 100644
--- a/testhal/STM32/multi/ADC/cfg/stm32l476_discovery/chconf.h
+++ b/testhal/STM32/multi/ADC/cfg/stm32l476_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/testhal/STM32/multi/ADC/cfg/stm32l476_discovery/halconf.h b/testhal/STM32/multi/ADC/cfg/stm32l476_discovery/halconf.h
index f24d3bc0c..cc4bb1b4d 100644
--- a/testhal/STM32/multi/ADC/cfg/stm32l476_discovery/halconf.h
+++ b/testhal/STM32/multi/ADC/cfg/stm32l476_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/testhal/STM32/multi/ADC/cfg/stm32l4r5zi_nucleo144/chconf.h b/testhal/STM32/multi/ADC/cfg/stm32l4r5zi_nucleo144/chconf.h
index 33701dbc2..9cd5cbf1f 100644
--- a/testhal/STM32/multi/ADC/cfg/stm32l4r5zi_nucleo144/chconf.h
+++ b/testhal/STM32/multi/ADC/cfg/stm32l4r5zi_nucleo144/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/testhal/STM32/multi/ADC/cfg/stm32l4r5zi_nucleo144/halconf.h b/testhal/STM32/multi/ADC/cfg/stm32l4r5zi_nucleo144/halconf.h
index f24d3bc0c..cc4bb1b4d 100644
--- a/testhal/STM32/multi/ADC/cfg/stm32l4r5zi_nucleo144/halconf.h
+++ b/testhal/STM32/multi/ADC/cfg/stm32l4r5zi_nucleo144/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/testhal/STM32/multi/CRYPTO/cfg/stm32f756zg_nucleo144/chconf.h b/testhal/STM32/multi/CRYPTO/cfg/stm32f756zg_nucleo144/chconf.h
index 33701dbc2..9cd5cbf1f 100644
--- a/testhal/STM32/multi/CRYPTO/cfg/stm32f756zg_nucleo144/chconf.h
+++ b/testhal/STM32/multi/CRYPTO/cfg/stm32f756zg_nucleo144/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/testhal/STM32/multi/CRYPTO/cfg/stm32f756zg_nucleo144/halconf.h b/testhal/STM32/multi/CRYPTO/cfg/stm32f756zg_nucleo144/halconf.h
index 47bf530f8..b03a70ced 100644
--- a/testhal/STM32/multi/CRYPTO/cfg/stm32f756zg_nucleo144/halconf.h
+++ b/testhal/STM32/multi/CRYPTO/cfg/stm32f756zg_nucleo144/halconf.h
@@ -29,9 +29,9 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
-#include "../stm32f756zg_nucleo144/mcuconf.h"
+#include "mcuconf.h"
 
 /**
  * @brief   Enables the PAL subsystem.
diff --git a/testhal/STM32/multi/DAC/cfg/stm32h743_nucleo144/chconf.h b/testhal/STM32/multi/DAC/cfg/stm32h743_nucleo144/chconf.h
index a52e9a5ed..c24e675df 100644
--- a/testhal/STM32/multi/DAC/cfg/stm32h743_nucleo144/chconf.h
+++ b/testhal/STM32/multi/DAC/cfg/stm32h743_nucleo144/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/testhal/STM32/multi/DAC/cfg/stm32h743_nucleo144/halconf.h b/testhal/STM32/multi/DAC/cfg/stm32h743_nucleo144/halconf.h
index 6545cc1ec..11b5dbf7b 100644
--- a/testhal/STM32/multi/DAC/cfg/stm32h743_nucleo144/halconf.h
+++ b/testhal/STM32/multi/DAC/cfg/stm32h743_nucleo144/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/testhal/STM32/multi/DAC/cfg/stm32l476_discovery/chconf.h b/testhal/STM32/multi/DAC/cfg/stm32l476_discovery/chconf.h
index 33701dbc2..9cd5cbf1f 100644
--- a/testhal/STM32/multi/DAC/cfg/stm32l476_discovery/chconf.h
+++ b/testhal/STM32/multi/DAC/cfg/stm32l476_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/testhal/STM32/multi/DAC/cfg/stm32l476_discovery/halconf.h b/testhal/STM32/multi/DAC/cfg/stm32l476_discovery/halconf.h
index 7d42c4632..6b8c5731e 100644
--- a/testhal/STM32/multi/DAC/cfg/stm32l476_discovery/halconf.h
+++ b/testhal/STM32/multi/DAC/cfg/stm32l476_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/testhal/STM32/multi/DAC/cfg/stm32l4r5zi_nucleo144/chconf.h b/testhal/STM32/multi/DAC/cfg/stm32l4r5zi_nucleo144/chconf.h
index 33701dbc2..9cd5cbf1f 100644
--- a/testhal/STM32/multi/DAC/cfg/stm32l4r5zi_nucleo144/chconf.h
+++ b/testhal/STM32/multi/DAC/cfg/stm32l4r5zi_nucleo144/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/testhal/STM32/multi/DAC/cfg/stm32l4r5zi_nucleo144/halconf.h b/testhal/STM32/multi/DAC/cfg/stm32l4r5zi_nucleo144/halconf.h
index 7d42c4632..6b8c5731e 100644
--- a/testhal/STM32/multi/DAC/cfg/stm32l4r5zi_nucleo144/halconf.h
+++ b/testhal/STM32/multi/DAC/cfg/stm32l4r5zi_nucleo144/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/testhal/STM32/multi/PAL/cfg/stm32f051_discovery/chconf.h b/testhal/STM32/multi/PAL/cfg/stm32f051_discovery/chconf.h
index a52e9a5ed..c24e675df 100644
--- a/testhal/STM32/multi/PAL/cfg/stm32f051_discovery/chconf.h
+++ b/testhal/STM32/multi/PAL/cfg/stm32f051_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/testhal/STM32/multi/PAL/cfg/stm32f051_discovery/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32f051_discovery/halconf.h
index 55a7e420c..5698a3dde 100644
--- a/testhal/STM32/multi/PAL/cfg/stm32f051_discovery/halconf.h
+++ b/testhal/STM32/multi/PAL/cfg/stm32f051_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/testhal/STM32/multi/PAL/cfg/stm32f103_olimex/chconf.h b/testhal/STM32/multi/PAL/cfg/stm32f103_olimex/chconf.h
index 8dd2a7157..72b5671eb 100644
--- a/testhal/STM32/multi/PAL/cfg/stm32f103_olimex/chconf.h
+++ b/testhal/STM32/multi/PAL/cfg/stm32f103_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/testhal/STM32/multi/PAL/cfg/stm32f103_olimex/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32f103_olimex/halconf.h
index 55a7e420c..5698a3dde 100644
--- a/testhal/STM32/multi/PAL/cfg/stm32f103_olimex/halconf.h
+++ b/testhal/STM32/multi/PAL/cfg/stm32f103_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/testhal/STM32/multi/PAL/cfg/stm32f303_discovery/chconf.h b/testhal/STM32/multi/PAL/cfg/stm32f303_discovery/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/multi/PAL/cfg/stm32f303_discovery/chconf.h
+++ b/testhal/STM32/multi/PAL/cfg/stm32f303_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/testhal/STM32/multi/PAL/cfg/stm32f303_discovery/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32f303_discovery/halconf.h
index 55a7e420c..5698a3dde 100644
--- a/testhal/STM32/multi/PAL/cfg/stm32f303_discovery/halconf.h
+++ b/testhal/STM32/multi/PAL/cfg/stm32f303_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/testhal/STM32/multi/PAL/cfg/stm32f373_eval/chconf.h b/testhal/STM32/multi/PAL/cfg/stm32f373_eval/chconf.h
index a7343edc2..e50f15cce 100644
--- a/testhal/STM32/multi/PAL/cfg/stm32f373_eval/chconf.h
+++ b/testhal/STM32/multi/PAL/cfg/stm32f373_eval/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/testhal/STM32/multi/PAL/cfg/stm32f373_eval/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32f373_eval/halconf.h
index 55a7e420c..5698a3dde 100644
--- a/testhal/STM32/multi/PAL/cfg/stm32f373_eval/halconf.h
+++ b/testhal/STM32/multi/PAL/cfg/stm32f373_eval/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/testhal/STM32/multi/PAL/cfg/stm32f407_discovery/chconf.h b/testhal/STM32/multi/PAL/cfg/stm32f407_discovery/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/multi/PAL/cfg/stm32f407_discovery/chconf.h
+++ b/testhal/STM32/multi/PAL/cfg/stm32f407_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/testhal/STM32/multi/PAL/cfg/stm32f407_discovery/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32f407_discovery/halconf.h
index 55a7e420c..5698a3dde 100644
--- a/testhal/STM32/multi/PAL/cfg/stm32f407_discovery/halconf.h
+++ b/testhal/STM32/multi/PAL/cfg/stm32f407_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/testhal/STM32/multi/PAL/cfg/stm32f429_discovery/chconf.h b/testhal/STM32/multi/PAL/cfg/stm32f429_discovery/chconf.h
index a7343edc2..e50f15cce 100644
--- a/testhal/STM32/multi/PAL/cfg/stm32f429_discovery/chconf.h
+++ b/testhal/STM32/multi/PAL/cfg/stm32f429_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/testhal/STM32/multi/PAL/cfg/stm32f429_discovery/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32f429_discovery/halconf.h
index 55a7e420c..5698a3dde 100644
--- a/testhal/STM32/multi/PAL/cfg/stm32f429_discovery/halconf.h
+++ b/testhal/STM32/multi/PAL/cfg/stm32f429_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/testhal/STM32/multi/PAL/cfg/stm32f746_discovery/chconf.h b/testhal/STM32/multi/PAL/cfg/stm32f746_discovery/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/multi/PAL/cfg/stm32f746_discovery/chconf.h
+++ b/testhal/STM32/multi/PAL/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/testhal/STM32/multi/PAL/cfg/stm32f746_discovery/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32f746_discovery/halconf.h
index 55a7e420c..5698a3dde 100644
--- a/testhal/STM32/multi/PAL/cfg/stm32f746_discovery/halconf.h
+++ b/testhal/STM32/multi/PAL/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/testhal/STM32/multi/PAL/cfg/stm32l053_discovery/chconf.h b/testhal/STM32/multi/PAL/cfg/stm32l053_discovery/chconf.h
index 37b93c9fd..31378edec 100644
--- a/testhal/STM32/multi/PAL/cfg/stm32l053_discovery/chconf.h
+++ b/testhal/STM32/multi/PAL/cfg/stm32l053_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/testhal/STM32/multi/PAL/cfg/stm32l053_discovery/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32l053_discovery/halconf.h
index 55a7e420c..5698a3dde 100644
--- a/testhal/STM32/multi/PAL/cfg/stm32l053_discovery/halconf.h
+++ b/testhal/STM32/multi/PAL/cfg/stm32l053_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/testhal/STM32/multi/PAL/cfg/stm32l151_discovery/chconf.h b/testhal/STM32/multi/PAL/cfg/stm32l151_discovery/chconf.h
index 45c6d83a5..da10c0bc2 100644
--- a/testhal/STM32/multi/PAL/cfg/stm32l151_discovery/chconf.h
+++ b/testhal/STM32/multi/PAL/cfg/stm32l151_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/testhal/STM32/multi/PAL/cfg/stm32l151_discovery/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32l151_discovery/halconf.h
index 55a7e420c..5698a3dde 100644
--- a/testhal/STM32/multi/PAL/cfg/stm32l151_discovery/halconf.h
+++ b/testhal/STM32/multi/PAL/cfg/stm32l151_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/testhal/STM32/multi/PAL/cfg/stm32l476_discovery/chconf.h b/testhal/STM32/multi/PAL/cfg/stm32l476_discovery/chconf.h
index 33701dbc2..9cd5cbf1f 100644
--- a/testhal/STM32/multi/PAL/cfg/stm32l476_discovery/chconf.h
+++ b/testhal/STM32/multi/PAL/cfg/stm32l476_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/testhal/STM32/multi/PAL/cfg/stm32l476_discovery/halconf.h b/testhal/STM32/multi/PAL/cfg/stm32l476_discovery/halconf.h
index 55a7e420c..5698a3dde 100644
--- a/testhal/STM32/multi/PAL/cfg/stm32l476_discovery/halconf.h
+++ b/testhal/STM32/multi/PAL/cfg/stm32l476_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/testhal/STM32/multi/RTC/cfg/stm32f051_discovery/chconf.h b/testhal/STM32/multi/RTC/cfg/stm32f051_discovery/chconf.h
index d0a50e1be..24691d739 100644
--- a/testhal/STM32/multi/RTC/cfg/stm32f051_discovery/chconf.h
+++ b/testhal/STM32/multi/RTC/cfg/stm32f051_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/testhal/STM32/multi/RTC/cfg/stm32f051_discovery/halconf.h b/testhal/STM32/multi/RTC/cfg/stm32f051_discovery/halconf.h
index e4aa01c84..14185ff18 100644
--- a/testhal/STM32/multi/RTC/cfg/stm32f051_discovery/halconf.h
+++ b/testhal/STM32/multi/RTC/cfg/stm32f051_discovery/halconf.h
@@ -29,9 +29,9 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
-#include <cfg/stm32f051_discovery/mcuconf.h>
+#include "mcuconf.h"
 
 /**
  * @brief   Enables the PAL subsystem.
diff --git a/testhal/STM32/multi/RTC/cfg/stm32f303_discovery/chconf.h b/testhal/STM32/multi/RTC/cfg/stm32f303_discovery/chconf.h
index 33701dbc2..9cd5cbf1f 100644
--- a/testhal/STM32/multi/RTC/cfg/stm32f303_discovery/chconf.h
+++ b/testhal/STM32/multi/RTC/cfg/stm32f303_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/testhal/STM32/multi/RTC/cfg/stm32f303_discovery/halconf.h b/testhal/STM32/multi/RTC/cfg/stm32f303_discovery/halconf.h
index f0caf266e..14185ff18 100644
--- a/testhal/STM32/multi/RTC/cfg/stm32f303_discovery/halconf.h
+++ b/testhal/STM32/multi/RTC/cfg/stm32f303_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/testhal/STM32/multi/RTC/cfg/stm32f407_discovery/chconf.h b/testhal/STM32/multi/RTC/cfg/stm32f407_discovery/chconf.h
index 33701dbc2..9cd5cbf1f 100644
--- a/testhal/STM32/multi/RTC/cfg/stm32f407_discovery/chconf.h
+++ b/testhal/STM32/multi/RTC/cfg/stm32f407_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/testhal/STM32/multi/RTC/cfg/stm32f407_discovery/halconf.h b/testhal/STM32/multi/RTC/cfg/stm32f407_discovery/halconf.h
index f0caf266e..14185ff18 100644
--- a/testhal/STM32/multi/RTC/cfg/stm32f407_discovery/halconf.h
+++ b/testhal/STM32/multi/RTC/cfg/stm32f407_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/testhal/STM32/multi/RTC/cfg/stm32l053_discovery/chconf.h b/testhal/STM32/multi/RTC/cfg/stm32l053_discovery/chconf.h
index 68b1e8a98..41e58ce96 100644
--- a/testhal/STM32/multi/RTC/cfg/stm32l053_discovery/chconf.h
+++ b/testhal/STM32/multi/RTC/cfg/stm32l053_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/testhal/STM32/multi/RTC/cfg/stm32l053_discovery/halconf.h b/testhal/STM32/multi/RTC/cfg/stm32l053_discovery/halconf.h
index e4aa01c84..14185ff18 100644
--- a/testhal/STM32/multi/RTC/cfg/stm32l053_discovery/halconf.h
+++ b/testhal/STM32/multi/RTC/cfg/stm32l053_discovery/halconf.h
@@ -29,9 +29,9 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
-#include <cfg/stm32f051_discovery/mcuconf.h>
+#include "mcuconf.h"
 
 /**
  * @brief   Enables the PAL subsystem.
diff --git a/testhal/STM32/multi/RTC/cfg/stm32l476_discovery/chconf.h b/testhal/STM32/multi/RTC/cfg/stm32l476_discovery/chconf.h
index 33701dbc2..9cd5cbf1f 100644
--- a/testhal/STM32/multi/RTC/cfg/stm32l476_discovery/chconf.h
+++ b/testhal/STM32/multi/RTC/cfg/stm32l476_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/testhal/STM32/multi/RTC/cfg/stm32l476_discovery/halconf.h b/testhal/STM32/multi/RTC/cfg/stm32l476_discovery/halconf.h
index f0caf266e..14185ff18 100644
--- a/testhal/STM32/multi/RTC/cfg/stm32l476_discovery/halconf.h
+++ b/testhal/STM32/multi/RTC/cfg/stm32l476_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/testhal/STM32/multi/SPI/cfg/stm32f091_nucleo64/chconf.h b/testhal/STM32/multi/SPI/cfg/stm32f091_nucleo64/chconf.h
index a52e9a5ed..c24e675df 100644
--- a/testhal/STM32/multi/SPI/cfg/stm32f091_nucleo64/chconf.h
+++ b/testhal/STM32/multi/SPI/cfg/stm32f091_nucleo64/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/testhal/STM32/multi/SPI/cfg/stm32f091_nucleo64/halconf.h b/testhal/STM32/multi/SPI/cfg/stm32f091_nucleo64/halconf.h
index 36d32eddb..b77451a2f 100644
--- a/testhal/STM32/multi/SPI/cfg/stm32f091_nucleo64/halconf.h
+++ b/testhal/STM32/multi/SPI/cfg/stm32f091_nucleo64/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/testhal/STM32/multi/SPI/cfg/stm32f303_discovery/chconf.h b/testhal/STM32/multi/SPI/cfg/stm32f303_discovery/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/multi/SPI/cfg/stm32f303_discovery/chconf.h
+++ b/testhal/STM32/multi/SPI/cfg/stm32f303_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/testhal/STM32/multi/SPI/cfg/stm32f303_discovery/halconf.h b/testhal/STM32/multi/SPI/cfg/stm32f303_discovery/halconf.h
index 36d32eddb..b77451a2f 100644
--- a/testhal/STM32/multi/SPI/cfg/stm32f303_discovery/halconf.h
+++ b/testhal/STM32/multi/SPI/cfg/stm32f303_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/testhal/STM32/multi/SPI/cfg/stm32f407_discovery/chconf.h b/testhal/STM32/multi/SPI/cfg/stm32f407_discovery/chconf.h
index a52e9a5ed..c24e675df 100644
--- a/testhal/STM32/multi/SPI/cfg/stm32f407_discovery/chconf.h
+++ b/testhal/STM32/multi/SPI/cfg/stm32f407_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/testhal/STM32/multi/SPI/cfg/stm32f407_discovery/halconf.h b/testhal/STM32/multi/SPI/cfg/stm32f407_discovery/halconf.h
index 36d32eddb..b77451a2f 100644
--- a/testhal/STM32/multi/SPI/cfg/stm32f407_discovery/halconf.h
+++ b/testhal/STM32/multi/SPI/cfg/stm32f407_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/testhal/STM32/multi/SPI/cfg/stm32h743_nucleo144/chconf.h b/testhal/STM32/multi/SPI/cfg/stm32h743_nucleo144/chconf.h
index a52e9a5ed..c24e675df 100644
--- a/testhal/STM32/multi/SPI/cfg/stm32h743_nucleo144/chconf.h
+++ b/testhal/STM32/multi/SPI/cfg/stm32h743_nucleo144/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/testhal/STM32/multi/SPI/cfg/stm32h743_nucleo144/halconf.h b/testhal/STM32/multi/SPI/cfg/stm32h743_nucleo144/halconf.h
index 36d32eddb..b77451a2f 100644
--- a/testhal/STM32/multi/SPI/cfg/stm32h743_nucleo144/halconf.h
+++ b/testhal/STM32/multi/SPI/cfg/stm32h743_nucleo144/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/testhal/STM32/multi/SPI/cfg/stm32l476_discovery/chconf.h b/testhal/STM32/multi/SPI/cfg/stm32l476_discovery/chconf.h
index a52e9a5ed..c24e675df 100644
--- a/testhal/STM32/multi/SPI/cfg/stm32l476_discovery/chconf.h
+++ b/testhal/STM32/multi/SPI/cfg/stm32l476_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/testhal/STM32/multi/SPI/cfg/stm32l476_discovery/halconf.h b/testhal/STM32/multi/SPI/cfg/stm32l476_discovery/halconf.h
index 36d32eddb..b77451a2f 100644
--- a/testhal/STM32/multi/SPI/cfg/stm32l476_discovery/halconf.h
+++ b/testhal/STM32/multi/SPI/cfg/stm32l476_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/testhal/STM32/multi/SPI/cfg/stm32l4r5_nucleo144/chconf.h b/testhal/STM32/multi/SPI/cfg/stm32l4r5_nucleo144/chconf.h
index a52e9a5ed..c24e675df 100644
--- a/testhal/STM32/multi/SPI/cfg/stm32l4r5_nucleo144/chconf.h
+++ b/testhal/STM32/multi/SPI/cfg/stm32l4r5_nucleo144/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/testhal/STM32/multi/SPI/cfg/stm32l4r5_nucleo144/halconf.h b/testhal/STM32/multi/SPI/cfg/stm32l4r5_nucleo144/halconf.h
index 36d32eddb..b77451a2f 100644
--- a/testhal/STM32/multi/SPI/cfg/stm32l4r5_nucleo144/halconf.h
+++ b/testhal/STM32/multi/SPI/cfg/stm32l4r5_nucleo144/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/testhal/STM32/multi/SPI/cfg/stm32l4r9_discovery/chconf.h b/testhal/STM32/multi/SPI/cfg/stm32l4r9_discovery/chconf.h
index 33701dbc2..9cd5cbf1f 100644
--- a/testhal/STM32/multi/SPI/cfg/stm32l4r9_discovery/chconf.h
+++ b/testhal/STM32/multi/SPI/cfg/stm32l4r9_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/testhal/STM32/multi/SPI/cfg/stm32l4r9_discovery/halconf.h b/testhal/STM32/multi/SPI/cfg/stm32l4r9_discovery/halconf.h
index 36d32eddb..b77451a2f 100644
--- a/testhal/STM32/multi/SPI/cfg/stm32l4r9_discovery/halconf.h
+++ b/testhal/STM32/multi/SPI/cfg/stm32l4r9_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/testhal/STM32/multi/TRNG/cfg/stm32l476_discovery/chconf.h b/testhal/STM32/multi/TRNG/cfg/stm32l476_discovery/chconf.h
index 33701dbc2..9cd5cbf1f 100644
--- a/testhal/STM32/multi/TRNG/cfg/stm32l476_discovery/chconf.h
+++ b/testhal/STM32/multi/TRNG/cfg/stm32l476_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/testhal/STM32/multi/TRNG/cfg/stm32l476_discovery/halconf.h b/testhal/STM32/multi/TRNG/cfg/stm32l476_discovery/halconf.h
index 9323c4fe1..704499148 100644
--- a/testhal/STM32/multi/TRNG/cfg/stm32l476_discovery/halconf.h
+++ b/testhal/STM32/multi/TRNG/cfg/stm32l476_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/testhal/STM32/multi/TRNG/cfg/stm32l4r5zi_nucleo144/chconf.h b/testhal/STM32/multi/TRNG/cfg/stm32l4r5zi_nucleo144/chconf.h
index 33701dbc2..9cd5cbf1f 100644
--- a/testhal/STM32/multi/TRNG/cfg/stm32l4r5zi_nucleo144/chconf.h
+++ b/testhal/STM32/multi/TRNG/cfg/stm32l4r5zi_nucleo144/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/testhal/STM32/multi/TRNG/cfg/stm32l4r5zi_nucleo144/halconf.h b/testhal/STM32/multi/TRNG/cfg/stm32l4r5zi_nucleo144/halconf.h
index 9323c4fe1..704499148 100644
--- a/testhal/STM32/multi/TRNG/cfg/stm32l4r5zi_nucleo144/halconf.h
+++ b/testhal/STM32/multi/TRNG/cfg/stm32l4r5zi_nucleo144/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/testhal/STM32/multi/UART/cfg/stm32f091_nucleo64/chconf.h b/testhal/STM32/multi/UART/cfg/stm32f091_nucleo64/chconf.h
index a52e9a5ed..c24e675df 100644
--- a/testhal/STM32/multi/UART/cfg/stm32f091_nucleo64/chconf.h
+++ b/testhal/STM32/multi/UART/cfg/stm32f091_nucleo64/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/testhal/STM32/multi/UART/cfg/stm32f091_nucleo64/halconf.h b/testhal/STM32/multi/UART/cfg/stm32f091_nucleo64/halconf.h
index 630316669..a3e5aaf53 100644
--- a/testhal/STM32/multi/UART/cfg/stm32f091_nucleo64/halconf.h
+++ b/testhal/STM32/multi/UART/cfg/stm32f091_nucleo64/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/testhal/STM32/multi/UART/cfg/stm32f303_discovery/chconf.h b/testhal/STM32/multi/UART/cfg/stm32f303_discovery/chconf.h
index a52e9a5ed..c24e675df 100644
--- a/testhal/STM32/multi/UART/cfg/stm32f303_discovery/chconf.h
+++ b/testhal/STM32/multi/UART/cfg/stm32f303_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/testhal/STM32/multi/UART/cfg/stm32f303_discovery/halconf.h b/testhal/STM32/multi/UART/cfg/stm32f303_discovery/halconf.h
index 630316669..a3e5aaf53 100644
--- a/testhal/STM32/multi/UART/cfg/stm32f303_discovery/halconf.h
+++ b/testhal/STM32/multi/UART/cfg/stm32f303_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/testhal/STM32/multi/UART/cfg/stm32f407_discovery/chconf.h b/testhal/STM32/multi/UART/cfg/stm32f407_discovery/chconf.h
index a52e9a5ed..c24e675df 100644
--- a/testhal/STM32/multi/UART/cfg/stm32f407_discovery/chconf.h
+++ b/testhal/STM32/multi/UART/cfg/stm32f407_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/testhal/STM32/multi/UART/cfg/stm32f407_discovery/halconf.h b/testhal/STM32/multi/UART/cfg/stm32f407_discovery/halconf.h
index 630316669..a3e5aaf53 100644
--- a/testhal/STM32/multi/UART/cfg/stm32f407_discovery/halconf.h
+++ b/testhal/STM32/multi/UART/cfg/stm32f407_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/testhal/STM32/multi/UART/cfg/stm32f746_discovery/chconf.h b/testhal/STM32/multi/UART/cfg/stm32f746_discovery/chconf.h
index a52e9a5ed..c24e675df 100644
--- a/testhal/STM32/multi/UART/cfg/stm32f746_discovery/chconf.h
+++ b/testhal/STM32/multi/UART/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/testhal/STM32/multi/UART/cfg/stm32f746_discovery/halconf.h b/testhal/STM32/multi/UART/cfg/stm32f746_discovery/halconf.h
index 630316669..a3e5aaf53 100644
--- a/testhal/STM32/multi/UART/cfg/stm32f746_discovery/halconf.h
+++ b/testhal/STM32/multi/UART/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/testhal/STM32/multi/USB_CDC/cfg/stm32f303_discovery/chconf.h b/testhal/STM32/multi/USB_CDC/cfg/stm32f303_discovery/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/multi/USB_CDC/cfg/stm32f303_discovery/chconf.h
+++ b/testhal/STM32/multi/USB_CDC/cfg/stm32f303_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/testhal/STM32/multi/USB_CDC/cfg/stm32f303_discovery/halconf.h b/testhal/STM32/multi/USB_CDC/cfg/stm32f303_discovery/halconf.h
index 86d17e425..87dc5beb8 100644
--- a/testhal/STM32/multi/USB_CDC/cfg/stm32f303_discovery/halconf.h
+++ b/testhal/STM32/multi/USB_CDC/cfg/stm32f303_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/testhal/STM32/multi/USB_CDC/cfg/stm32f407_discovery/chconf.h b/testhal/STM32/multi/USB_CDC/cfg/stm32f407_discovery/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/multi/USB_CDC/cfg/stm32f407_discovery/chconf.h
+++ b/testhal/STM32/multi/USB_CDC/cfg/stm32f407_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/testhal/STM32/multi/USB_CDC/cfg/stm32f407_discovery/halconf.h b/testhal/STM32/multi/USB_CDC/cfg/stm32f407_discovery/halconf.h
index 86d17e425..87dc5beb8 100644
--- a/testhal/STM32/multi/USB_CDC/cfg/stm32f407_discovery/halconf.h
+++ b/testhal/STM32/multi/USB_CDC/cfg/stm32f407_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/testhal/STM32/multi/USB_CDC/cfg/stm32f746_discovery/chconf.h b/testhal/STM32/multi/USB_CDC/cfg/stm32f746_discovery/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/multi/USB_CDC/cfg/stm32f746_discovery/chconf.h
+++ b/testhal/STM32/multi/USB_CDC/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/testhal/STM32/multi/USB_CDC/cfg/stm32f746_discovery/halconf.h b/testhal/STM32/multi/USB_CDC/cfg/stm32f746_discovery/halconf.h
index 86d17e425..87dc5beb8 100644
--- a/testhal/STM32/multi/USB_CDC/cfg/stm32f746_discovery/halconf.h
+++ b/testhal/STM32/multi/USB_CDC/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/testhal/STM32/multi/USB_CDC/cfg/stm32h743_nucleo144/chconf.h b/testhal/STM32/multi/USB_CDC/cfg/stm32h743_nucleo144/chconf.h
index e6fc90137..3d46e3045 100644
--- a/testhal/STM32/multi/USB_CDC/cfg/stm32h743_nucleo144/chconf.h
+++ b/testhal/STM32/multi/USB_CDC/cfg/stm32h743_nucleo144/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/testhal/STM32/multi/USB_CDC/cfg/stm32h743_nucleo144/halconf.h b/testhal/STM32/multi/USB_CDC/cfg/stm32h743_nucleo144/halconf.h
index 86d17e425..87dc5beb8 100644
--- a/testhal/STM32/multi/USB_CDC/cfg/stm32h743_nucleo144/halconf.h
+++ b/testhal/STM32/multi/USB_CDC/cfg/stm32h743_nucleo144/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/testhal/STM32/multi/USB_CDC/cfg/stm32l476_discovery/chconf.h b/testhal/STM32/multi/USB_CDC/cfg/stm32l476_discovery/chconf.h
index 33701dbc2..9cd5cbf1f 100644
--- a/testhal/STM32/multi/USB_CDC/cfg/stm32l476_discovery/chconf.h
+++ b/testhal/STM32/multi/USB_CDC/cfg/stm32l476_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/testhal/STM32/multi/USB_CDC/cfg/stm32l476_discovery/halconf.h b/testhal/STM32/multi/USB_CDC/cfg/stm32l476_discovery/halconf.h
index 86d17e425..87dc5beb8 100644
--- a/testhal/STM32/multi/USB_CDC/cfg/stm32l476_discovery/halconf.h
+++ b/testhal/STM32/multi/USB_CDC/cfg/stm32l476_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/testhal/STM32/multi/USB_CDC/cfg/stm32l4r5_nucleo144/chconf.h b/testhal/STM32/multi/USB_CDC/cfg/stm32l4r5_nucleo144/chconf.h
index 33701dbc2..9cd5cbf1f 100644
--- a/testhal/STM32/multi/USB_CDC/cfg/stm32l4r5_nucleo144/chconf.h
+++ b/testhal/STM32/multi/USB_CDC/cfg/stm32l4r5_nucleo144/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/testhal/STM32/multi/USB_CDC/cfg/stm32l4r5_nucleo144/halconf.h b/testhal/STM32/multi/USB_CDC/cfg/stm32l4r5_nucleo144/halconf.h
index a7f885c46..87dc5beb8 100644
--- a/testhal/STM32/multi/USB_CDC/cfg/stm32l4r5_nucleo144/halconf.h
+++ b/testhal/STM32/multi/USB_CDC/cfg/stm32l4r5_nucleo144/halconf.h
@@ -29,9 +29,9 @@
 #define HALCONF_H
 
 #define _CHIBIOS_HAL_CONF_
-#define _CHIBIOS_HAL_CONF_VER_6_0_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
 
-#include <cfg/stm32l4r5_nucleo144/mcuconf.h>
+#include "mcuconf.h"
 
 /**
  * @brief   Enables the PAL subsystem.
diff --git a/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/chconf.h b/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/chconf.h
index 33701dbc2..9cd5cbf1f 100644
--- a/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/chconf.h
+++ b/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_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/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/halconf.h b/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/halconf.h
index 545a6a835..51d3392c0 100644
--- a/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/halconf.h
+++ b/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_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/testhal/STM32/multi/WSPI-MFS/cfg/stm32l4r9_discovery/chconf.h b/testhal/STM32/multi/WSPI-MFS/cfg/stm32l4r9_discovery/chconf.h
index 33701dbc2..9cd5cbf1f 100644
--- a/testhal/STM32/multi/WSPI-MFS/cfg/stm32l4r9_discovery/chconf.h
+++ b/testhal/STM32/multi/WSPI-MFS/cfg/stm32l4r9_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/testhal/STM32/multi/WSPI-MFS/cfg/stm32l4r9_discovery/halconf.h b/testhal/STM32/multi/WSPI-MFS/cfg/stm32l4r9_discovery/halconf.h
index 545a6a835..51d3392c0 100644
--- a/testhal/STM32/multi/WSPI-MFS/cfg/stm32l4r9_discovery/halconf.h
+++ b/testhal/STM32/multi/WSPI-MFS/cfg/stm32l4r9_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"
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 /testhal/STM32
parent	9d21d501b5356dd7b85e1e8600846cee5a611ee5 (diff)
download	ChibiOS-e351308f44bb293075c1ba40d1757047ee644874.tar.gz ChibiOS-e351308f44bb293075c1ba40d1757047ee644874.tar.bz2 ChibiOS-e351308f44bb293075c1ba40d1757047ee644874.zip