diff --git a/demos/STM32/RT-STM32G474RE-NUCLEO64/cfg/mcuconf.h b/demos/STM32/RT-STM32G474RE-NUCLEO64/cfg/mcuconf.h
index 8dd7bf5b2..298a25b0e 100644
--- a/demos/STM32/RT-STM32G474RE-NUCLEO64/cfg/mcuconf.h
+++ b/demos/STM32/RT-STM32G474RE-NUCLEO64/cfg/mcuconf.h
@@ -47,12 +47,12 @@
 #define STM32_HSI16_ENABLED                 TRUE
 #define STM32_HSI48_ENABLED                 TRUE
 #define STM32_HSE_ENABLED                   TRUE
-#define STM32_LSI_ENABLED                   TRUE
+#define STM32_LSI_ENABLED                   FALSE
 #define STM32_LSE_ENABLED                   TRUE
 #define STM32_SW                            STM32_SW_PLLRCLK
-#define STM32_PLLSRC                        STM32_PLLSRC_HSI16
-#define STM32_PLLM_VALUE                    4
-#define STM32_PLLN_VALUE                    84
+#define STM32_PLLSRC                        STM32_PLLSRC_HSE
+#define STM32_PLLM_VALUE                    6
+#define STM32_PLLN_VALUE                    85
 #define STM32_PLLPDIV_VALUE                 0
 #define STM32_PLLP_VALUE                    7
 #define STM32_PLLQ_VALUE                    8
@@ -145,6 +145,17 @@
 /*
  * GPT driver system settings.
  */
+#define STM32_GPT_USE_TIM1                  FALSE
+#define STM32_GPT_USE_TIM2                  FALSE
+#define STM32_GPT_USE_TIM3                  FALSE
+#define STM32_GPT_USE_TIM4                  FALSE
+#define STM32_GPT_USE_TIM5                  FALSE
+#define STM32_GPT_USE_TIM6                  FALSE
+#define STM32_GPT_USE_TIM7                  FALSE
+#define STM32_GPT_USE_TIM8                  FALSE
+#define STM32_GPT_USE_TIM15                 FALSE
+#define STM32_GPT_USE_TIM16                 FALSE
+#define STM32_GPT_USE_TIM17                 FALSE
 
 /*
  * I2C driver system settings.
diff --git a/demos/STM32/RT-STM32G474RE-NUCLEO64/main.c b/demos/STM32/RT-STM32G474RE-NUCLEO64/main.c
index 3a1f1bedb..abd273a4f 100644
--- a/demos/STM32/RT-STM32G474RE-NUCLEO64/main.c
+++ b/demos/STM32/RT-STM32G474RE-NUCLEO64/main.c
@@ -14,11 +14,10 @@
     limitations under the License.
 */
 
-#if 0
 #include "ch.h"
 #include "hal.h"
-#include "rt_test_root.h"
-#include "oslib_test_root.h"
+//#include "rt_test_root.h"
+//#include "oslib_test_root.h"
 
 /*
  * Green LED blinker thread, times are in milliseconds.
@@ -35,7 +34,6 @@ static THD_FUNCTION(Thread1, arg) {
     chThdSleepMilliseconds(500);
   }
 }
-#endif
 
 /*
  * Application entry point.
@@ -49,28 +47,28 @@ int main(void) {
    * - Kernel initialization, the main() function becomes a thread and the
    *   RTOS is active.
    */
-//  halInit();
-//  chSysInit();
+  halInit();
+  chSysInit();
 
   /*
    * Activates the serial driver 2 using the driver default configuration.
    */
-//  sdStart(&SD2, NULL);
+//  sdStart(&LPSD1, NULL);
 
   /*
    * Creates the blinker thread.
    */
-//  chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);
+  chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);
 
   /*
    * Normal main() thread activity, in this demo it does nothing except
    * sleeping in a loop and check the button state.
    */
   while (1) {//true) {
-//   if (!palReadLine(LINE_BUTTON)) {
-//      test_execute((BaseSequentialStream *)&SD2, &rt_test_suite);
-//      test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite);
-//    }
-//    chThdSleepMilliseconds(500);
+   if (!palReadLine(LINE_BUTTON)) {
+//      test_execute((BaseSequentialStream *)&LPSD1, &rt_test_suite);
+//      test_execute((BaseSequentialStream *)&LPSD1, &oslib_test_suite);
+    }
+    chThdSleepMilliseconds(500);
  }
 }
diff --git a/os/hal/ports/STM32/LLD/TIMv1/stm32_tim1_tim15_tim16_tim17.inc b/os/hal/ports/STM32/LLD/TIMv1/stm32_tim1_tim15_tim16_tim17.inc
index 680df338a..9af5edd93 100644
--- a/os/hal/ports/STM32/LLD/TIMv1/stm32_tim1_tim15_tim16_tim17.inc
+++ b/os/hal/ports/STM32/LLD/TIMv1/stm32_tim1_tim15_tim16_tim17.inc
@@ -26,45 +26,48 @@
 /* Driver local definitions.                                                 */
 /*===========================================================================*/
 
-#if defined(STM32_TIM1_IS_USED)  || defined(STM32_TIM15_IS_USED) ||         \
-    defined(STM32_TIM16_IS_USED) || defined(STM32_TIM17_IS_USED) ||         \
-    defined(__DOXYGEN__)
-/**
- * @brief   IRQ vectors initialization.
- */
-#define STM32_TIM1_TIM15_TIM16_TIM17_INIT() do {                            \
-  nvicEnableVector(STM32_TIM1_BRK_TIM15_NUMBER,                             \
-                   STM32_IRQ_TIM1_BRK_TIM15_PRIORITY);                      \
-  nvicEnableVector(STM32_TIM1_UP_TIM16_NUMBER,                              \
-                   STM32_IRQ_TIM1_UP_TIM16_PRIORITY);                       \
-  nvicEnableVector(STM32_TIM1_TRGCO_TIM17_NUMBER,                           \
-                   STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY);                    \
-  nvicEnableVector(STM32_TIM1_CC_NUMBER,                                    \
-                   STM32_IRQ_TIM1_CC_PRIORITY);                             \
-} while (0)
-
-/**
- * @brief   IRQ vectors de-initialization.
- */
-#define STM32_TIM1_TIM15_TIM16_TIM17_DEINIT() do {                          \
-  nvicDisableVector(STM32_TIM1_BRK_TIM15_NUMBER);                           \
-  nvicDisableVector(STM32_TIM1_UP_TIM16_NUMBER);                            \
-  nvicDisableVector(STM32_TIM1_TRGCO_TIM17_NUMBER);                         \
-  nvicDisableVector(STM32_TIM1_CC_NUMBER);                                  \
-} while (0)
-#else
-#define STM32_TIM1_TIM15_TIM16_TIM17_INIT()
-#define STM32_TIM1_TIM15_TIM16_TIM17_DEINIT()
-#endif
-
 /*===========================================================================*/
 /* Derived constants and error checks.                                       */
 /*===========================================================================*/
 
+/* Registry checks for robustness.*/
+#if !defined(STM32_HAS_TIM1)
+#error "STM32_HAS_TIM1 not defined in registry"
+#endif
+
+#if !defined(STM32_HAS_TIM15)
+#error "STM32_HAS_TIM15 not defined in registry"
+#endif
+
+#if !defined(STM32_HAS_TIM16)
+#error "STM32_HAS_TIM16 not defined in registry"
+#endif
+
+#if !defined(STM32_HAS_TIM17)
+#error "STM32_HAS_TIM17 not defined in registry"
+#endif
+
 #if !defined(STM32_IRQ_TIM1_BRK_TIM15_PRIORITY)
 #error "STM32_IRQ_TIM1_BRK_TIM15_PRIORITY not defined in mcuconf.h"
 #endif
 
+#if STM32_HAS_TIM1 == FALSE
+#error "TIM1 not present"
+#endif
+
+#if STM32_HAS_TIM15 == FALSE
+#error "TIM15 not present"
+#endif
+
+#if STM32_HAS_TIM16 == FALSE
+#error "TIM16 not present"
+#endif
+
+#if STM32_HAS_TIM17 == FALSE
+#error "TIM17 not present"
+#endif
+
+/* Priority settings checks.*/
 #if !defined(STM32_IRQ_TIM1_UP_TIM16_PRIORITY)
 #error "STM32_IRQ_TIM1_UP_TIM16_PRIORITY not defined in mcuconf.h"
 #endif
@@ -105,11 +108,60 @@
 /* Driver local functions.                                                   */
 /*===========================================================================*/
 
