diff --git a/Tools/autotest/test_build_options.py b/Tools/autotest/test_build_options.py
index 6f205543957a28..dbdc26de47fe4d 100755
--- a/Tools/autotest/test_build_options.py
+++ b/Tools/autotest/test_build_options.py
@@ -233,7 +233,16 @@ def define_is_whitelisted_for_feature_in_code(self, target, define):
             'AP_RANGEFINDER_ENABLED',  # only at vehicle level ATM
             'HAL_PERIPH_SUPPORT_LONG_CAN_PRINTF',  # no symbol
             'AP_DRONECAN_VOLZ_FEEDBACK_ENABLED',  # broken, no subscriber
+            'AP_BARO_ICM20789_ENABLED',  # must be in hwdef; not i2c-ext-probed
+            'AP_BARO_ICP101XX_ENABLED',  # must be in hwdef; not i2c-ext-probed
+            'AP_BARO_ICP201XX_ENABLED',  # must be in hwdef; not i2c-ext-probed
         ])
+        if target.lower() != "sub":
+            # only on Sub:
+            feature_define_whitelist.add('AP_BARO_KELLERLD_ENABLED')
+        if target.lower() != "plane":
+            # only on Plane:
+            feature_define_whitelist.add('AP_BATTERY_WATT_MAX_ENABLED')
         if target.lower() not in frozenset(["rover", "sub"]):
             # only Rover and Sub get nmea airspeed
             feature_define_whitelist.add('AP_AIRSPEED_NMEA_ENABLED')
diff --git a/Tools/scripts/build_options.py b/Tools/scripts/build_options.py
index 676ecf9f1d0421..00839a504be296 100644
--- a/Tools/scripts/build_options.py
+++ b/Tools/scripts/build_options.py
@@ -294,15 +294,15 @@ def __init__(self,
     # Feature('Baro', 'DUMMY', 'AP_BARO_DUMMY_ENABLED', 'Enable DUMMY Barometric Sensor', 0, None),
     Feature('Baro', 'EXTERNALAHRS', 'AP_BARO_EXTERNALAHRS_ENABLED', 'Enable EXTERNALAHRS Barometric Sensor', 0, 'AHRS_EXT'),
     Feature('Baro', 'FBM320', 'AP_BARO_FBM320_ENABLED', 'Enable FBM320 Barometric Sensor', 1, "BARO_PROBEXT"),
-    Feature('Baro', 'ICM20789', 'AP_BARO_ICM20789_ENABLED', 'Enable ICM20789 Barometric Sensor', 1, "BARO_PROBEXT"),
+    # Feature('Baro', 'ICM20789', 'AP_BARO_ICM20789_ENABLED', 'Enable ICM20789 Barometric Sensor', 1, "BARO_PROBEXT"),
     Feature('Baro', 'KELLERLD', 'AP_BARO_KELLERLD_ENABLED', 'Enable KELLERLD Barometric Sensor', 1, "BARO_PROBEXT"),
     Feature('Baro', 'LPS2XH', 'AP_BARO_LPS2XH_ENABLED', 'Enable LPS2XH Barometric Sensor', 1, "BARO_PROBEXT"),
     Feature('Baro', 'MS56XX', 'AP_BARO_MS56XX_ENABLED', 'Enable MS56XX Barometric Sensor', 1, "BARO_PROBEXT"),
     Feature('Baro', 'MSP_BARO', 'AP_BARO_MSP_ENABLED', 'Enable MSP Barometric Sensor', 0, 'MSP'),
     Feature('Baro', 'SPL06', 'AP_BARO_SPL06_ENABLED', 'Enable SPL06 Barometric Sensor', 1, "BARO_PROBEXT"),
     Feature('Baro', 'DRONECAN_BARO', 'AP_BARO_DRONECAN_ENABLED', 'Enable DroneCAN Barometric Sensor', 0, "DroneCAN"),
-    Feature('Baro', 'ICP101XX', 'AP_BARO_ICP101XX_ENABLED', 'Enable ICP101XX Barometric Sensor', 0, "BARO_PROBEXT"),
-    Feature('Baro', 'ICP201XX', 'AP_BARO_ICP201XX_ENABLED', 'Enable ICP201XX Barometric Sensor', 0, "BARO_PROBEXT"),
+    # Feature('Baro', 'ICP101XX', 'AP_BARO_ICP101XX_ENABLED', 'Enable ICP101XX Barometric Sensor', 0, "BARO_PROBEXT"),
+    # Feature('Baro', 'ICP201XX', 'AP_BARO_ICP201XX_ENABLED', 'Enable ICP201XX Barometric Sensor', 0, "BARO_PROBEXT"),
     Feature('Baro', 'BARO_TEMPCAL', 'AP_TEMPCALIBRATION_ENABLED', 'Enable Baro Temperature Calibration', 0, None),
     Feature('Baro', 'BARO_PROBEXT', 'AP_BARO_PROBE_EXTERNAL_I2C_BUSES', 'Enable Probing of External i2c buses', 0, None),