diff --git a/libraries/AP_BoardConfig/AP_BoardConfig.h b/libraries/AP_BoardConfig/AP_BoardConfig.h
index 5cb86748e6..e5e2cef186 100644
--- a/libraries/AP_BoardConfig/AP_BoardConfig.h
+++ b/libraries/AP_BoardConfig/AP_BoardConfig.h
@@ -12,11 +12,15 @@
 #define AP_FEATURE_SAFETY_BUTTON 0
 #endif
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_PX4 || defined(HAL_CHIBIOS_ARCH_FMUV3)
-#define AP_FEATURE_RTSCTS 1
-#define AP_FEATURE_SBUS_OUT 1
-#else
+#ifndef AP_FEATURE_RTSCTS
 #define AP_FEATURE_RTSCTS 0
+#endif
+
+#ifndef AP_FEATURE_RTSCTS
+#define AP_FEATURE_RTSCTS 0
+#endif
+
+#ifndef AP_FEATURE_SBUS_OUT
 #define AP_FEATURE_SBUS_OUT 0
 #endif