+static inline void tim1_tim15_init(void) {
+#if (HAL_USE_GPT && (                      STM32_GPT_USE_TIM15)) ||         \
+    (HAL_USE_ICU && (                      STM32_ICU_USE_TIM15)) ||         \
+    (HAL_USE_PWM && (                      STM32_PWM_USE_TIM15))
+  nvicEnableVector(STM32_TIM1_BRK_TIM15_NUMBER,
+                   STM32_IRQ_TIM1_BRK_TIM15_PRIORITY);
+#endif
+#if (HAL_USE_GPT && (STM32_GPT_USE_TIM1 || STM32_GPT_USE_TIM16)) ||         \
+    (HAL_USE_ICU && (STM32_ICU_USE_TIM1                       )) ||         \
+    (HAL_USE_PWM && (STM32_PWM_USE_TIM1 || STM32_PWM_USE_TIM16))
+  nvicEnableVector(STM32_TIM1_UP_TIM16_NUMBER,
+                   STM32_IRQ_TIM1_UP_TIM16_PRIORITY);
+#endif
+#if (HAL_USE_GPT && (                      STM32_GPT_USE_TIM17)) ||         \
+    (HAL_USE_PWM && (                      STM32_PWM_USE_TIM17))
+  nvicEnableVector(STM32_TIM1_TRGCO_TIM17_NUMBER,
+                   STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY);
+#endif
+#if (HAL_USE_ICU && (STM32_ICU_USE_TIM1                       )) ||         \
+    (HAL_USE_PWM && (STM32_PWM_USE_TIM1                       ))
+  nvicEnableVector(STM32_TIM1_CC_NUMBER,
+                   STM32_IRQ_TIM1_CC_PRIORITY);
+#endif
+}
+
+static inline void tim1_tim15_deinit(void) {
+#if (HAL_USE_GPT && (                      STM32_GPT_USE_TIM15)) ||         \
+    (HAL_USE_ICU && (                      STM32_ICU_USE_TIM15)) ||         \
+    (HAL_USE_PWM && (                      STM32_PWM_USE_TIM15))
+  nvicDisableVector(STM32_TIM1_BRK_TIM15_NUMBER);
+#endif
+#if (HAL_USE_GPT && (STM32_GPT_USE_TIM1 || STM32_GPT_USE_TIM16)) ||         \
+    (HAL_USE_ICU && (STM32_ICU_USE_TIM1                       )) ||         \
+    (HAL_USE_PWM && (STM32_PWM_USE_TIM1 || STM32_PWM_USE_TIM16))
+  nvicDisableVector(STM32_TIM1_UP_TIM16_NUMBER);
+#endif
+#if (HAL_USE_GPT && (                      STM32_GPT_USE_TIM17)) ||         \
+    (HAL_USE_PWM && (                      STM32_PWM_USE_TIM17))
+  nvicDisableVector(STM32_TIM1_TRGCO_TIM17_NUMBER);
+#endif
+#if (HAL_USE_ICU && (STM32_ICU_USE_TIM1                       )) ||         \
+    (HAL_USE_PWM && (STM32_PWM_USE_TIM1                       ))
+  nvicDisableVector(STM32_TIM1_CC_NUMBER);
+#endif
+}
+
 /*===========================================================================*/
 /* Driver interrupt handlers.                                                */
 /*===========================================================================*/
 
-#if HAL_USE_GPT || HAL_USE_ICU || HAL_USE_PWM || defined(__DOXYGEN__)
+#if (HAL_USE_GPT && (                      STM32_GPT_USE_TIM15)) ||         \
+    (HAL_USE_ICU && (                      STM32_ICU_USE_TIM15)) ||         \
+    (HAL_USE_PWM && (                      STM32_PWM_USE_TIM15)) ||         \
+    defined(__DOXYGEN__)
 /**
  * @brief   TIM1-BRK, TIM15 interrupt handler.
  *
@@ -137,7 +189,12 @@ OSAL_IRQ_HANDLER(STM32_TIM1_BRK_TIM15_HANDLER) {
 
   OSAL_IRQ_EPILOGUE();
 }
+#endif
 
+#if (HAL_USE_GPT && (STM32_GPT_USE_TIM1 || STM32_GPT_USE_TIM16)) ||         \
+    (HAL_USE_ICU && (STM32_ICU_USE_TIM1                       )) ||         \
+    (HAL_USE_PWM && (STM32_PWM_USE_TIM1 || STM32_PWM_USE_TIM16)) ||         \
+    defined(__DOXYGEN__)
 /**
  * @brief   TIM1-UP, TIM16 interrupt handler.
  *
@@ -171,7 +228,11 @@ OSAL_IRQ_HANDLER(STM32_TIM1_UP_TIM16_HANDLER) {
 
   OSAL_IRQ_EPILOGUE();
 }
+#endif
 
+#if (HAL_USE_GPT && (                      STM32_GPT_USE_TIM17)) ||         \
+    (HAL_USE_PWM && (                      STM32_PWM_USE_TIM17)) ||         \
+    defined(__DOXYGEN__)
 /**
  * @brief   TIM1-TRG-COM, TIM17 interrupt handler.
  *
@@ -197,7 +258,11 @@ OSAL_IRQ_HANDLER(STM32_TIM1_TRGCO_TIM17_HANDLER) {
 
   OSAL_IRQ_EPILOGUE();
 }
+#endif
 
+#if (HAL_USE_ICU && (STM32_ICU_USE_TIM1                       )) ||         \
+    (HAL_USE_PWM && (STM32_PWM_USE_TIM1                       )) ||         \
+    defined(__DOXYGEN__)
 /**
  * @brief   TIM1-CC interrupt handler.
  *
@@ -223,7 +288,7 @@ OSAL_IRQ_HANDLER(STM32_TIM1_CC_HANDLER) {
 
   OSAL_IRQ_EPILOGUE();
 }
-#endif /* HAL_USE_GPT || HAL_USE_ICU || HAL_USE_PWM */
+#endif
 
 /*===========================================================================*/
 /* Driver exported functions.                                                */
diff --git a/os/hal/ports/STM32/LLD/TIMv1/stm32_tim2.inc b/os/hal/ports/STM32/LLD/TIMv1/stm32_tim2.inc
index 2e926de5f..bc79edcd3 100644
--- a/os/hal/ports/STM32/LLD/TIMv1/stm32_tim2.inc
+++ b/os/hal/ports/STM32/LLD/TIMv1/stm32_tim2.inc
@@ -26,30 +26,20 @@
 /* Driver local definitions.                                                 */
 /*===========================================================================*/
 
-#if defined(STM32_TIM2_IS_USED) || defined(__DOXYGEN__)
-/**
- * @brief   IRQ vectors initialization.
- */
-#define STM32_TIM2_TIM2_INIT() do {                                         \
-  nvicEnableVector(STM32_TIM2_NUMBER,                                       \
-                   STM32_IRQ_TIM2_PRIORITY);                                \
-} while (0)
-
-/**
- * @brief   IRQ vectors de-initialization.
- */
-#define STM32_TIM2_TIM2_DEINIT() do {                                       \
-  nvicDisableVector(STM32_TIM2_NUMBER);                                     \
-} while (0)
-#else
-#define STM32_TIM2_TIM2_INIT()
-#define STM32_TIM2_TIM2_DEINIT()
-#endif
-
 /*===========================================================================*/
 /* Derived constants and error checks.                                       */
 /*===========================================================================*/
 
+/* Registry checks for robustness.*/
+#if !defined(STM32_HAS_TIM2)
+#error "STM32_HAS_TIM2 not defined in registry"
+#endif
+
+#if STM32_HAS_TIM2 == FALSE
+#error "TIM2 not present"
+#endif
+
+/* Priority settings checks.*/
 #if !defined(STM32_IRQ_TIM2_PRIORITY)
 #error "STM32_IRQ_TIM2_PRIORITY not defined in mcuconf.h"
 #endif
@@ -70,11 +60,26 @@
 /* Driver local functions.                                                   */
 /*===========================================================================*/
 
+static inline void tim2_init(void) {
+#if defined(STM32_TIM2_IS_USED)
+  nvicEnableVector(STM32_TIM2_NUMBER, STM32_IRQ_TIM2_PRIORITY);
+#endif
+}
+
+static inline void tim2_deinit(void) {
+#if defined(STM32_TIM2_IS_USED)
+  nvicDisableVector(STM32_TIM2_NUMBER);
+#endif
+}
+
 /*===========================================================================*/
 /* Driver interrupt handlers.                                                */
 /*===========================================================================*/
 
-#if HAL_USE_GPT || HAL_USE_ICU || HAL_USE_PWM || defined(__DOXYGEN__)
+#if (HAL_USE_GPT && STM32_GPT_USE_TIM2) ||                                  \
+    (HAL_USE_ICU && STM32_ICU_USE_TIM2) ||                                  \
+    (HAL_USE_PWM && STM32_PWM_USE_TIM2) ||                                  \
+    defined(__DOXYGEN__)
 /**
  * @brief   TIM2 interrupt handler.
  *
@@ -102,7 +107,7 @@ OSAL_IRQ_HANDLER(STM32_TIM2_HANDLER) {
 
   OSAL_IRQ_EPILOGUE();
 }
-#endif /* HAL_USE_GPT || HAL_USE_ICU || HAL_USE_PWM */
+#endif
 
 /*===========================================================================*/
 /* Driver exported functions.                                                */
diff --git a/os/hal/ports/STM32/LLD/TIMv1/stm32_tim20.inc b/os/hal/ports/STM32/LLD/TIMv1/stm32_tim20.inc
index c7b1602eb..b18b457aa 100644
--- a/os/hal/ports/STM32/LLD/TIMv1/stm32_tim20.inc
+++ b/os/hal/ports/STM32/LLD/TIMv1/stm32_tim20.inc
@@ -26,33 +26,20 @@
 /* Driver local definitions.                                                 */
 /*===========================================================================*/
 
