diff --git a/Tools/AP_Periph/AP_Periph.cpp b/Tools/AP_Periph/AP_Periph.cpp
index b92dd3abba25b..0f6ab7642bc29 100644
--- a/Tools/AP_Periph/AP_Periph.cpp
+++ b/Tools/AP_Periph/AP_Periph.cpp
@@ -144,7 +144,7 @@ void AP_Periph_FW::init()
     node_stats.init();
 #endif
 
-#ifdef HAL_PERIPH_ENABLE_SERIAL_OPTIONS
+#if AP_PERIPH_SERIAL_OPTIONS_ENABLED
     serial_options.init();
 #endif
 
diff --git a/Tools/AP_Periph/AP_Periph.h b/Tools/AP_Periph/AP_Periph.h
index e45ea598b335d..d2570d2e5d351 100644
--- a/Tools/AP_Periph/AP_Periph.h
+++ b/Tools/AP_Periph/AP_Periph.h
@@ -384,7 +384,7 @@ class AP_Periph_FW {
     BattBalance battery_balance;
 #endif
 
-#ifdef HAL_PERIPH_ENABLE_SERIAL_OPTIONS
+#if AP_PERIPH_SERIAL_OPTIONS_ENABLED
     SerialOptions serial_options;
 #endif
     
diff --git a/Tools/AP_Periph/Parameters.cpp b/Tools/AP_Periph/Parameters.cpp
index f70c731c7d9d8..1443bf5c2d45a 100644
--- a/Tools/AP_Periph/Parameters.cpp
+++ b/Tools/AP_Periph/Parameters.cpp
@@ -643,7 +643,7 @@ const AP_Param::Info AP_Periph_FW::var_info[] = {
     GOBJECT(battery_balance, "BAL",  BattBalance),
 #endif
 
-#ifdef HAL_PERIPH_ENABLE_SERIAL_OPTIONS
+#if AP_PERIPH_SERIAL_OPTIONS_ENABLED
     // @Group: UART
     // @Path: serial_options.cpp
     GOBJECT(serial_options, "UART",  SerialOptions),
diff --git a/Tools/AP_Periph/serial_options.cpp b/Tools/AP_Periph/serial_options.cpp
index cc480eee5b7f7..83deb1a6f5dbb 100644
--- a/Tools/AP_Periph/serial_options.cpp
+++ b/Tools/AP_Periph/serial_options.cpp
@@ -18,7 +18,7 @@
 
 #include "AP_Periph.h"
 
-#ifdef HAL_PERIPH_ENABLE_SERIAL_OPTIONS
+#if AP_PERIPH_SERIAL_OPTIONS_ENABLED
 
 #include "serial_options.h"
 #include <AP_SerialManager/AP_SerialManager_config.h>
@@ -107,4 +107,4 @@ void SerialOptions::init(void)
     }
 }
 
-#endif  // HAL_PERIPH_ENABLE_SERIAL_OPTIONS
+#endif  // AP_PERIPH_SERIAL_OPTIONS_ENABLED
diff --git a/Tools/AP_Periph/serial_options.h b/Tools/AP_Periph/serial_options.h
index d71bdf4313811..8a93387fe89ee 100644
--- a/Tools/AP_Periph/serial_options.h
+++ b/Tools/AP_Periph/serial_options.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#ifdef HAL_PERIPH_ENABLE_SERIAL_OPTIONS
+#if AP_PERIPH_SERIAL_OPTIONS_ENABLED
 
 #ifndef HAL_UART_NUM_SERIAL_PORTS
 #define HAL_UART_NUM_SERIAL_PORTS AP_HAL::HAL::num_serial
@@ -27,4 +27,4 @@ class SerialOptions {
 };
 
 
-#endif // HAL_PERIPH_ENABLE_SERIAL_OPTIONS
+#endif // AP_PERIPH_SERIAL_OPTIONS_ENABLED
diff --git a/Tools/AP_Periph/serial_options_dev.cpp b/Tools/AP_Periph/serial_options_dev.cpp
index 26ba2bb137453..69ed85b2e3871 100644
--- a/Tools/AP_Periph/serial_options_dev.cpp
+++ b/Tools/AP_Periph/serial_options_dev.cpp
@@ -18,7 +18,7 @@
 
 #include "AP_Periph.h"
 
-#ifdef HAL_PERIPH_ENABLE_SERIAL_OPTIONS
+#if AP_PERIPH_SERIAL_OPTIONS_ENABLED
 
 #include "serial_options.h"
 
@@ -44,4 +44,4 @@ const AP_Param::GroupInfo SerialOptionsDev::var_info[] {
     AP_GROUPEND
 };
 
-#endif  // HAL_PERIPH_ENABLE_SERIAL_OPTIONS
+#endif  // AP_PERIPH_SERIAL_OPTIONS_ENABLED
diff --git a/Tools/ardupilotwaf/boards.py b/Tools/ardupilotwaf/boards.py
index e2f43858790c1..171fadc4b4731 100644
--- a/Tools/ardupilotwaf/boards.py
+++ b/Tools/ardupilotwaf/boards.py
@@ -967,7 +967,7 @@ def configure_env(self, cfg, env):
             AP_RPM_STREAM_ENABLED = 1,
             AP_PERIPH_RC_OUT_ENABLED = 1,
             AP_PERIPH_ADSB_ENABLED = 1,
-            HAL_PERIPH_ENABLE_SERIAL_OPTIONS = 1,
+            AP_PERIPH_SERIAL_OPTIONS_ENABLED = 1,
             AP_AIRSPEED_ENABLED = 1,
             AP_BATTERY_ESC_ENABLED = 1,
             AP_PERIPH_MSP_ENABLED =0,
