diff --git a/hw/bsp/at32f45x/FreeRTOSConfig/FreeRTOSConfig.h b/hw/bsp/at32f45x/FreeRTOSConfig/FreeRTOSConfig.h
index 8a9906d39..7a4393ad7 100644
--- a/hw/bsp/at32f45x/FreeRTOSConfig/FreeRTOSConfig.h
+++ b/hw/bsp/at32f45x/FreeRTOSConfig/FreeRTOSConfig.h
@@ -49,7 +49,7 @@
 
 #endif
 
-/* Cortex M23/M33 port configuration. */
+/* Cortex-M4 port configuration. */
 #define configENABLE_MPU								        0
 #define configENABLE_FPU								        1
 #define configENABLE_TRUSTZONE					        0
diff --git a/hw/bsp/at32f45x/at32f45x_clock.c b/hw/bsp/at32f45x/at32f45x_clock.c
index a6724e23f..a66a8b1aa 100644
--- a/hw/bsp/at32f45x/at32f45x_clock.c
+++ b/hw/bsp/at32f45x/at32f45x_clock.c
@@ -53,7 +53,7 @@ void system_clock_config(void)
   /* set the flash clock divider */
   flash_psr_set(FLASH_WAIT_CYCLE_5);
 
-    /* enable pwc periph clock */
+  /* enable pwc periph clock */
   crm_periph_clock_enable(CRM_PWC_PERIPH_CLOCK, TRUE);
 
   /* config ldo voltage */
diff --git a/hw/bsp/at32f45x/at32f45x_int.c b/hw/bsp/at32f45x/at32f45x_int.c
index 15ff90c64..b3ba6ad9c 100644
--- a/hw/bsp/at32f45x/at32f45x_int.c
+++ b/hw/bsp/at32f45x/at32f45x_int.c
@@ -26,11 +26,11 @@
 /* includes ------------------------------------------------------------------*/
 #include "at32f45x_int.h"
 
-/** @addtogroup AT32F455_periph_examples
+/** @addtogroup AT32F45X_BSP
   * @{
   */
 
-/** @addtogroup 455_USB_device_keyboard
+/** @addtogroup AT32F45X_USB_Device_Keyboard
   * @{
   */
 
diff --git a/hw/bsp/at32f45x/family.c b/hw/bsp/at32f45x/family.c
index 32bae96af..79da6aec2 100644
--- a/hw/bsp/at32f45x/family.c
+++ b/hw/bsp/at32f45x/family.c
@@ -202,7 +202,7 @@ int board_uart_read(uint8_t *buf, int len) {
 int board_uart_write(void const *buf, int len) {
 #if CFG_TUSB_OS == OPT_OS_NONE
   int txsize = len;
-  u16 timeout = 0xffff;
+  uint16_t timeout = 0xffff;
   while (txsize--) {
     while (usart_flag_get(PRINT_UART, USART_TDBE_FLAG) == RESET) {
       timeout--;
@@ -252,7 +252,7 @@ void _init(void) {
 void assert_failed(const char *file, uint32_t line) {
   /* USER CODE BEGIN 6 */
   /* User can add his own implementation to report the file name and line number,
-     tex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+     e.g.: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
   /* USER CODE END 6 */
 }
 #endif /* USE_FULL_ASSERT */
diff --git a/tools/build.py b/tools/build.py
index 87064b7a0..d22d06a0b 100755
--- a/tools/build.py
+++ b/tools/build.py
@@ -40,7 +40,9 @@ ci_skip_boards = {
 }
 
 ci_preferred_boards = {
-    'stm32h7': ['stm32h743eval'],
+    'samd2x_l2x': ['metro_m0_express'],
+    'samd5x_e5x': ['metro_m4_express'],
+    'stm32h7': ['stm32h743eval']
 }