-#if defined(STM32_TIM20_IS_USED) || defined(__DOXYGEN__)
-/**
- * @brief   IRQ vectors initialization.
- */
-#define STM32_TIM20_TIM205_INIT() do {                                       \
-  nvicEnableVector(STM32_TIM20_UP_NUMBER,                                    \
-                   STM32_IRQ_TIM20_UP_PRIORITY);                             \
-  nvicEnableVector(STM32_TIM20_CC_NUMBER,                                    \
-                   STM32_IRQ_TIM20_CC_PRIORITY);                             \
-} while (0)
-
-/**
- * @brief   IRQ vectors de-initialization.
- */
-#define STM32_TIM20_TIM205_DEINIT() do {                                     \
-  nvicDisableVector(STM32_TIM20_UP_NUMBER);                                  \
-  nvicDisableVector(STM32_TIM20_CC_NUMBER);                                  \
-} while (0)
-#else
-#define STM32_TIM8_TIM20_INIT()
-#define STM32_TIM8_TIM20_DEINIT()
-#endif
-
 /*===========================================================================*/
 /* Derived constants and error checks.                                       */
 /*===========================================================================*/
 
+/* Registry checks for robustness.*/
+#if !defined(STM32_HAS_TIM20)
+#error "STM32_HAS_TIM20 not defined in registry"
+#endif
+
+#if STM32_HAS_TIM20 == FALSE
+#error "TIM20 not present"
+#endif
+
+/* Priority settings checks.*/
 #if !defined(STM32_IRQ_TIM20_UP_PRIORITY)
 #error "STM32_IRQ_TIM20_UP_PRIORITY not defined in mcuconf.h"
 #endif
@@ -81,11 +68,27 @@
 /* Driver local functions.                                                   */
 /*===========================================================================*/
 
+static inline void tim20_init(void) {
+#if defined(STM32_TIM20_IS_USED)
+  nvicEnableVector(STM32_TIM20_UP_NUMBER, STM32_IRQ_TIM20_UP_PRIORITY);
+  nvicEnableVector(STM32_TIM20_CC_NUMBER, STM32_IRQ_TIM20_CC_PRIORITY);
+#endif
+}
+
+static inline void tim20_deinit(void) {
+#if defined(STM32_TIM20_IS_USED)
+  nvicDisableVector(STM32_TIM20_UP_NUMBER);
+  nvicDisableVector(STM32_TIM20_CC_NUMBER);
+#endif
+}
+
 /*===========================================================================*/
 /* Driver interrupt handlers.                                                */
 /*===========================================================================*/
 
-#if HAL_USE_GPT || HAL_USE_ICU || HAL_USE_PWM || defined(__DOXYGEN__)
+#if (HAL_USE_ICU && STM32_ICU_USE_TIM20) ||                                 \
+    (HAL_USE_PWM && STM32_PWM_USE_TIM20) ||                                 \
+    defined(__DOXYGEN__)
 /**
  * @brief   TIM20-UP interrupt handler.
  *
@@ -96,9 +99,7 @@ OSAL_IRQ_HANDLER(STM32_TIM20_UP_HANDLER) {
   OSAL_IRQ_PROLOGUE();
 
 #if HAL_USE_GPT
-#if STM32_GPT_USE_TIM20
-  gpt_lld_serve_interrupt(&GPTD20);
-#endif
+  /* Not used by GPT.*/
 #endif
 #if HAL_USE_ICU
 #if STM32_ICU_USE_TIM20
@@ -113,7 +114,11 @@ OSAL_IRQ_HANDLER(STM32_TIM20_UP_HANDLER) {
 
   OSAL_IRQ_EPILOGUE();
 }
+#endif
 
+#if (HAL_USE_ICU && STM32_ICU_USE_TIM20) ||                                 \
+    (HAL_USE_PWM && STM32_PWM_USE_TIM20) ||                                 \
+    defined(__DOXYGEN__)
 /**
  * @brief   TIM20-CC interrupt handler.
  *
diff --git a/os/hal/ports/STM32/LLD/TIMv1/stm32_tim3.inc b/os/hal/ports/STM32/LLD/TIMv1/stm32_tim3.inc
index 8b059e19c..ce455aa74 100644
--- a/os/hal/ports/STM32/LLD/TIMv1/stm32_tim3.inc
+++ b/os/hal/ports/STM32/LLD/TIMv1/stm32_tim3.inc
@@ -26,30 +26,20 @@
 /* Driver local definitions.                                                 */
 /*===========================================================================*/
 
-#if defined(STM32_TIM3_IS_USED) || defined(__DOXYGEN__)
-/**
- * @brief   IRQ vectors initialization.
- */
-#define STM32_TIM3_TIM3_INIT() do {                                         \
-  nvicEnableVector(STM32_TIM3_NUMBER,                                       \
-                   STM32_IRQ_TIM3_PRIORITY);                                \
-} while (0)
-
-/**
- * @brief   IRQ vectors de-initialization.
- */
-#define STM32_TIM3_TIM3_DEINIT() do {                                       \
-  nvicDisableVector(STM32_TIM3_NUMBER);                                     \
-} while (0)
-#else
-#define STM32_TIM3_TIM3_INIT()
-#define STM32_TIM3_TIM3_DEINIT()
-#endif
-
 /*===========================================================================*/
 /* Derived constants and error checks.                                       */
 /*===========================================================================*/
 
+/* Registry checks for robustness.*/
+#if !defined(STM32_HAS_TIM3)
+#error "STM32_HAS_TIM3 not defined in registry"
+#endif
+
+#if STM32_HAS_TIM3 == FALSE
+#error "TIM3 not present"
+#endif
+
+/* Priority settings checks.*/
 #if !defined(STM32_IRQ_TIM3_PRIORITY)
 #error "STM32_IRQ_TIM3_PRIORITY not defined in mcuconf.h"
 #endif
@@ -70,11 +60,26 @@
 /* Driver local functions.                                                   */
 /*===========================================================================*/
 
+static inline void tim3_init(void) {
+#if defined(STM32_TIM3_IS_USED)
+  nvicEnableVector(STM32_TIM3_NUMBER, STM32_IRQ_TIM3_PRIORITY);
+#endif
+}
+
+static inline void tim3_deinit(void) {
+#if defined(STM32_TIM3_IS_USED)
+  nvicDisableVector(STM32_TIM3_NUMBER);
+#endif
+}
+
 /*===========================================================================*/
 /* Driver interrupt handlers.                                                */
 /*===========================================================================*/
 
-#if HAL_USE_GPT || HAL_USE_ICU || HAL_USE_PWM || defined(__DOXYGEN__)
+#if (HAL_USE_GPT && STM32_GPT_USE_TIM3) ||                                  \
+    (HAL_USE_ICU && STM32_ICU_USE_TIM3) ||                                  \
+    (HAL_USE_PWM && STM32_PWM_USE_TIM3) ||                                  \
+    defined(__DOXYGEN__)
 /**
  * @brief   TIM3 interrupt handler.
  *
@@ -102,7 +107,7 @@ OSAL_IRQ_HANDLER(STM32_TIM3_HANDLER) {
 
   OSAL_IRQ_EPILOGUE();
 }
-#endif /* HAL_USE_GPT || HAL_USE_ICU || HAL_USE_PWM */
+#endif
 
 /*===========================================================================*/
 /* Driver exported functions.                                                */
diff --git a/os/hal/ports/STM32/LLD/TIMv1/stm32_tim4.inc b/os/hal/ports/STM32/LLD/TIMv1/stm32_tim4.inc
index 73f01a13f..24125f8a1 100644
--- a/os/hal/ports/STM32/LLD/TIMv1/stm32_tim4.inc
+++ b/os/hal/ports/STM32/LLD/TIMv1/stm32_tim4.inc
@@ -26,30 +26,20 @@
 /* Driver local definitions.                                                 */
 /*===========================================================================*/
 
-#if defined(STM32_TIM4_IS_USED) || defined(__DOXYGEN__)
-/**
- * @brief   IRQ vectors initialization.
- */
-#define STM32_TIM4_TIM4_INIT() do {                                         \
-  nvicEnableVector(STM32_TIM4_NUMBER,                                       \
-                   STM32_IRQ_TIM4_PRIORITY);                                \
-} while (0)
-
-/**
- * @brief   IRQ vectors de-initialization.
- */
-#define STM32_TIM4_TIM4_DEINIT() do {                                       \
-  nvicDisableVector(STM32_TIM4_NUMBER);                                     \
-} while (0)
-#else
-#define STM32_TIM4_TIM4_INIT()
-#define STM32_TIM4_TIM4_DEINIT()
-#endif
-
 /*===========================================================================*/
 /* Derived constants and error checks.                                       */
 /*===========================================================================*/
 
+/* Registry checks for robustness.*/
+#if !defined(STM32_HAS_TIM4)
+#error "STM32_HAS_TIM4 not defined in registry"
+#endif
+
+#if STM32_HAS_TIM4 == FALSE
+#error "TIM4 not present"
+#endif
+
+/* Priority settings checks.*/
 #if !defined(STM32_IRQ_TIM4_PRIORITY)
 #error "STM32_IRQ_TIM4_PRIORITY not defined in mcuconf.h"
 #endif
@@ -70,11 +60,26 @@
 /* Driver local functions.                                                   */
 /*===========================================================================*/
 
