diff --git a/demos/STM32/RT-STM32G031K8-NUCLEO32/cfg/mcuconf.h b/demos/STM32/RT-STM32G031K8-NUCLEO32/cfg/mcuconf.h
index f8d7bcbc7..f03f04a2f 100644
--- a/demos/STM32/RT-STM32G031K8-NUCLEO32/cfg/mcuconf.h
+++ b/demos/STM32/RT-STM32G031K8-NUCLEO32/cfg/mcuconf.h
@@ -195,10 +195,10 @@
  * SERIAL driver system settings.
  */
 #define STM32_SERIAL_USE_USART1             FALSE
-#define STM32_SERIAL_USE_USART2             TRUE
+#define STM32_SERIAL_USE_USART2             FALSE
 #define STM32_SERIAL_USE_USART3             FALSE
 #define STM32_SERIAL_USE_UART4              FALSE
-#define STM32_SERIAL_USE_LPUART1            FALSE
+#define STM32_SERIAL_USE_LPUART1            TRUE
 
 /*
  * SIO driver system settings.
diff --git a/demos/STM32/RT-STM32G031K8-NUCLEO32/main.c b/demos/STM32/RT-STM32G031K8-NUCLEO32/main.c
index 4607d3b86..47d7bc155 100644
--- a/demos/STM32/RT-STM32G031K8-NUCLEO32/main.c
+++ b/demos/STM32/RT-STM32G031K8-NUCLEO32/main.c
@@ -26,7 +26,7 @@ static const ShellCommand commands[] = {
 };
 
 static const ShellConfig shell_cfg1 = {
-  (BaseSequentialStream *)&SD2,
+  (BaseSequentialStream *)&LPSD1,
   commands
 };
 
@@ -75,7 +75,7 @@ int main(void) {
   /*
    * Activates the serial driver 2 using the driver default configuration.
    */
