diff --git a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v4/hwdef.dat
index 3c23f66955..ed102985f4 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v4/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v4/hwdef.dat
@@ -57,33 +57,33 @@ PA12 OTG_FS_DP OTG1
 # USART1 (DJI / VTX)
 PA10 USART1_RX USART1 NODMA
 PA9 USART1_TX USART1 NODMA
-define DEFAULT_SERIAL1_PROTOCOL SerialProtocol_DJI_FPV
+define HAL_SERIAL1_PROTOCOL SerialProtocol_DJI_FPV
 
 # USART2 (RCIN)
 PA2 USART2_TX USART2
 PA3 USART2_RX USART2
-define DEFAULT_SERIAL2_PROTOCOL SerialProtocol_RCIN
+define HAL_SERIAL2_PROTOCOL SerialProtocol_RCIN
 
 # USART3 (CAM)
 PC10 USART3_TX USART3 NODMA
 PC11 USART3_RX USART3 NODMA
-define DEFAULT_SERIAL3_PROTOCOL SerialProtocol_None
+define HAL_SERIAL3_PROTOCOL SerialProtocol_None
 
 # UART4 (Bluetooth)
 PA0 UART4_TX UART4 NODMA
 PA1 UART4_RX UART4 NODMA
-define DEFAULT_SERIAL4_PROTOCOL SerialProtocol_None
+define HAL_SERIAL4_PROTOCOL SerialProtocol_None
 
 # UART5 (ESC Telemetry)
 PD2 UART5_RX UART5 NODMA
-define DEFAULT_SERIAL5_PROTOCOL SerialProtocol_ESCTelemetry
-define DEFAULT_SERIAL5_BAUD 19200
+define HAL_SERIAL5_PROTOCOL SerialProtocol_ESCTelemetry
+define HAL_SERIAL5_BAUD 19200
 
 # USART6 (GPS)
 PC6 USART6_TX USART6
 PC7 USART6_RX USART6
-define DEFAULT_SERIAL6_PROTOCOL SerialProtocol_GPS
-define DEFAULT_SERIAL6_BAUD AP_SERIALMANAGER_GPS_BAUD
+define HAL_SERIAL6_PROTOCOL SerialProtocol_GPS
+define HAL_SERIAL6_BAUD AP_SERIALMANAGER_GPS_BAUD
 
 # I2C ports
 I2C_ORDER I2C1
@@ -158,8 +158,11 @@ define HAL_FRAME_TYPE_DEFAULT 12
 
 # filesystem setup on sdcard
 define HAL_OS_FATFS_IO 1
+define HAL_BOARD_LOG_DIRECTORY "/APM/LOGS"
+define HAL_BOARD_TERRAIN_DIRECTORY "/APM/TERRAIN"
 
 # minimal drivers to reduce flash usage
-include ../include/minimize_fpv_osd.inc
+include ../include/minimal.inc
+define AP_BATTERY_SYNTHETIC_CURRENT_ENABLED 0
 
 define DEFAULT_NTF_LED_TYPES 257