diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/defaults.parm
index 8fe5a0f703..abaa8f8a19 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/defaults.parm
+++ b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/defaults.parm
@@ -4,3 +4,10 @@ NTF_LED_TYPES 455
 NTF_LED_BRIGHT 2
 NTF_LED_LEN 8
 
+# setup for PORT
+#| PORT0  | PORT1  | PORT2  |  GPS  |  MSP  |
+#| USART1 | USART2 | USART3 | UART4 | UART5 |
+GPS_PORT 3
+MSP_PORT 4
+RNGFND_PORT -1
+ADSB_PORT -1
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat
index 59002813fd..aa3aa76963 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat
@@ -117,18 +117,18 @@ define CAN_APP_NODE_NAME "org.ardupilot.f405_MatekGPS"
 
 
 # ---------------------- UARTs ---------------------------
-#           | sr0  | sr1 | MSP | GPS | sr4  | sr5 |
-SERIAL_ORDER USART1 EMPTY UART5 UART4 USART2 USART3
+#           | sr0  | sr1  | sr2  | GPS | MSP |
+SERIAL_ORDER USART1 USART2 USART3 UART4 UART5
 
 # USART1, for debug
 PA9  USART1_TX USART1 SPEED_HIGH NODMA
 PA10 USART1_RX USART1 SPEED_HIGH NODMA
 
-# USART2 for ADSB
+# USART2
 PA2 USART2_TX USART2 SPEED_HIGH NODMA
 PA3 USART2_RX USART2 SPEED_HIGH NODMA
 
-# USART3 for rangefinder
+# USART3
 PC10  USART3_TX USART3 SPEED_HIGH NODMA
 PC11  USART3_RX USART3 SPEED_HIGH NODMA
 
@@ -137,8 +137,8 @@ PA0 UART4_TX UART4 SPEED_HIGH NODMA
 PA1 UART4_RX UART4 SPEED_HIGH NODMA
 
 # USART5, for MSP
-PC12 UART5_TX UART5 SPEED_HIGH NODMA
-PD2  UART5_RX UART5 SPEED_HIGH NODMA
+PC12 UART5_TX UART5 SPEED_HIGH
+PD2  UART5_RX UART5 SPEED_HIGH
 
 
 # --------------------- PWM -----------------------
@@ -197,11 +197,7 @@ define HAL_MSP_ENABLED 1
 
 # ----------------- rangefinder,ADSB ----------------------
 define HAL_PERIPH_ENABLE_RANGEFINDER
-define RANGEFINDER_MAX_INSTANCES 1
-
 define HAL_PERIPH_ENABLE_ADSB
-define ADSB_PORT hal.uartC
-
 
 # ------------------ BATTERY Monitor -----------------------
 define HAL_PERIPH_ENABLE_BATTERY