-  sdStart(&SD2, NULL);
+  sdStart(&LPSD1, NULL);
 
   /*
    * Shell manager initialization.
diff --git a/os/hal/boards/ST_NUCLEO32_G031K8/board.h b/os/hal/boards/ST_NUCLEO32_G031K8/board.h
index cf7bc68d0..125578de6 100644
--- a/os/hal/boards/ST_NUCLEO32_G031K8/board.h
+++ b/os/hal/boards/ST_NUCLEO32_G031K8/board.h
@@ -78,8 +78,7 @@
 #define GPIOB_PIN0                  0U
 #define GPIOB_PIN1                  1U
 #define GPIOB_PIN2                  2U
-#define GPIOB_LED_GREEN             3U
-#define GPIOB_LED                   3U
+#define GPIOB_PIN3                  3U
 #define GPIOB_PIN4                  4U
 #define GPIOB_PIN5                  5U
 #define GPIOB_PIN6                  6U
@@ -99,7 +98,8 @@
 #define GPIOC_PIN3                  3U
 #define GPIOC_PIN4                  4U
 #define GPIOC_PIN5                  5U
-#define GPIOC_PIN6                  6U
+#define GPIOC_LED_GREEN             6U
+#define GPIOC_LED                   6U
 #define GPIOC_PIN7                  7U
 #define GPIOC_PIN8                  8U
 #define GPIOC_PIN9                  9U
@@ -168,8 +168,8 @@
 #define LINE_STLK_TX                PAL_LINE(GPIOA, 3U)
 #define LINE_SWDIO                  PAL_LINE(GPIOA, 13U)
 #define LINE_SWCLK                  PAL_LINE(GPIOA, 14U)
-#define LINE_LED_GREEN              PAL_LINE(GPIOB, 3U)
-#define LINE_LED                    PAL_LINE(GPIOB, 3U)
+#define LINE_LED_GREEN              PAL_LINE(GPIOC, 6U)
+#define LINE_LED                    PAL_LINE(GPIOC, 6U)
 #define LINE_OSC32_IN               PAL_LINE(GPIOC, 14U)
 #define LINE_OSC32_OUT              PAL_LINE(GPIOC, 15U)
 
@@ -216,8 +216,8 @@
  *
  * PA0  - PIN0                      (input pullup).
  * PA1  - PIN1                      (input pullup).
- * PA2  - STLK_RX                   (alternate 1).
- * PA3  - STLK_TX                   (alternate 1).
+ * PA2  - STLK_RX                   (alternate 6).
+ * PA3  - STLK_TX                   (alternate 6).
  * PA4  - PIN4                      (input pullup).
  * PA5  - PIN5                      (input pullup).
  * PA6  - PIN6                      (input pullup).
@@ -313,8 +313,8 @@
                                      PIN_ODR_HIGH(GPIOA_PIN15))
 #define VAL_GPIOA_AFRL              (PIN_AFIO_AF(GPIOA_PIN0, 0U) |          \
                                      PIN_AFIO_AF(GPIOA_PIN1, 0U) |          \
-                                     PIN_AFIO_AF(GPIOA_STLK_RX, 1U) |       \
-                                     PIN_AFIO_AF(GPIOA_STLK_TX, 1U) |       \
+                                     PIN_AFIO_AF(GPIOA_STLK_RX, 6U) |       \
+                                     PIN_AFIO_AF(GPIOA_STLK_TX, 6U) |       \
                                      PIN_AFIO_AF(GPIOA_PIN4, 0U) |          \
                                      PIN_AFIO_AF(GPIOA_PIN5, 0U) |          \
                                      PIN_AFIO_AF(GPIOA_PIN6, 0U) |          \
@@ -334,7 +334,7 @@
  * PB0  - PIN0                      (input pullup).
  * PB1  - PIN1                      (input pullup).
  * PB2  - PIN2                      (input pullup).
- * PB3  - LED_GREEN LED             (output pushpull maximum).
+ * PB3  - PIN3                      (input pullup).
  * PB4  - PIN4                      (input pullup).
  * PB5  - PIN5                      (input pullup).
  * PB6  - PIN6                      (input pullup).
@@ -351,7 +351,7 @@
 #define VAL_GPIOB_MODER             (PIN_MODE_INPUT(GPIOB_PIN0) |           \
                                      PIN_MODE_INPUT(GPIOB_PIN1) |           \
                                      PIN_MODE_INPUT(GPIOB_PIN2) |           \
-                                     PIN_MODE_OUTPUT(GPIOB_LED_GREEN) |     \
+                                     PIN_MODE_INPUT(GPIOB_PIN3) |           \
                                      PIN_MODE_INPUT(GPIOB_PIN4) |           \
                                      PIN_MODE_INPUT(GPIOB_PIN5) |           \
                                      PIN_MODE_INPUT(GPIOB_PIN6) |           \
@@ -367,7 +367,7 @@
 #define VAL_GPIOB_OTYPER            (PIN_OTYPE_PUSHPULL(GPIOB_PIN0) |       \
                                      PIN_OTYPE_PUSHPULL(GPIOB_PIN1) |       \
                                      PIN_OTYPE_PUSHPULL(GPIOB_PIN2) |       \
-                                     PIN_OTYPE_PUSHPULL(GPIOB_LED_GREEN) |  \
+                                     PIN_OTYPE_PUSHPULL(GPIOB_PIN3) |       \
                                      PIN_OTYPE_PUSHPULL(GPIOB_PIN4) |       \
                                      PIN_OTYPE_PUSHPULL(GPIOB_PIN5) |       \
                                      PIN_OTYPE_PUSHPULL(GPIOB_PIN6) |       \
@@ -383,7 +383,7 @@
 #define VAL_GPIOB_OSPEEDR           (PIN_OSPEED_HIGH(GPIOB_PIN0) |          \
                                      PIN_OSPEED_HIGH(GPIOB_PIN1) |          \
                                      PIN_OSPEED_HIGH(GPIOB_PIN2) |          \
-                                     PIN_OSPEED_HIGH(GPIOB_LED_GREEN) |     \
+                                     PIN_OSPEED_HIGH(GPIOB_PIN3) |          \
                                      PIN_OSPEED_HIGH(GPIOB_PIN4) |          \
                                      PIN_OSPEED_HIGH(GPIOB_PIN5) |          \
                                      PIN_OSPEED_HIGH(GPIOB_PIN6) |          \
@@ -399,7 +399,7 @@
 #define VAL_GPIOB_PUPDR             (PIN_PUPDR_PULLUP(GPIOB_PIN0) |         \
                                      PIN_PUPDR_PULLUP(GPIOB_PIN1) |         \
                                      PIN_PUPDR_PULLUP(GPIOB_PIN2) |         \
-                                     PIN_PUPDR_FLOATING(GPIOB_LED_GREEN) |  \
+                                     PIN_PUPDR_PULLUP(GPIOB_PIN3) |         \
                                      PIN_PUPDR_PULLUP(GPIOB_PIN4) |         \
                                      PIN_PUPDR_PULLUP(GPIOB_PIN5) |         \
                                      PIN_PUPDR_PULLUP(GPIOB_PIN6) |         \
@@ -415,7 +415,7 @@
 #define VAL_GPIOB_ODR               (PIN_ODR_HIGH(GPIOB_PIN0) |             \
                                      PIN_ODR_HIGH(GPIOB_PIN1) |             \
                                      PIN_ODR_HIGH(GPIOB_PIN2) |             \
-                                     PIN_ODR_LOW(GPIOB_LED_GREEN) |         \
+                                     PIN_ODR_HIGH(GPIOB_PIN3) |             \
                                      PIN_ODR_HIGH(GPIOB_PIN4) |             \
                                      PIN_ODR_HIGH(GPIOB_PIN5) |             \
                                      PIN_ODR_HIGH(GPIOB_PIN6) |             \
@@ -431,7 +431,7 @@
 #define VAL_GPIOB_AFRL              (PIN_AFIO_AF(GPIOB_PIN0, 0U) |          \
                                      PIN_AFIO_AF(GPIOB_PIN1, 0U) |          \
                                      PIN_AFIO_AF(GPIOB_PIN2, 0U) |          \
-                                     PIN_AFIO_AF(GPIOB_LED_GREEN, 0U) |     \
+                                     PIN_AFIO_AF(GPIOB_PIN3, 0U) |          \
                                      PIN_AFIO_AF(GPIOB_PIN4, 0U) |          \
                                      PIN_AFIO_AF(GPIOB_PIN5, 0U) |          \
                                      PIN_AFIO_AF(GPIOB_PIN6, 0U) |          \
@@ -454,7 +454,7 @@
  * PC3  - PIN3                      (input pullup).
  * PC4  - PIN4                      (input pullup).
  * PC5  - PIN5                      (input pullup).
- * PC6  - PIN6                      (input pullup).
+ * PC6  - LED_GREEN LED             (output pushpull maximum).
  * PC7  - PIN7                      (input pullup).
  * PC8  - PIN8                      (input pullup).
  * PC9  - PIN9                      (input pullup).
@@ -471,7 +471,7 @@
                                      PIN_MODE_INPUT(GPIOC_PIN3) |           \
                                      PIN_MODE_INPUT(GPIOC_PIN4) |           \
                                      PIN_MODE_INPUT(GPIOC_PIN5) |           \
-                                     PIN_MODE_INPUT(GPIOC_PIN6) |           \
+                                     PIN_MODE_OUTPUT(GPIOC_LED_GREEN) |     \
                                      PIN_MODE_INPUT(GPIOC_PIN7) |           \
                                      PIN_MODE_INPUT(GPIOC_PIN8) |           \
                                      PIN_MODE_INPUT(GPIOC_PIN9) |           \
@@ -487,7 +487,7 @@
                                      PIN_OTYPE_PUSHPULL(GPIOC_PIN3) |       \
                                      PIN_OTYPE_PUSHPULL(GPIOC_PIN4) |       \
                                      PIN_OTYPE_PUSHPULL(GPIOC_PIN5) |       \
-                                     PIN_OTYPE_PUSHPULL(GPIOC_PIN6) |       \
+                                     PIN_OTYPE_PUSHPULL(GPIOC_LED_GREEN) |  \
                                      PIN_OTYPE_PUSHPULL(GPIOC_PIN7) |       \
                                      PIN_OTYPE_PUSHPULL(GPIOC_PIN8) |       \
                                      PIN_OTYPE_PUSHPULL(GPIOC_PIN9) |       \
@@ -503,7 +503,7 @@
                                      PIN_OSPEED_HIGH(GPIOC_PIN3) |          \
                                      PIN_OSPEED_HIGH(GPIOC_PIN4) |          \
                                      PIN_OSPEED_HIGH(GPIOC_PIN5) |          \
-                                     PIN_OSPEED_HIGH(GPIOC_PIN6) |          \
+                                     PIN_OSPEED_HIGH(GPIOC_LED_GREEN) |     \
                                      PIN_OSPEED_HIGH(GPIOC_PIN7) |          \
                                      PIN_OSPEED_HIGH(GPIOC_PIN8) |          \
                                      PIN_OSPEED_HIGH(GPIOC_PIN9) |          \
@@ -519,7 +519,7 @@
                                      PIN_PUPDR_PULLUP(GPIOC_PIN3) |         \
                                      PIN_PUPDR_PULLUP(GPIOC_PIN4) |         \
                                      PIN_PUPDR_PULLUP(GPIOC_PIN5) |         \
-                                     PIN_PUPDR_PULLUP(GPIOC_PIN6) |         \
+                                     PIN_PUPDR_FLOATING(GPIOC_LED_GREEN) |  \
                                      PIN_PUPDR_PULLUP(GPIOC_PIN7) |         \
                                      PIN_PUPDR_PULLUP(GPIOC_PIN8) |         \
                                      PIN_PUPDR_PULLUP(GPIOC_PIN9) |         \
@@ -535,7 +535,7 @@
                                      PIN_ODR_HIGH(GPIOC_PIN3) |             \
                                      PIN_ODR_HIGH(GPIOC_PIN4) |             \
                                      PIN_ODR_HIGH(GPIOC_PIN5) |             \
-                                     PIN_ODR_HIGH(GPIOC_PIN6) |             \
+                                     PIN_ODR_LOW(GPIOC_LED_GREEN) |         \
                                      PIN_ODR_HIGH(GPIOC_PIN7) |             \
                                      PIN_ODR_HIGH(GPIOC_PIN8) |             \
                                      PIN_ODR_HIGH(GPIOC_PIN9) |             \
@@ -551,7 +551,7 @@
                                      PIN_AFIO_AF(GPIOC_PIN3, 0U) |          \
                                      PIN_AFIO_AF(GPIOC_PIN4, 0U) |          \
                                      PIN_AFIO_AF(GPIOC_PIN5, 0U) |          \
-                                     PIN_AFIO_AF(GPIOC_PIN6, 0U) |          \
+                                     PIN_AFIO_AF(GPIOC_LED_GREEN, 0U) |     \
                                      PIN_AFIO_AF(GPIOC_PIN7, 0U))
 #define VAL_GPIOC_AFRH              (PIN_AFIO_AF(GPIOC_PIN8, 0U) |          \
                                      PIN_AFIO_AF(GPIOC_PIN9, 0U) |          \
diff --git a/os/hal/boards/ST_NUCLEO32_G031K8/cfg/board.chcfg b/os/hal/boards/ST_NUCLEO32_G031K8/cfg/board.chcfg
index 7b11f29d2..e2362d256 100644
--- a/os/hal/boards/ST_NUCLEO32_G031K8/cfg/board.chcfg
+++ b/os/hal/boards/ST_NUCLEO32_G031K8/cfg/board.chcfg
@@ -39,7 +39,7 @@
         Speed="High"
         Resistor="Floating"
         Mode="Alternate"
-        Alternate="1" />
+        Alternate="6" />
       <pin3
         ID="STLK_TX"
         Type="PushPull"
@@ -47,7 +47,7 @@
         Speed="High"
         Resistor="Floating"
         Mode="Alternate"
-        Alternate="1"/>
+        Alternate="6"/>
       <pin4
         ID=""
         Type="PushPull"
@@ -171,12 +171,12 @@
         Mode="Input"
         Alternate="0" />
       <pin3
-        ID="LED_GREEN LED"
+        ID=""
         Type="PushPull"
-        Level="Low"
+        Level="High"
         Speed="Maximum"
-        Resistor="Floating"
-        Mode="Output"
+        Resistor="PullUp"
+        Mode="Input"
         Alternate="0" />
       <pin4
         ID=""
@@ -325,12 +325,12 @@
         Mode="Input"
         Alternate="0" />
       <pin6
-        ID=""
+        ID="LED_GREEN LED"
         Type="PushPull"
-        Level="High"
+        Level="Low"
         Speed="Maximum"
-        Resistor="PullUp"
-        Mode="Input"
+        Resistor="Floating"
+        Mode="Output"
         Alternate="0" />
       <pin7
         ID=""
diff --git a/os/hal/ports/STM32/LLD/USART/stm32_usart2_lp2.inc b/os/hal/ports/STM32/LLD/USART/stm32_usart2_lp2.inc
index aa3ee1ad6..b4078b122 100644
--- a/os/hal/ports/STM32/LLD/USART/stm32_usart2_lp2.inc
+++ b/os/hal/ports/STM32/LLD/USART/stm32_usart2_lp2.inc
@@ -18,7 +18,7 @@
  * @file    USART/stm32_usart2_lp2.inc
  * @brief   Shared USART2, LPUART2 handler.
  *
- * @addtogroup STM32_USART2_LP1_HANDLER
+ * @addtogroup STM32_USART2_LP2_HANDLER
  * @{
  */
 
