diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Durandal/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Durandal/hwdef.dat
index 9ed8a6c3f8..c8b148a233 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/Durandal/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/Durandal/hwdef.dat
@@ -315,7 +315,8 @@ define HAL_WITH_RAMTRON 1
 # allow to have have a dedicated safety switch pin
 define HAL_HAVE_SAFETY_SWITCH 1
 
-define HAL_BARO_DEFAULT HAL_BARO_MS5611_SPI
+# one baro
+BARO MS56XX SPI:ms5611
 
 define HAL_COMPASS_DEFAULT HAL_COMPASS_NONE
 define HAL_COMPASS_AUTO_ROT_DEFAULT 2
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat
index 26752c9ea5..1c193b5f11 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat
@@ -135,7 +135,8 @@ define HAL_PROBE_EXTERNAL_I2C_COMPASSES
 define HAL_I2C_INTERNAL_MASK 0
 define HAL_COMPASS_AUTO_ROT_DEFAULT 2
 
-define HAL_BARO_DEFAULT HAL_BARO_BMP280_SPI
+# one baro
+BARO BMP280 SPI:bmp280
 
 define OSD_ENABLED ENABLED
 define HAL_OSD_TYPE_DEFAULT 1
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef.dat
index a2e5341d84..80a98cecb9 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef.dat
@@ -312,7 +312,8 @@ define HAL_WITH_RAMTRON 1
 # allow to have have a dedicated safety switch pin
 define HAL_HAVE_SAFETY_SWITCH 1
 
-define HAL_BARO_DEFAULT HAL_BARO_MS5611_SPI
+# one baro
+BARO MS56XX SPI:ms5611
 
 define HAL_COMPASS_DEFAULT HAL_COMPASS_NONE
 define HAL_COMPASS_AUTO_ROT_DEFAULT 2
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef.dat
index aca4b667e7..fa0728f8bc 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef.dat
@@ -117,7 +117,8 @@ SPIDEV mpu6000 SPI1 DEVID1 MPU6500_CS MODE3 1*MHZ 8*MHZ
 SPIDEV lps22h  SPI2 DEVID3 LPS22HB_CS MODE3 1*MHZ 10*MHZ
 SPIDEV ramtron SPI2 DEVID4 FRAM_CS    MODE3 8*MHZ 8*MHZ
 
-define HAL_BARO_DEFAULT HAL_BARO_LPS22H_SPI
+# one baro
+BARO LPS2XH SPI:lps22h
 
 # one IMU
 IMU Invensense SPI:mpu6000 ROTATION_PITCH_180