diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekG474-Periph/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekG474-Periph/hwdef.dat
index af2c5fba08..cc3c43d200 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/MatekG474-Periph/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekG474-Periph/hwdef.dat
@@ -54,7 +54,7 @@ define AP_PERIPH_RCIN_ENABLED 1
 
 
 # ----------- EFI
-define HAL_PERIPH_ENABLE_EFI
+define AP_PERIPH_EFI_ENABLED 1
 define HAL_EFI_ENABLED 1
 
 
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-EFI/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-EFI/hwdef.dat
index 6200911d7d..307c789dc9 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-EFI/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-EFI/hwdef.dat
@@ -5,7 +5,7 @@ define STM32_ADC_USE_ADC1 FALSE
 define HAL_DISABLE_ADC_DRIVER TRUE
 
 # support all serial EFI types
-define HAL_PERIPH_ENABLE_EFI
+define AP_PERIPH_EFI_ENABLED 1
 define HAL_EFI_ENABLED 1
 
 define AP_PERIPH_EFI_PORT_DEFAULT 2
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/scripts/defaults_periph.h b/libraries/AP_HAL_ChibiOS/hwdef/scripts/defaults_periph.h
index b0a7b02f5c..bd17189eed 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/scripts/defaults_periph.h
+++ b/libraries/AP_HAL_ChibiOS/hwdef/scripts/defaults_periph.h
@@ -181,6 +181,9 @@
 #ifdef HAL_PERIPH_ENABLE_RANGEFINDER
 #error "Change 'define HAL_PERIPH_ENABLE_RANGEFINDER' to 'define AP_PERIPH_RANGEFINDER_ENABLED 1'"
 #endif
+#ifdef HAL_PERIPH_ENABLE_EFI
+#error "Change 'define AP_PERIPH_EFI_ENABLED' to 'define AP_PERIPH_EFI_ENABLED 1'"
+#endif
 #ifdef HAL_PERIPH_ENABLE_IMU
 #error "Change 'define HAL_PERIPH_ENABLE_IMU' to 'define AP_PERIPH_IMU_ENABLED 1'"
 #endif
@@ -236,6 +239,9 @@
 #ifndef AP_PERIPH_IMU_ENABLED
 #define AP_PERIPH_IMU_ENABLED 0
 #endif
+#ifndef AP_PERIPH_EFI_ENABLED
+#define AP_PERIPH_EFI_ENABLED 0
+#endif
 #ifndef AP_PERIPH_RTC_ENABLED
 #define AP_PERIPH_RTC_ENABLED 0
 #endif
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/sw-spar-f407/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/sw-spar-f407/hwdef.dat
index fc2d9d46ac..c06096954a 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/sw-spar-f407/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/sw-spar-f407/hwdef.dat
@@ -78,7 +78,7 @@ PC9 I2C3_SDA I2C3
 
 # EFI
 define AP_PERIPH_EFI_PORT_DEFAULT 0
-define HAL_PERIPH_ENABLE_EFI 1
+define AP_PERIPH_EFI_ENABLED 1
 define HAL_EFI_ENABLED 1
 define HAL_PERIPH_EFI_BAUDRATE_DEFAULT 115200