diff --git a/os/hal/ports/STM32/STM32G0xx/stm32_isr.h b/os/hal/ports/STM32/STM32G0xx/stm32_isr.h
index bd1519c2c..6914f1724 100644
--- a/os/hal/ports/STM32/STM32G0xx/stm32_isr.h
+++ b/os/hal/ports/STM32/STM32G0xx/stm32_isr.h
@@ -37,7 +37,6 @@
 #define STM32_TIM2_SUPPRESS_ISR
 #define STM32_TIM3_SUPPRESS_ISR
 #define STM32_TIM4_SUPPRESS_ISR
-#define STM32_TIM5_SUPPRESS_ISR
 #define STM32_TIM6_SUPPRESS_ISR
 #define STM32_TIM7_SUPPRESS_ISR
 #define STM32_TIM14_SUPPRESS_ISR
@@ -71,18 +70,23 @@
 #define STM32_DMA1_CH1_HANDLER              Vector64
 #define STM32_DMA1_CH23_HANDLER             Vector68
 #define STM32_DMA1_CH4567_HANDLER           Vector6C
-#define STM32_DMA1_CH4567_DMA2_CH12345_HANDLER  Vector6C
+#define STM32_DMA1_CH4567_DMA2_CH12345_HANDLER Vector6C
 
 #define STM32_DMA1_CH1_NUMBER               9
 #define STM32_DMA1_CH23_NUMBER              10
 #define STM32_DMA1_CH2_NUMBER               STM32_DMA1_CH23_NUMBER
 #define STM32_DMA1_CH3_NUMBER               STM32_DMA1_CH23_NUMBER
 #define STM32_DMA1_CH4567_NUMBER            11