+static inline void tim4_init(void) {
+#if defined(STM32_TIM4_IS_USED)
+  nvicEnableVector(STM32_TIM4_NUMBER, STM32_IRQ_TIM4_PRIORITY);
+#endif
+}
+
+static inline void tim4_deinit(void) {
+#if defined(STM32_TIM4_IS_USED)
+  nvicDisableVector(STM32_TIM4_NUMBER);
+#endif
+}
+
 /*===========================================================================*/
 /* Driver interrupt handlers.                                                */
 /*===========================================================================*/
 
-#if HAL_USE_GPT || HAL_USE_ICU || HAL_USE_PWM || defined(__DOXYGEN__)
+#if (HAL_USE_GPT && STM32_GPT_USE_TIM4) ||                                  \
+    (HAL_USE_ICU && STM32_ICU_USE_TIM4) ||                                  \
+    (HAL_USE_PWM && STM32_PWM_USE_TIM4) ||                                  \
+    defined(__DOXYGEN__)
 /**
  * @brief   TIM4 interrupt handler.
  *
@@ -102,7 +107,7 @@ OSAL_IRQ_HANDLER(STM32_TIM4_HANDLER) {
 
   OSAL_IRQ_EPILOGUE();
 }
-#endif /* HAL_USE_GPT || HAL_USE_ICU || HAL_USE_PWM */
+#endif
 
 /*===========================================================================*/
 /* Driver exported functions.                                                */
diff --git a/os/hal/ports/STM32/LLD/TIMv1/stm32_tim5.inc b/os/hal/ports/STM32/LLD/TIMv1/stm32_tim5.inc
index 3044fbcab..89724d31a 100644
--- a/os/hal/ports/STM32/LLD/TIMv1/stm32_tim5.inc
+++ b/os/hal/ports/STM32/LLD/TIMv1/stm32_tim5.inc
@@ -26,30 +26,20 @@
 /* Driver local definitions.                                                 */
 /*===========================================================================*/
 
-#if defined(STM32_TIM5_IS_USED) || defined(__DOXYGEN__)
-/**
- * @brief   IRQ vectors initialization.
- */
-#define STM32_TIM5_TIM5_INIT() do {                                         \
-  nvicEnableVector(STM32_TIM5_NUMBER,                                       \
-                   STM32_IRQ_TIM5_PRIORITY);                                \
-} while (0)
-
-/**
- * @brief   IRQ vectors de-initialization.
- */
-#define STM32_TIM5_TIM5_DEINIT() do {                                       \
-  nvicDisableVector(STM32_TIM5_NUMBER);                                     \
-} while (0)
-#else
-#define STM32_TIM5_TIM5_INIT()
-#define STM32_TIM5_TIM5_DEINIT()
-#endif
-
 /*===========================================================================*/
 /* Derived constants and error checks.                                       */
 /*===========================================================================*/
 
+/* Registry checks for robustness.*/
+#if !defined(STM32_HAS_TIM5)
+#error "STM32_HAS_TIM5 not defined in registry"
+#endif
+
+#if STM32_HAS_TIM5 == FALSE
+#error "TIM5 not present"
+#endif
+
+/* Priority settings checks.*/
 #if !defined(STM32_IRQ_TIM5_PRIORITY)
 #error "STM32_IRQ_TIM5_PRIORITY not defined in mcuconf.h"
 #endif
@@ -70,11 +60,26 @@
 /* Driver local functions.                                                   */
 /*===========================================================================*/
 
+static inline void tim5_init(void) {
+#if defined(STM32_TIM5_IS_USED)
+  nvicEnableVector(STM32_TIM5_NUMBER, STM32_IRQ_TIM5_PRIORITY);
+#endif
+}
+
+static inline void tim5_deinit(void) {
+#if defined(STM32_TIM5_IS_USED)
+  nvicDisableVector(STM32_TIM5_NUMBER);
+#endif
+}
+
 /*===========================================================================*/
 /* Driver interrupt handlers.                                                */
 /*===========================================================================*/
 
-#if HAL_USE_GPT || HAL_USE_ICU || HAL_USE_PWM || defined(__DOXYGEN__)
+#if (HAL_USE_GPT && STM32_GPT_USE_TIM5) ||                                  \
+    (HAL_USE_ICU && STM32_ICU_USE_TIM5) ||                                  \
+    (HAL_USE_PWM && STM32_PWM_USE_TIM5) ||                                  \
+    defined(__DOXYGEN__)
 /**
  * @brief   TIM5 interrupt handler.
  *
@@ -102,7 +107,7 @@ OSAL_IRQ_HANDLER(STM32_TIM5_HANDLER) {
 
   OSAL_IRQ_EPILOGUE();
 }
-#endif /* HAL_USE_GPT || HAL_USE_ICU || HAL_USE_PWM */
+#endif
 
 /*===========================================================================*/
 /* Driver exported functions.                                                */
diff --git a/os/hal/ports/STM32/LLD/TIMv1/stm32_tim6.inc b/os/hal/ports/STM32/LLD/TIMv1/stm32_tim6.inc
index b0a6f72e6..cf2eae75b 100644
--- a/os/hal/ports/STM32/LLD/TIMv1/stm32_tim6.inc
+++ b/os/hal/ports/STM32/LLD/TIMv1/stm32_tim6.inc
@@ -26,30 +26,20 @@
 /* Driver local definitions.                                                 */
 /*===========================================================================*/
 
-#if defined(STM32_TIM6_IS_USED) || defined(__DOXYGEN__)
-/**
- * @brief   IRQ vectors initialization.
- */
-#define STM32_TIM6_TIM6_INIT() do {                                         \
-  nvicEnableVector(STM32_TIM6_NUMBER,                                       \
-                   STM32_IRQ_TIM6_PRIORITY);                                \
-} while (0)
-
-/**
- * @brief   IRQ vectors de-initialization.
- */
-#define STM32_TIM6_TIM6_DEINIT() do {                                       \
-  nvicDisableVector(STM32_TIM6_NUMBER);                                     \
-} while (0)
-#else
-#define STM32_TIM6_TIM6_INIT()
-#define STM32_TIM6_TIM6_DEINIT()
-#endif
-
 /*===========================================================================*/
 /* Derived constants and error checks.                                       */
 /*===========================================================================*/
 
+/* Registry checks for robustness.*/
+#if !defined(STM32_HAS_TIM6)
+#error "STM32_HAS_TIM6 not defined in registry"
+#endif
+
+#if STM32_HAS_TIM6 == FALSE
+#error "TIM6 not present"
+#endif
+
+/* Priority settings checks.*/
 #if !defined(STM32_IRQ_TIM6_PRIORITY)
 #error "STM32_IRQ_TIM6_PRIORITY not defined in mcuconf.h"
 #endif
@@ -70,11 +60,24 @@
 /* Driver local functions.                                                   */
 /*===========================================================================*/
 
+static inline void tim6_init(void) {
+#if defined(STM32_TIM6_IS_USED)
+  nvicEnableVector(STM32_TIM6_NUMBER, STM32_IRQ_TIM6_PRIORITY);
+#endif
+}
+
+static inline void tim6_deinit(void) {
+#if defined(STM32_TIM6_IS_USED)
+  nvicDisableVector(STM32_TIM6_NUMBER);
+#endif
+}
+
 /*===========================================================================*/
 /* Driver interrupt handlers.                                                */
 /*===========================================================================*/
 
-#if HAL_USE_GPT || HAL_USE_ICU || HAL_USE_PWM || defined(__DOXYGEN__)
+#if (HAL_USE_GPT && STM32_GPT_USE_TIM6) ||                                  \
+    defined(__DOXYGEN__)
 /**
  * @brief   TIM6 interrupt handler.
  *
@@ -98,7 +101,7 @@ OSAL_IRQ_HANDLER(STM32_TIM6_HANDLER) {
 
   OSAL_IRQ_EPILOGUE();
 }
-#endif /* HAL_USE_GPT || HAL_USE_ICU || HAL_USE_PWM */
+#endif
 
 /*===========================================================================*/
 /* Driver exported functions.                                                */
diff --git a/os/hal/ports/STM32/LLD/TIMv1/stm32_tim7.inc b/os/hal/ports/STM32/LLD/TIMv1/stm32_tim7.inc
index 43fc40adf..3c156da33 100644
--- a/os/hal/ports/STM32/LLD/TIMv1/stm32_tim7.inc
+++ b/os/hal/ports/STM32/LLD/TIMv1/stm32_tim7.inc
@@ -26,30 +26,20 @@
 /* Driver local definitions.                                                 */
 /*===========================================================================*/
 
-#if defined(STM32_TIM7_IS_USED) || defined(__DOXYGEN__)
-/**
- * @brief   IRQ vectors initialization.
- */
-#define STM32_TIM7_TIM7_INIT() do {                                         \
-  nvicEnableVector(STM32_TIM7_NUMBER,                                       \
-                   STM32_IRQ_TIM7_PRIORITY);                                \
-} while (0)
-
-/**
- * @brief   IRQ vectors de-initialization.
- */
-#define STM32_TIM7_TIM7_DEINIT() do {                                       \
-  nvicDisableVector(STM32_TIM7_NUMBER);                                     \
-} while (0)
-#else
-#define STM32_TIM7_TIM7_INIT()
-#define STM32_TIM7_TIM7_DEINIT()
-#endif
-
 /*===========================================================================*/
 /* Derived constants and error checks.                                       */
 /*===========================================================================*/
 