@@ -994,6 +994,7 @@ def configure_env(self, cfg, env):
             APJ_BOARD_ID = 101,
 
             AP_PERIPH_BATTERY_ENABLED = 0,
+            AP_PERIPH_SERIAL_OPTIONS_ENABLED = 0,
             AP_PERIPH_ADSB_ENABLED = 0,
             AP_PERIPH_GPS_ENABLED = 1,
             AP_PERIPH_RELAY_ENABLED = 0,
@@ -1026,6 +1027,7 @@ def configure_env(self, cfg, env):
             APJ_BOARD_ID = 101,
 
             AP_PERIPH_BATTERY_ENABLED = 1,
+            AP_PERIPH_SERIAL_OPTIONS_ENABLED = 0,
             AP_PERIPH_BATTERY_BALANCE_ENABLED = 0,
             AP_PERIPH_RELAY_ENABLED = 0,
             AP_PERIPH_ADSB_ENABLED = 0,
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeRedPrimary-PPPGW/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeRedPrimary-PPPGW/hwdef.dat
index 75a4bde858a45..2a48dd6ba9959 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/CubeRedPrimary-PPPGW/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeRedPrimary-PPPGW/hwdef.dat
@@ -19,7 +19,7 @@ env AP_PERIPH 1
 define AP_CAN_SLCAN_ENABLED 0
 
 define AP_PERIPH_NETWORKING_ENABLED 1
-define HAL_PERIPH_ENABLE_SERIAL_OPTIONS
+define AP_PERIPH_SERIAL_OPTIONS_ENABLED 1
 
 define AP_NETWORKING_BACKEND_PPP 1
 
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Serial/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Serial/hwdef.dat
index e9ace8923ddcb..5733815ec1df1 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Serial/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Serial/hwdef.dat
@@ -1,6 +1,6 @@
 include ../MatekL431/hwdef.inc
 
-define HAL_PERIPH_ENABLE_SERIAL_OPTIONS
+define AP_PERIPH_SERIAL_OPTIONS_ENABLED 1
 
 # enable serial3 port with DMA
 undef PB10
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk6X-PPPGW/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk6X-PPPGW/hwdef.dat
index 7625c86b7af7d..7e99f35095b03 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk6X-PPPGW/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk6X-PPPGW/hwdef.dat
@@ -20,7 +20,7 @@ env AP_PERIPH 1
 define AP_CAN_SLCAN_ENABLED 0
 
 define AP_PERIPH_NETWORKING_ENABLED 1
-define HAL_PERIPH_ENABLE_SERIAL_OPTIONS
+define AP_PERIPH_SERIAL_OPTIONS_ENABLED 1
 
 define AP_NETWORKING_BACKEND_PPP 1
 
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/include/network_PPPGW.inc b/libraries/AP_HAL_ChibiOS/hwdef/include/network_PPPGW.inc
index 345fb736cb503..b86d758ce8128 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/include/network_PPPGW.inc
+++ b/libraries/AP_HAL_ChibiOS/hwdef/include/network_PPPGW.inc
@@ -3,7 +3,7 @@ define AP_RC_CHANNEL_ENABLED 0
 
 define AP_PERIPH_RTC_ENABLED 1
 
-define HAL_PERIPH_ENABLE_SERIAL_OPTIONS
+define AP_PERIPH_SERIAL_OPTIONS_ENABLED 1
 define AP_NETWORKING_BACKEND_PPP 1
 define AP_NETWORKING_CAN_MCAST_ENABLED 1
 
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/scripts/defaults_periph.h b/libraries/AP_HAL_ChibiOS/hwdef/scripts/defaults_periph.h
index 3d9c90894c713..08b4b9e214252 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/scripts/defaults_periph.h
+++ b/libraries/AP_HAL_ChibiOS/hwdef/scripts/defaults_periph.h
@@ -166,6 +166,9 @@
 #ifdef HAL_PERIPH_ENABLE_NOTIFY
 #error "Change 'define HAL_PERIPH_ENABLE_NOTIFY' to 'define AP_PERIPH_NOTIFY_ENABLED 1'"
 #endif
+#ifdef HAL_PERIPH_ENABLE_SERIAL_OPTIONS
+#error "Change 'define HAL_PERIPH_ENABLE_SERIAL_OPTIONS' to 'define AP_PERIPH_SERIAL_OPTIONS_ENABLED 1'"
+#endif
 #ifdef HAL_PERIPH_ENABLE_GPS
 #error "Change 'define HAL_PERIPH_ENABLE_GPS' to 'define AP_PERIPH_GPS_ENABLED 1'"
 #endif
@@ -233,6 +236,9 @@
 #ifndef AP_PERIPH_NOTIFY_ENABLED
 #define AP_PERIPH_NOTIFY_ENABLED 0
 #endif
+#ifndef AP_PERIPH_SERIAL_OPTIONS_ENABLED
+#define AP_PERIPH_SERIAL_OPTIONS_ENABLED 0
+#endif
 #ifndef AP_PERIPH_BATTERY_ENABLED
 #define AP_PERIPH_BATTERY_ENABLED 0
 #endif
@@ -510,7 +516,7 @@
 #endif
 
 #ifndef AP_UART_MONITOR_ENABLED
-#define AP_UART_MONITOR_ENABLED defined(HAL_PERIPH_ENABLE_SERIAL_OPTIONS) || (AP_PERIPH_GPS_ENABLED && (GPS_MOVING_BASELINE || BOARD_FLASH_SIZE>=256))
+#define AP_UART_MONITOR_ENABLED AP_PERIPH_SERIAL_OPTIONS_ENABLED || (AP_PERIPH_GPS_ENABLED && (GPS_MOVING_BASELINE || BOARD_FLASH_SIZE>=256))
 #endif
 
 #ifndef HAL_BOARD_LOG_DIRECTORY