-#define STM32_DMA1_CH4567_DMA2_CH12345_NUMBER   11
+#define STM32_DMA1_CH4567_DMA2_CH12345_NUMBER 11
 #define STM32_DMA1_CH4_NUMBER               STM32_DMA1_CH4567_NUMBER
 #define STM32_DMA1_CH5_NUMBER               STM32_DMA1_CH4567_NUMBER
 #define STM32_DMA1_CH6_NUMBER               STM32_DMA1_CH4567_NUMBER
 #define STM32_DMA1_CH7_NUMBER               STM32_DMA1_CH4567_NUMBER
+#define STM32_DMA2_CH1_NUMBER               STM32_DMA1_CH4567_DMA2_CH12345_NUMBER
+#define STM32_DMA2_CH2_NUMBER               STM32_DMA1_CH4567_DMA2_CH12345_NUMBER
+#define STM32_DMA2_CH3_NUMBER               STM32_DMA1_CH4567_DMA2_CH12345_NUMBER
+#define STM32_DMA2_CH4_NUMBER               STM32_DMA1_CH4567_DMA2_CH12345_NUMBER
+#define STM32_DMA2_CH5_NUMBER               STM32_DMA1_CH4567_DMA2_CH12345_NUMBER
 
 #define STM32_DMA1_CH1_CMASK                0x00000001U
 #define STM32_DMA1_CH2_CMASK                0x00000006U
