diff --git a/Tools/ardupilotwaf/boards.py b/Tools/ardupilotwaf/boards.py
index 49f16f126c991..079acae84a552 100644
--- a/Tools/ardupilotwaf/boards.py
+++ b/Tools/ardupilotwaf/boards.py
@@ -937,6 +937,36 @@ def configure_env(self, cfg, env):
             HAL_SUPPORT_RCOUT_SERIAL = 0,
             AP_TERRAIN_AVAILABLE = 0,
             AP_CUSTOMROTATIONS_ENABLED = 0,
+            AP_PERIPH_BATTERY_ENABLED = 0,
+            AP_PERIPH_DEVICE_TEMPERATURE_ENABLED = 0,
+            AP_PERIPH_SERIAL_OPTIONS_ENABLED = 0,
+            AP_PERIPH_ADSB_ENABLED = 0,
+            AP_PERIPH_PROXIMITY_ENABLED = 0,
+            AP_PERIPH_GPS_ENABLED = 0,
+            AP_PERIPH_RELAY_ENABLED = 0,
+            AP_PERIPH_IMU_ENABLED = 0,
+            AP_PERIPH_MAG_ENABLED = 0,
+            AP_PERIPH_BATTERY_BALANCE_ENABLED = 0,
+            AP_PERIPH_MSP_ENABLED = 0,
+            AP_PERIPH_BARO_ENABLED = 0,
+            AP_PERIPH_EFI_ENABLED = 0,
+            AP_PERIPH_RANGEFINDER_ENABLED = 0,
+            AP_PERIPH_RC_OUT_ENABLED = 0,
+            AP_PERIPH_RTC_ENABLED = 0,
+            AP_PERIPH_RCIN_ENABLED = 0,
+            AP_PERIPH_RPM_ENABLED = 0,
+            AP_PERIPH_RPM_STREAM_ENABLED = 0,
+            AP_PERIPH_AIRSPEED_ENABLED = 0,
+            AP_PERIPH_HOBBYWING_ESC_ENABLED = 0,
+            AP_PERIPH_NETWORKING_ENABLED = 0,
+            AP_PERIPH_NOTIFY_ENABLED = 0,
+            AP_PERIPH_PWM_HARDPOINT_ENABLED = 0,
+            AP_PERIPH_ESC_APD_ENABLED = 0,
+            AP_PERIPH_NCP5623_LED_WITHOUT_NOTIFY_ENABLED = 0,
+            AP_PERIPH_NCP5623_BGR_LED_WITHOUT_NOTIFY_ENABLED = 0,
+            AP_PERIPH_TOSHIBA_LED_WITHOUT_NOTIFY_ENABLED = 0,
+            AP_PERIPH_BUZZER_ENABLED = 0,
+            AP_PERIPH_BUZZER_WITHOUT_NOTIFY_ENABLED = 0,
         )
 
         try:
@@ -955,41 +985,24 @@ def configure_env(self, cfg, env):
             AP_PERIPH_GPS_ENABLED = 1,
             AP_PERIPH_AIRSPEED_ENABLED = 1,
             AP_PERIPH_MAG_ENABLED = 1,
-            AP_PERIPH_RELAY_ENABLED = 0,
             AP_PERIPH_BARO_ENABLED = 1,
             AP_PERIPH_IMU_ENABLED = 1,
             AP_PERIPH_RANGEFINDER_ENABLED = 1,
-            AP_PERIPH_DEVICE_TEMPERATURE_ENABLED = 0,
             AP_PERIPH_BATTERY_ENABLED = 1,
-            AP_PERIPH_BATTERY_BALANCE_ENABLED = 0,
             AP_PERIPH_EFI_ENABLED = 1,
             AP_PERIPH_RPM_ENABLED = 1,
             AP_PERIPH_RPM_STREAM_ENABLED = 1,
-            AP_PERIPH_PROXIMITY_ENABLED = 0,
             AP_RPM_STREAM_ENABLED = 1,
             AP_PERIPH_RC_OUT_ENABLED = 1,
             AP_PERIPH_ADSB_ENABLED = 1,
             AP_PERIPH_SERIAL_OPTIONS_ENABLED = 1,
             AP_AIRSPEED_ENABLED = 1,
             AP_BATTERY_ESC_ENABLED = 1,
-            AP_PERIPH_MSP_ENABLED =0,
             HAL_PWM_COUNT = 32,
             HAL_WITH_ESC_TELEM = 1,
             AP_EXTENDED_ESC_TELEM_ENABLED = 1,
             AP_TERRAIN_AVAILABLE = 1,
             HAL_GYROFFT_ENABLED = 0,
-            AP_PERIPH_HOBBYWING_ESC_ENABLED = 0,
-            AP_PERIPH_RTC_ENABLED = 0,
-            AP_PERIPH_RCIN_ENABLED = 0,
-            AP_PERIPH_NETWORKING_ENABLED = 0,
-            AP_PERIPH_NOTIFY_ENABLED = 0,
-            AP_PERIPH_PWM_HARDPOINT_ENABLED = 0,
-            AP_PERIPH_ESC_APD_ENABLED = 0,
-            AP_PERIPH_NCP5623_LED_WITHOUT_NOTIFY_ENABLED = 0,
-            AP_PERIPH_NCP5623_BGR_LED_WITHOUT_NOTIFY_ENABLED = 0,
-            AP_PERIPH_TOSHIBA_LED_WITHOUT_NOTIFY_ENABLED = 0,
-            AP_PERIPH_BUZZER_ENABLED = 0,
-            AP_PERIPH_BUZZER_WITHOUT_NOTIFY_ENABLED = 0,
         )
 
 class sitl_periph_gps(sitl_periph):
