12 files changed, 13 insertions, 13 deletions
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.