diff --git a/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py b/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py
index 674ea794b89071..935db8536f8bba 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py
+++ b/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py
@@ -2404,6 +2404,8 @@ def write_GPIO_config(self, f):
         gpioset = set()
         for label in self.bylabel:
             p = self.bylabel[label]
+            if 'SPI' in label and ('RX' in label or 'TX' in label):
+                continue
             gpio = p.extra_value('GPIO', type=int)
             if gpio is None:
                 continue