@@ -1002,36 +1015,7 @@ def configure_env(self, cfg, env):
             CAN_APP_NODE_NAME = '"org.ardupilot.ap_periph_gps"',
             APJ_BOARD_ID = 101,
 
-            AP_PERIPH_BATTERY_ENABLED = 0,
-            AP_PERIPH_DEVICE_TEMPERATURE_ENABLED = 0,
-            AP_PERIPH_SERIAL_OPTIONS_ENABLED = 0,
-            AP_PERIPH_ADSB_ENABLED = 0,
-            AP_PERIPH_PROXIMITY_ENABLED = 0,
             AP_PERIPH_GPS_ENABLED = 1,
-            AP_PERIPH_RELAY_ENABLED = 0,
-            AP_PERIPH_IMU_ENABLED = 0,
-            AP_PERIPH_MAG_ENABLED = 0,
-            AP_PERIPH_BATTERY_BALANCE_ENABLED = 0,
-            AP_PERIPH_MSP_ENABLED = 0,
-            AP_PERIPH_BARO_ENABLED = 0,
-            AP_PERIPH_EFI_ENABLED = 0,
-            AP_PERIPH_RANGEFINDER_ENABLED = 0,
-            AP_PERIPH_RC_OUT_ENABLED = 0,
-            AP_PERIPH_RTC_ENABLED = 0,
-            AP_PERIPH_RCIN_ENABLED = 0,
-            AP_PERIPH_RPM_ENABLED = 0,
-            AP_PERIPH_RPM_STREAM_ENABLED = 0,
-            AP_PERIPH_AIRSPEED_ENABLED = 0,
-            AP_PERIPH_HOBBYWING_ESC_ENABLED = 0,
-            AP_PERIPH_NETWORKING_ENABLED = 0,
-            AP_PERIPH_NOTIFY_ENABLED = 0,
-            AP_PERIPH_PWM_HARDPOINT_ENABLED = 0,
-            AP_PERIPH_ESC_APD_ENABLED = 0,
-            AP_PERIPH_NCP5623_LED_WITHOUT_NOTIFY_ENABLED = 0,
-            AP_PERIPH_NCP5623_BGR_LED_WITHOUT_NOTIFY_ENABLED = 0,
-            AP_PERIPH_TOSHIBA_LED_WITHOUT_NOTIFY_ENABLED = 0,
-            AP_PERIPH_BUZZER_ENABLED = 0,
-            AP_PERIPH_BUZZER_WITHOUT_NOTIFY_ENABLED = 0,
         )
 
 class sitl_periph_battmon(sitl_periph):
@@ -1045,35 +1029,6 @@ def configure_env(self, cfg, env):
             APJ_BOARD_ID = 101,
 
             AP_PERIPH_BATTERY_ENABLED = 1,
-            AP_PERIPH_DEVICE_TEMPERATURE_ENABLED = 0,
-            AP_PERIPH_SERIAL_OPTIONS_ENABLED = 0,
-            AP_PERIPH_BATTERY_BALANCE_ENABLED = 0,
-            AP_PERIPH_RELAY_ENABLED = 0,
-            AP_PERIPH_ADSB_ENABLED = 0,
-            AP_PERIPH_BARO_ENABLED = 0,
-            AP_PERIPH_RANGEFINDER_ENABLED = 0,
-            AP_PERIPH_PROXIMITY_ENABLED = 0,
-            AP_PERIPH_GPS_ENABLED = 0,
-            AP_PERIPH_MSP_ENABLED = 0,
-            AP_PERIPH_IMU_ENABLED = 0,
-            AP_PERIPH_MAG_ENABLED = 0,
-            AP_PERIPH_EFI_ENABLED = 0,
-            AP_PERIPH_RTC_ENABLED = 0,
-            AP_PERIPH_RC_OUT_ENABLED = 0,
-            AP_PERIPH_RCIN_ENABLED = 0,
-            AP_PERIPH_RPM_ENABLED = 0,
-            AP_PERIPH_RPM_STREAM_ENABLED = 0,
-            AP_PERIPH_AIRSPEED_ENABLED = 0,
-            AP_PERIPH_HOBBYWING_ESC_ENABLED = 0,
-            AP_PERIPH_NETWORKING_ENABLED = 0,
-            AP_PERIPH_NOTIFY_ENABLED = 0,
-            AP_PERIPH_PWM_HARDPOINT_ENABLED = 0,
-            AP_PERIPH_ESC_APD_ENABLED = 0,
-            AP_PERIPH_NCP5623_LED_WITHOUT_NOTIFY_ENABLED = 0,
-            AP_PERIPH_NCP5623_BGR_LED_WITHOUT_NOTIFY_ENABLED = 0,
-            AP_PERIPH_TOSHIBA_LED_WITHOUT_NOTIFY_ENABLED = 0,
-            AP_PERIPH_BUZZER_ENABLED = 0,
-            AP_PERIPH_BUZZER_WITHOUT_NOTIFY_ENABLED = 0,
         )
 
 class esp32(Board):