@@ -91,6 +95,11 @@
 #define STM32_DMA1_CH5_CMASK                0x00000078U
 #define STM32_DMA1_CH6_CMASK                0x00000078U
 #define STM32_DMA1_CH7_CMASK                0x00000078U
+#define STM32_DMA2_CH1_CMASK                0x0000001FU
+#define STM32_DMA2_CH2_CMASK                0x0000001FU
+#define STM32_DMA2_CH3_CMASK                0x0000001FU
+#define STM32_DMA2_CH4_CMASK                0x0000001FU
+#define STM32_DMA2_CH5_CMASK                0x0000001FU
 
 /*
  * EXTI unit.
@@ -125,6 +134,7 @@
 #define STM32_TIM1_CC_HANDLER               Vector78
 #define STM32_TIM2_HANDLER                  Vector7C
 #define STM32_TIM3_HANDLER                  Vector80
+#define STM32_TIM3_TIM4_HANDLER             Vector80
 #define STM32_TIM6_HANDLER                  Vector84
 #define STM32_TIM7_HANDLER                  Vector88
 #define STM32_TIM14_HANDLER                 Vector8C
@@ -136,6 +146,7 @@
 #define STM32_TIM1_CC_NUMBER                14
 #define STM32_TIM2_NUMBER                   15
 #define STM32_TIM3_NUMBER                   16
+#define STM32_TIM3_TIM4_NUMBER              16
 #define STM32_TIM6_NUMBER                   17
 #define STM32_TIM7_NUMBER                   18
 #define STM32_TIM14_NUMBER                  19