+/* Registry checks for robustness.*/
+#if !defined(STM32_HAS_TIM7)
+#error "STM32_HAS_TIM7 not defined in registry"
+#endif
+
+#if STM32_HAS_TIM7 == FALSE
+#error "TIM7 not present"
+#endif
+
+/* Priority settings checks.*/
 #if !defined(STM32_IRQ_TIM7_PRIORITY)
 #error "STM32_IRQ_TIM7_PRIORITY not defined in mcuconf.h"
 #endif
@@ -70,11 +60,24 @@
 /* Driver local functions.                                                   */
 /*===========================================================================*/
 
+static inline void tim7_init(void) {
+#if defined(STM32_TIM7_IS_USED)
+  nvicEnableVector(STM32_TIM7_NUMBER, STM32_IRQ_TIM7_PRIORITY);
+#endif
+}
+
+static inline void tim7_deinit(void) {
+#if defined(STM32_TIM7_IS_USED)
+  nvicDisableVector(STM32_TIM7_NUMBER);
+#endif
+}
+
 /*===========================================================================*/
 /* Driver interrupt handlers.                                                */
 /*===========================================================================*/
 
-#if HAL_USE_GPT || HAL_USE_ICU || HAL_USE_PWM || defined(__DOXYGEN__)
+#if (HAL_USE_GPT && STM32_GPT_USE_TIM7) ||                                  \
+    defined(__DOXYGEN__)
 /**
  * @brief   TIM7 interrupt handler.
  *
@@ -98,7 +101,7 @@ OSAL_IRQ_HANDLER(STM32_TIM7_HANDLER) {
 
   OSAL_IRQ_EPILOGUE();
 }
-#endif /* HAL_USE_GPT || HAL_USE_ICU || HAL_USE_PWM */
+#endif
 
 /*===========================================================================*/
 /* Driver exported functions.                                                */
diff --git a/os/hal/ports/STM32/LLD/TIMv1/stm32_tim8.inc b/os/hal/ports/STM32/LLD/TIMv1/stm32_tim8.inc
index c7d186d4a..760ce6294 100644
--- a/os/hal/ports/STM32/LLD/TIMv1/stm32_tim8.inc
+++ b/os/hal/ports/STM32/LLD/TIMv1/stm32_tim8.inc
@@ -26,33 +26,20 @@
 /* Driver local definitions.                                                 */
 /*===========================================================================*/
 
-#if defined(STM32_TIM8_IS_USED) || defined(__DOXYGEN__)
-/**
- * @brief   IRQ vectors initialization.
- */
-#define STM32_TIM8_TIM8_INIT() do {                                         \
-  nvicEnableVector(STM32_TIM8_UP_NUMBER,                                    \
-                   STM32_IRQ_TIM8_UP_PRIORITY);                             \
-  nvicEnableVector(STM32_TIM8_CC_NUMBER,                                    \
-                   STM32_IRQ_TIM8_CC_PRIORITY);                             \
-} while (0)
-
-/**
- * @brief   IRQ vectors de-initialization.
- */
-#define STM32_TIM8_TIM8_DEINIT() do {                                       \
-  nvicDisableVector(STM32_TIM8_UP_NUMBER);                                  \
-  nvicDisableVector(STM32_TIM8_CC_NUMBER);                                  \
-} while (0)
-#else
-#define STM32_TIM8_TIM8_INIT()
-#define STM32_TIM8_TIM8_DEINIT()
-#endif
-
 /*===========================================================================*/
 /* Derived constants and error checks.                                       */
 /*===========================================================================*/
 
+/* Registry checks for robustness.*/
+#if !defined(STM32_HAS_TIM8)
+#error "STM32_HAS_TIM8 not defined in registry"
+#endif
+
+#if STM32_HAS_TIM8 == FALSE
+#error "TIM8 not present"
+#endif
+
+/* Priority settings checks.*/
 #if !defined(STM32_IRQ_TIM8_UP_PRIORITY)
 #error "STM32_IRQ_TIM8_UP_PRIORITY not defined in mcuconf.h"
 #endif
@@ -81,11 +68,27 @@
 /* Driver local functions.                                                   */
 /*===========================================================================*/
 
+static inline void tim8_init(void) {
+#if defined(STM32_TIM8_IS_USED)
+  nvicEnableVector(STM32_TIM8_UP_NUMBER, STM32_IRQ_TIM8_UP_PRIORITY);
+  nvicEnableVector(STM32_TIM8_CC_NUMBER, STM32_IRQ_TIM8_CC_PRIORITY);
+#endif
+}
+
+static inline void tim8_deinit(void) {
+#if defined(STM32_TIM8_IS_USED)
+  nvicDisableVector(STM32_TIM8_UP_NUMBER);
+  nvicDisableVector(STM32_TIM8_CC_NUMBER);
+#endif
+}
+
 /*===========================================================================*/
 /* Driver interrupt handlers.                                                */
 /*===========================================================================*/
 
-#if HAL_USE_GPT || HAL_USE_ICU || HAL_USE_PWM || defined(__DOXYGEN__)
+#if (HAL_USE_ICU && STM32_ICU_USE_TIM8) ||                                  \
+    (HAL_USE_PWM && STM32_PWM_USE_TIM8) ||                                  \
+    defined(__DOXYGEN__)
 /**
  * @brief   TIM8-UP interrupt handler.
  *
@@ -113,7 +116,11 @@ OSAL_IRQ_HANDLER(STM32_TIM8_UP_HANDLER) {
 
   OSAL_IRQ_EPILOGUE();
 }
+#endif
 
+#if (HAL_USE_ICU && STM32_ICU_USE_TIM8) ||                                  \
+    (HAL_USE_PWM && STM32_PWM_USE_TIM8) ||                                  \
+    defined(__DOXYGEN__)
 /**
  * @brief   TIM8-CC interrupt handler.
  *
@@ -139,7 +146,7 @@ OSAL_IRQ_HANDLER(STM32_TIM8_CC_HANDLER) {
 
   OSAL_IRQ_EPILOGUE();
 }
-#endif /* HAL_USE_GPT || HAL_USE_ICU || HAL_USE_PWM */
+#endif
 
 /*===========================================================================*/
 /* Driver exported functions.                                                */
diff --git a/os/hal/ports/STM32/LLD/USARTv2/stm32_lpuart1.inc b/os/hal/ports/STM32/LLD/USARTv2/stm32_lpuart1.inc
new file mode 100644
index 000000000..4a67f8bd4
--- /dev/null
+++ b/os/hal/ports/STM32/LLD/USARTv2/stm32_lpuart1.inc
@@ -0,0 +1,104 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    USARTv2/stm32_lpuart1.inc
+ * @brief   Shared LPUART1 handler.
+ *
+ * @addtogroup STM32_LPUART1_HANDLER
+ * @{
+ */
+
+/*===========================================================================*/
+/* Driver local definitions.                                                 */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Derived constants and error checks.                                       */
+/*===========================================================================*/
+
+/* Registry checks for robustness.*/
+#if !defined(STM32_HAS_LPUART1)
+#error "STM32_HAS_LPUART1 not defined in registry"
+#endif
+
+#if STM32_HAS_LPUART1 == FALSE
+#error "LPUART1 not present"
+#endif
+
+/* Priority settings checks.*/
+#if !defined(STM32_IRQ_LPUART1_PRIORITY)
+#error "STM32_IRQ_LPUART1_PRIORITY not defined in mcuconf.h"
+#endif
+
+#if !OSAL_IRQ_IS_VALID_PRIORITY(STM32_IRQ_LPUART1_PRIORITY)
+#error "Invalid IRQ priority assigned to STM32_IRQ_LPUART1_PRIORITY"
+#endif
+
+/*===========================================================================*/
+/* Driver exported variables.                                                */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Driver local variables.                                                   */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Driver local functions.                                                   */
+/*===========================================================================*/
+
+static inline void lpuart1_irq_init(void) {
+#if defined(STM32_LPUART1_IS_USED)
+  nvicEnableVector(STM32_LPUART1_NUMBER, STM32_IRQ_LPUART1_PRIORITY);
+#endif
+}
+
+static inline void lpuart1_irq_deinit(void) {
+#if defined(STM32_LPUART1_IS_USED)
+  nvicDisableVector(STM32_LPUART1_NUMBER);
+#endif
+}
+
+/*===========================================================================*/
+/* Driver interrupt handlers.                                                */
+/*===========================================================================*/
+
+#if (HAL_USE_SERIAL && STM32_SERIAL_USE_LPUART1) ||                           \
+    defined(__DOXYGEN__)
+/**
+ * @brief   LPUART1 interrupt handler.
+ *
+ * @isr
+ */
+OSAL_IRQ_HANDLER(STM32_LPUART1_HANDLER) {
+
+  OSAL_IRQ_PROLOGUE();
+
+#if HAL_USE_SERIAL
+#if STM32_SERIAL_USE_LPUART1
+  sd_lld_serve_interrupt(&LPSD1);
+#endif
+#endif
+
+  OSAL_IRQ_EPILOGUE();
+}
+#endif
+
+/*===========================================================================*/
+/* Driver exported functions.                                                */
+/*===========================================================================*/
+
+/** @} */
diff --git a/os/hal/ports/STM32/LLD/USARTv2/stm32_uart4.inc b/os/hal/ports/STM32/LLD/USARTv2/stm32_uart4.inc
new file mode 100644
index 000000000..4487c0186
--- /dev/null
+++ b/os/hal/ports/STM32/LLD/USARTv2/stm32_uart4.inc
@@ -0,0 +1,110 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    USARTv2/stm32_uart4.inc
+ * @brief   Shared UART4 handler.
+ *
+ * @addtogroup STM32_UART4_HANDLER
+ * @{
+ */
+
+/*===========================================================================*/
+/* Driver local definitions.                                                 */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Derived constants and error checks.                                       */
+/*===========================================================================*/
+
+/* Registry checks for robustness.*/
+#if !defined(STM32_HAS_UART4)
+#error "STM32_HAS_UART4 not defined in registry"
+#endif
+
+#if STM32_HAS_UART4 == FALSE
+#error "UART4 not present"
+#endif
+
+/* Priority settings checks.*/
+#if !defined(STM32_IRQ_UART4_PRIORITY)
+#error "STM32_IRQ_UART4_PRIORITY not defined in mcuconf.h"
+#endif
+
+#if !OSAL_IRQ_IS_VALID_PRIORITY(STM32_IRQ_UART4_PRIORITY)
+#error "Invalid IRQ priority assigned to STM32_IRQ_UART4_PRIORITY"
+#endif
+
+/*===========================================================================*/
+/* Driver exported variables.                                                */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Driver local variables.                                                   */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Driver local functions.                                                   */
+/*===========================================================================*/
+
+static inline void uart4_irq_init(void) {
+#if defined(STM32_UART4_IS_USED)
+  nvicEnableVector(STM32_UART4_NUMBER, STM32_IRQ_UART4_PRIORITY);
+#endif
+}
+
+static inline void uart4_irq_deinit(void) {
+#if defined(STM32_UART4_IS_USED)
+  nvicDisableVector(STM32_UART4_NUMBER);
+#endif
+}
+
+/*===========================================================================*/
+/* Driver interrupt handlers.                                                */
+/*===========================================================================*/
+
+#if (HAL_USE_SERIAL && STM32_SERIAL_USE_UART4) ||                           \
+    (HAL_USE_UART && STM32_UART_USE_UART4) ||                               \
+    defined(__DOXYGEN__)
+/**
+ * @brief   UART4 interrupt handler.
+ *
+ * @isr
+ */
+OSAL_IRQ_HANDLER(STM32_UART4_HANDLER) {
+
+  OSAL_IRQ_PROLOGUE();
+
+#if HAL_USE_SERIAL
+#if STM32_SERIAL_USE_UART4
+  sd_lld_serve_interrupt(&SD4);
+#endif
+#endif
+#if HAL_USE_UART
+#if STM32_UART_USE_UART4
+  uart_lld_serve_interrupt(&UARTD4);
+#endif
+#endif
+
+  OSAL_IRQ_EPILOGUE();
+}
+#endif
+
+/*===========================================================================*/
+/* Driver exported functions.                                                */
+/*===========================================================================*/
+
+/** @} */
diff --git a/os/hal/ports/STM32/LLD/USARTv2/stm32_uart5.inc b/os/hal/ports/STM32/LLD/USARTv2/stm32_uart5.inc
new file mode 100644
index 000000000..dbbb14a51
--- /dev/null
+++ b/os/hal/ports/STM32/LLD/USARTv2/stm32_uart5.inc
@@ -0,0 +1,110 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    USARTv2/stm32_uart5.inc
+ * @brief   Shared UART5 handler.
+ *
+ * @addtogroup STM32_UART5_HANDLER
+ * @{
+ */
+
+/*===========================================================================*/
+/* Driver local definitions.                                                 */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Derived constants and error checks.                                       */
+/*===========================================================================*/
+
+/* Registry checks for robustness.*/
+#if !defined(STM32_HAS_UART5)
+#error "STM32_HAS_UART5 not defined in registry"
+#endif
+
+#if STM32_HAS_UART5 == FALSE
+#error "UART5 not present"
+#endif
+
+/* Priority settings checks.*/
+#if !defined(STM32_IRQ_UART5_PRIORITY)
+#error "STM32_IRQ_UART5_PRIORITY not defined in mcuconf.h"
+#endif
+
+#if !OSAL_IRQ_IS_VALID_PRIORITY(STM32_IRQ_UART5_PRIORITY)
+#error "Invalid IRQ priority assigned to STM32_IRQ_UART5_PRIORITY"
+#endif
+
+/*===========================================================================*/
+/* Driver exported variables.                                                */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Driver local variables.                                                   */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Driver local functions.                                                   */
+/*===========================================================================*/
+
+static inline void uart5_irq_init(void) {
+#if defined(STM32_UART5_IS_USED)
+  nvicEnableVector(STM32_UART5_NUMBER, STM32_IRQ_UART5_PRIORITY);
+#endif
+}
+
+static inline void uart5_irq_deinit(void) {
+#if defined(STM32_UART5_IS_USED)
+  nvicDisableVector(STM32_UART5_NUMBER);
+#endif
+}
+
+/*===========================================================================*/
+/* Driver interrupt handlers.                                                */
+/*===========================================================================*/
+
+#if (HAL_USE_SERIAL && STM32_SERIAL_USE_UART5) ||                           \
+    (HAL_USE_UART && STM32_UART_USE_UART5) ||                               \
+    defined(__DOXYGEN__)
+/**
+ * @brief   UART5 interrupt handler.
+ *
+ * @isr
+ */
+OSAL_IRQ_HANDLER(STM32_UART5_HANDLER) {
+
+  OSAL_IRQ_PROLOGUE();
+
+#if HAL_USE_SERIAL
+#if STM32_SERIAL_USE_UART5
+  sd_lld_serve_interrupt(&SD5);
+#endif
+#endif
+#if HAL_USE_UART
+#if STM32_UART_USE_UART5
+  uart_lld_serve_interrupt(&UARTD5);
+#endif
+#endif
+
+  OSAL_IRQ_EPILOGUE();
+}
+#endif
+
+/*===========================================================================*/
+/* Driver exported functions.                                                */
+/*===========================================================================*/
+
+/** @} */
diff --git a/os/hal/ports/STM32/LLD/USARTv2/stm32_usart1.inc b/os/hal/ports/STM32/LLD/USARTv2/stm32_usart1.inc
new file mode 100644
index 000000000..7bed6ce41
--- /dev/null
+++ b/os/hal/ports/STM32/LLD/USARTv2/stm32_usart1.inc
@@ -0,0 +1,110 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    USARTv2/stm32_usart1.inc
+ * @brief   Shared USART1 handler.
+ *
+ * @addtogroup STM32_USART1_HANDLER
+ * @{
+ */
+
+/*===========================================================================*/
+/* Driver local definitions.                                                 */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Derived constants and error checks.                                       */
+/*===========================================================================*/
+
+/* Registry checks for robustness.*/
+#if !defined(STM32_HAS_USART1)
+#error "STM32_HAS_USART1 not defined in registry"
+#endif
+
+#if STM32_HAS_USART1 == FALSE
+#error "USART1 not present"
+#endif
+
+/* Priority settings checks.*/
+#if !defined(STM32_IRQ_USART1_PRIORITY)
+#error "STM32_IRQ_USART1_PRIORITY not defined in mcuconf.h"
+#endif
+
+#if !OSAL_IRQ_IS_VALID_PRIORITY(STM32_IRQ_USART1_PRIORITY)
+#error "Invalid IRQ priority assigned to STM32_IRQ_USART1_PRIORITY"
+#endif
+
+/*===========================================================================*/
+/* Driver exported variables.                                                */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Driver local variables.                                                   */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Driver local functions.                                                   */
+/*===========================================================================*/
+
+static inline void usart1_irq_init(void) {
+#if defined(STM32_USART1_IS_USED)
+  nvicEnableVector(STM32_USART1_NUMBER, STM32_IRQ_USART1_PRIORITY);
+#endif
+}
+
+static inline void usart1_irq_deinit(void) {
+#if defined(STM32_USART1_IS_USED)
+  nvicDisableVector(STM32_USART1_NUMBER);
+#endif
+}
+
+/*===========================================================================*/
+/* Driver interrupt handlers.                                                */
+/*===========================================================================*/
+
+#if (HAL_USE_SERIAL && STM32_SERIAL_USE_USART1) ||                          \
+    (HAL_USE_UART && STM32_UART_USE_USART1) ||                              \
+    defined(__DOXYGEN__)
+/**
+ * @brief   USART1 interrupt handler.
+ *
+ * @isr
+ */
+OSAL_IRQ_HANDLER(STM32_USART1_HANDLER) {
+
+  OSAL_IRQ_PROLOGUE();
+
+#if HAL_USE_SERIAL
+#if STM32_SERIAL_USE_USART1
+  sd_lld_serve_interrupt(&SD1);
+#endif
+#endif
+#if HAL_USE_UART
+#if STM32_UART_USE_USART1
+  uart_lld_serve_interrupt(&UARTD1);
+#endif
+#endif
+
+  OSAL_IRQ_EPILOGUE();
+}
+#endif
+
+/*===========================================================================*/
+/* Driver exported functions.                                                */
+/*===========================================================================*/
+
+/** @} */
diff --git a/os/hal/ports/STM32/LLD/USARTv2/stm32_usart2.inc b/os/hal/ports/STM32/LLD/USARTv2/stm32_usart2.inc
new file mode 100644
index 000000000..02982791e
--- /dev/null
+++ b/os/hal/ports/STM32/LLD/USARTv2/stm32_usart2.inc
@@ -0,0 +1,110 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    USARTv2/stm32_usart2.inc
+ * @brief   Shared USART2 handler.
+ *
+ * @addtogroup STM32_USART2_HANDLER
+ * @{
+ */
+
+/*===========================================================================*/
+/* Driver local definitions.                                                 */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Derived constants and error checks.                                       */
+/*===========================================================================*/
+
+/* Registry checks for robustness.*/
+#if !defined(STM32_HAS_USART2)
+#error "STM32_HAS_USART2 not defined in registry"
+#endif
+
+#if STM32_HAS_USART2 == FALSE
+#error "USART2 not present"
+#endif
+
+/* Priority settings checks.*/
+#if !defined(STM32_IRQ_USART2_PRIORITY)
+#error "STM32_IRQ_USART2_PRIORITY not defined in mcuconf.h"
+#endif
+
+#if !OSAL_IRQ_IS_VALID_PRIORITY(STM32_IRQ_USART2_PRIORITY)
+#error "Invalid IRQ priority assigned to STM32_IRQ_USART2_PRIORITY"
+#endif
+
+/*===========================================================================*/
+/* Driver exported variables.                                                */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Driver local variables.                                                   */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Driver local functions.                                                   */
+/*===========================================================================*/
+
+static inline void usart2_irq_init(void) {
+#if defined(STM32_USART2_IS_USED)
+  nvicEnableVector(STM32_USART2_NUMBER, STM32_IRQ_USART2_PRIORITY);
+#endif
+}
+
+static inline void usart2_irq_deinit(void) {
+#if defined(STM32_USART2_IS_USED)
+  nvicDisableVector(STM32_USART2_NUMBER);
+#endif
+}
+
+/*===========================================================================*/
+/* Driver interrupt handlers.                                                */
+/*===========================================================================*/
+
+#if (HAL_USE_SERIAL && STM32_SERIAL_USE_USART2) ||                          \
+    (HAL_USE_UART && STM32_UART_USE_USART2) ||                              \
+    defined(__DOXYGEN__)
+/**
+ * @brief   USART2 interrupt handler.
+ *
+ * @isr
+ */
+OSAL_IRQ_HANDLER(STM32_USART2_HANDLER) {
+
+  OSAL_IRQ_PROLOGUE();
+
+#if HAL_USE_SERIAL
+#if STM32_SERIAL_USE_USART2
+  sd_lld_serve_interrupt(&SD2);
+#endif
+#endif
+#if HAL_USE_UART
+#if STM32_UART_USE_USART2
+  uart_lld_serve_interrupt(&UARTD2);
+#endif
+#endif
+
+  OSAL_IRQ_EPILOGUE();
+}
+#endif
+
+/*===========================================================================*/
+/* Driver exported functions.                                                */
+/*===========================================================================*/
+
+/** @} */
diff --git a/os/hal/ports/STM32/LLD/USARTv2/stm32_usart3.inc b/os/hal/ports/STM32/LLD/USARTv2/stm32_usart3.inc
new file mode 100644
index 000000000..1ab7607ff
--- /dev/null
+++ b/os/hal/ports/STM32/LLD/USARTv2/stm32_usart3.inc
@@ -0,0 +1,110 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    USARTv2/stm32_usart3.inc
+ * @brief   Shared USART3 handler.
+ *
+ * @addtogroup STM32_USART3_HANDLER
+ * @{
+ */
+
+/*===========================================================================*/
+/* Driver local definitions.                                                 */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Derived constants and error checks.                                       */
+/*===========================================================================*/
+
+/* Registry checks for robustness.*/
+#if !defined(STM32_HAS_USART3)
+#error "STM32_HAS_USART3 not defined in registry"
+#endif
+
+#if STM32_HAS_USART3 == FALSE
+#error "USART3 not present"
+#endif
+
+/* Priority settings checks.*/
+#if !defined(STM32_IRQ_USART3_PRIORITY)
+#error "STM32_IRQ_USART3_PRIORITY not defined in mcuconf.h"
+#endif
+
+#if !OSAL_IRQ_IS_VALID_PRIORITY(STM32_IRQ_USART3_PRIORITY)
+#error "Invalid IRQ priority assigned to STM32_IRQ_USART3_PRIORITY"
+#endif
+
+/*===========================================================================*/
+/* Driver exported variables.                                                */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Driver local variables.                                                   */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Driver local functions.                                                   */
+/*===========================================================================*/
+
+static inline void usart3_irq_init(void) {
+#if defined(STM32_USART3_IS_USED)
+  nvicEnableVector(STM32_USART3_NUMBER, STM32_IRQ_USART3_PRIORITY);
+#endif
+}
+
+static inline void usart3_irq_deinit(void) {
+#if defined(STM32_USART3_IS_USED)
+  nvicDisableVector(STM32_USART3_NUMBER);
+#endif
+}
+
+/*===========================================================================*/
+/* Driver interrupt handlers.                                                */
+/*===========================================================================*/
+
+#if (HAL_USE_SERIAL && STM32_SERIAL_USE_USART3) ||                          \
+    (HAL_USE_UART && STM32_UART_USE_USART3) ||                              \
+    defined(__DOXYGEN__)
+/**
+ * @brief   USART3 interrupt handler.
+ *
+ * @isr
+ */
+OSAL_IRQ_HANDLER(STM32_USART3_HANDLER) {
+
+  OSAL_IRQ_PROLOGUE();
+
+#if HAL_USE_SERIAL
+#if STM32_SERIAL_USE_USART3
+  sd_lld_serve_interrupt(&SD3);
+#endif
+#endif
+#if HAL_USE_UART
+#if STM32_UART_USE_USART3
+  uart_lld_serve_interrupt(&UARTD3);
+#endif
+#endif
+
+  OSAL_IRQ_EPILOGUE();
+}
+#endif
+
+/*===========================================================================*/
+/* Driver exported functions.                                                */
+/*===========================================================================*/
+
+/** @} */
diff --git a/os/hal/ports/STM32/STM32G4xx/stm32_dmamux.h b/os/hal/ports/STM32/STM32G4xx/stm32_dmamux.h
new file mode 100644
index 000000000..f4aec572a
--- /dev/null
+++ b/os/hal/ports/STM32/STM32G4xx/stm32_dmamux.h
@@ -0,0 +1,183 @@
+/*
+    ChibiOS - Copyright (C) 2006..2019 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    STM32G4xx/stm32_dmamux.h
+ * @brief   STM32G4xx DMAMUX handler header.
+ *
+ * @addtogroup STM32G4xx_DMAMUX
+ * @{
+ */
+
+#ifndef STM32_DMAMUX_H
+#define STM32_DMAMUX_H
+
+/*===========================================================================*/
+/* Driver constants.                                                         */
+/*===========================================================================*/
+
+/**
+ * @name    DMAMUX1 request sources
+ * @{
+ */
+#define STM32_DMAMUX1_REQ_GEN0      1
+#define STM32_DMAMUX1_REQ_GEN1      2
+#define STM32_DMAMUX1_REQ_GEN2      3
+#define STM32_DMAMUX1_REQ_GEN3      4
+#define STM32_DMAMUX1_ADC1          5
+#define STM32_DMAMUX1_DAC1_CH1      6
+#define STM32_DMAMUX1_DAC1_CH2      7
+#define STM32_DMAMUX1_TIM6_UP       8
+#define STM32_DMAMUX1_TIM7_UP       9
+#define STM32_DMAMUX1_SPI1_RX       10
+#define STM32_DMAMUX1_SPI1_TX       11
+#define STM32_DMAMUX1_SPI2_RX       12
+#define STM32_DMAMUX1_SPI2_TX       13
+#define STM32_DMAMUX1_SPI3_RX       14
+#define STM32_DMAMUX1_SPI3_TX       15
+#define STM32_DMAMUX1_I2C1_RX       16
+#define STM32_DMAMUX1_I2C1_TX       17
+#define STM32_DMAMUX1_I2C2_RX       18
+#define STM32_DMAMUX1_I2C2_TX       19
+#define STM32_DMAMUX1_I2C3_RX       20
+#define STM32_DMAMUX1_I2C3_TX       21
+#define STM32_DMAMUX1_I2C4_RX       22
+#define STM32_DMAMUX1_I2C4_TX       23
+#define STM32_DMAMUX1_USART1_RX     24
+#define STM32_DMAMUX1_USART1_TX     25
+#define STM32_DMAMUX1_USART2_RX     26
+#define STM32_DMAMUX1_USART2_TX     27
+#define STM32_DMAMUX1_USART3_RX     28
+#define STM32_DMAMUX1_USART3_TX     29
+#define STM32_DMAMUX1_UART4_RX      30
+#define STM32_DMAMUX1_UART4_TX      31
+#define STM32_DMAMUX1_UART5_RX      32
+#define STM32_DMAMUX1_UART5_TX      33
+#define STM32_DMAMUX1_LPUART1_RX    34
+#define STM32_DMAMUX1_LPUART1_TX    35
+#define STM32_DMAMUX1_ADC2          36
+#define STM32_DMAMUX1_ADC3          37
+#define STM32_DMAMUX1_ADC4          38
+#define STM32_DMAMUX1_ADC5          39
+#define STM32_DMAMUX1_QUADSPI       40
+#define STM32_DMAMUX1_DAC2_CH1      41
+#define STM32_DMAMUX1_TIM1_CH1      42
+#define STM32_DMAMUX1_TIM1_CH2      43
+#define STM32_DMAMUX1_TIM1_CH3      44
+#define STM32_DMAMUX1_TIM1_CH4      45
+#define STM32_DMAMUX1_TIM1_UP       46
+#define STM32_DMAMUX1_TIM1_TRIG     47
+#define STM32_DMAMUX1_TIM1_COM      48
+#define STM32_DMAMUX1_TIM8_CH1      49
+#define STM32_DMAMUX1_TIM8_CH2      50
+#define STM32_DMAMUX1_TIM8_CH3      51
+#define STM32_DMAMUX1_TIM8_CH4      52
+#define STM32_DMAMUX1_TIM8_UP       53
+#define STM32_DMAMUX1_TIM8_TRIG     54
+#define STM32_DMAMUX1_TIM8_COM      55
+#define STM32_DMAMUX1_TIM2_CH1      56
+#define STM32_DMAMUX1_TIM2_CH2      57
+#define STM32_DMAMUX1_TIM2_CH3      58
+#define STM32_DMAMUX1_TIM2_CH4      59
+#define STM32_DMAMUX1_TIM2_UP       60
+#define STM32_DMAMUX1_TIM3_CH1      61
+#define STM32_DMAMUX1_TIM3_CH2      62
+#define STM32_DMAMUX1_TIM3_CH3      63
+#define STM32_DMAMUX1_TIM3_CH4      64
+#define STM32_DMAMUX1_TIM3_UP       65
+#define STM32_DMAMUX1_TIM3_TRIG     66
+#define STM32_DMAMUX1_TIM4_CH1      67
+#define STM32_DMAMUX1_TIM4_CH2      68
+#define STM32_DMAMUX1_TIM4_CH3      69
+#define STM32_DMAMUX1_TIM4_CH4      70
+#define STM32_DMAMUX1_TIM4_UP       71
+#define STM32_DMAMUX1_TIM5_CH1      72
+#define STM32_DMAMUX1_TIM5_CH2      73
+#define STM32_DMAMUX1_TIM5_CH3      74
+#define STM32_DMAMUX1_TIM5_CH4      75
+#define STM32_DMAMUX1_TIM5_UP       76
+#define STM32_DMAMUX1_TIM5_TRIG     77
+#define STM32_DMAMUX1_TIM15_CH1     78
+#define STM32_DMAMUX1_TIM15_UP      79
+#define STM32_DMAMUX1_TIM15_TRIG    80
+#define STM32_DMAMUX1_TIM15_COM     81
+#define STM32_DMAMUX1_TIM16_CH1     82
+#define STM32_DMAMUX1_TIM16_UP      83
+#define STM32_DMAMUX1_TIM17_CH1     84
+#define STM32_DMAMUX1_TIM17_UP      85
+#define STM32_DMAMUX1_TIM20_CH1     86
+#define STM32_DMAMUX1_TIM20_CH2     87
+#define STM32_DMAMUX1_TIM20_CH3     88
+#define STM32_DMAMUX1_TIM20_CH4     89
+#define STM32_DMAMUX1_TIM20_UP      90
+#define STM32_DMAMUX1_AES_IN        91
+#define STM32_DMAMUX1_AES_OUT       92
+#define STM32_DMAMUX1_TIM20_TRIG    93
+#define STM32_DMAMUX1_TIM20_COM     94
+#define STM32_DMAMUX1_HRTIM_MASTER  95
+#define STM32_DMAMUX1_HRTIM_TIMA    96
+#define STM32_DMAMUX1_HRTIM_TIMB    97
+#define STM32_DMAMUX1_HRTIM_TIMC    98
+#define STM32_DMAMUX1_HRTIM_TIMD    99
+#define STM32_DMAMUX1_HRTIM_TIME    100
+#define STM32_DMAMUX1_HRTIM_TIMF    101
+#define STM32_DMAMUX1_DAC3_CH1      102
+#define STM32_DMAMUX1_DAC3_CH2      103
+#define STM32_DMAMUX1_DAC4_CH1      104
+#define STM32_DMAMUX1_DAC4_CH2      105
+#define STM32_DMAMUX1_SPI4_RX       106
+#define STM32_DMAMUX1_SPI4_TX       107
+#define STM32_DMAMUX1_SAI1_A        108
+#define STM32_DMAMUX1_SAI1_B        109
+#define STM32_DMAMUX1_FMAC_READ     110
+#define STM32_DMAMUX1_FMAC_WRITE    111
+#define STM32_DMAMUX1_CORDIC_READ   112
+#define STM32_DMAMUX1_CORDIC_WRITE  113
+#define STM32_DMAMUX1_UCPD1_RX      114
+#define STM32_DMAMUX1_UCPD1_TX      115
+/** @} */
+
+/*===========================================================================*/
+/* Driver pre-compile time settings.                                         */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Derived constants and error checks.                                       */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Driver data structures and types.                                         */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Driver macros.                                                            */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* External declarations.                                                    */
+/*===========================================================================*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32_DMAMUX_H */
+
+/** @} */
diff --git a/os/hal/ports/STM32/STM32G4xx/stm32_isr.c b/os/hal/ports/STM32/STM32G4xx/stm32_isr.c
index 17e81c497..a503bcbf5 100644
--- a/os/hal/ports/STM32/STM32G4xx/stm32_isr.c
+++ b/os/hal/ports/STM32/STM32G4xx/stm32_isr.c
@@ -24,14 +24,21 @@
 
 #include "hal.h"
 
+#include "stm32_usart1.inc"
+#include "stm32_usart2.inc"
+#include "stm32_usart3.inc"
+#include "stm32_uart4.inc"
+#include "stm32_uart5.inc"
+#include "stm32_lpuart1.inc"
+
 #include "stm32_tim1_tim15_tim16_tim17.inc"
 #include "stm32_tim2.inc"
-#include "stm32_tim2.inc"
 #include "stm32_tim3.inc"
 #include "stm32_tim4.inc"
 #include "stm32_tim5.inc"
 #include "stm32_tim6.inc"
 #include "stm32_tim7.inc"
+#include "stm32_tim8.inc"
 #include "stm32_tim20.inc"
 
 /*===========================================================================*/
@@ -74,17 +81,22 @@ void irqInit(void) {
   nvicEnableVector(STM32_EXTI_LINE5_9_NUMBER,    STM32_IRQ_EXTI5_9_PRIORITY);
   nvicEnableVector(STM32_EXTI_LINE10_15_NUMBER,  STM32_IRQ_EXTI10_15_PRIORITY);
 #endif
-#if HAL_USE_GPT || HAL_USE_ICU || HAL_USE_PWM || defined(__DOXYGEN__)
-  STM32_TIM1_TIM15_TIM16_TIM17_INIT();
-  STM32_TIM2_INIT();
-  STM32_TIM3_INIT();
-  STM32_TIM4_INIT();
-  STM32_TIM5_INIT();
-  STM32_TIM6_INIT();
-  STM32_TIM7_INIT();
-  STM32_TIM8_INIT();
-  STM32_TIM20_INIT();
-#endif
+  usart1_irq_init();
+  usart2_irq_init();
+  usart3_irq_init();
+  uart4_irq_init();
+  uart5_irq_init();
+  lpuart1_irq_init();
+
+  tim1_tim15_init();
+  tim2_init();
+  tim3_init();
+  tim4_init();
+  tim5_init();
+  tim6_init();
+  tim7_init();
+  tim8_init();
+  tim20_init();
 }
 
 /**
@@ -103,17 +115,22 @@ void irqDeinit(void) {
   nvicDisableVector(STM32_EXTI_LINE5_9_NUMBER);
   nvicDisableVector(STM32_EXTI_LINE10_15_NUMBER);
 #endif
-#if HAL_USE_GPT || HAL_USE_ICU || HAL_USE_PWM || defined(__DOXYGEN__)
-  STM32_TIM1_TIM15_TIM16_TIM17_DEINIT();
-  STM32_TIM2_DEINIT();
-  STM32_TIM3_DEINIT();
-  STM32_TIM4_DEINIT();
-  STM32_TIM5_DEINIT();
-  STM32_TIM6_DEINIT();
-  STM32_TIM7_DEINIT();
-  STM32_TIM8_DEINIT();
-  STM32_TIM20_DEINIT();
-#endif
+  usart1_irq_deinit();
+  usart2_irq_deinit();
+  usart3_irq_deinit();
+  uart4_irq_deinit();
+  uart5_irq_deinit();
+  lpuart1_irq_deinit();
+
+  tim1_tim15_deinit();
+  tim2_deinit();
+  tim3_deinit();
+  tim4_deinit();
+  tim5_deinit();
+  tim6_deinit();
+  tim7_deinit();
+  tim8_deinit();
+  tim20_deinit();
 }
 
 /** @} */