diff --git a/libraries/AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef.dat
index 42af72e686..0c0f9a0912 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef.dat
@@ -231,9 +231,6 @@ define HAL_BOARD_TERRAIN_DIRECTORY "/APM/TERRAIN"
 define HAL_STORAGE_SIZE 16384
 define HAL_WITH_RAMTRON 1
 
-# fallback to flash is no FRAM fitted
-define STORAGE_FLASH_PAGE 22
-
 # enable FAT filesystem support (needs a microSD defined via SDIO)
 define HAL_OS_FATFS_IO 1
 
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef.dat
index efdb98d8c6..08b69b633d 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef.dat
@@ -136,7 +136,6 @@ define HAL_BOARD_LOG_DIRECTORY "/APM/LOGS"
 define HAL_BOARD_TERRAIN_DIRECTORY "/APM/TERRAIN"
 
 define HAL_STORAGE_SIZE   16384
-define STORAGE_FLASH_PAGE 22
 
 # enable RAMTROM parameter storage
 define HAL_WITH_RAMTRON 1
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat
index 750931a7a6..5ed3b2e76e 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat
@@ -442,12 +442,6 @@ define HAL_BOARD_TERRAIN_DIRECTORY "/APM/TERRAIN"
 # available (in bytes).
 define HAL_STORAGE_SIZE 16384
 
-# Now define fallback storage location is flash if no FRAM
-# fitted. This needs to be carefully chosen to align with your
-# bootloader. The flash storage system needs two sectors, and the
-# sectors must be at least 20% larger than HAL_STORAGE_SIZE.
-define STORAGE_FLASH_PAGE 22
-
 # allow to have have a dedicated safety switch pin
 define HAL_HAVE_SAFETY_SWITCH 1
 
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef.dat
index d2572940e3..61c5536290 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef.dat
@@ -184,9 +184,6 @@ define HAL_STORAGE_SIZE        16384
 # enable RAMTROM parameter storage
 define HAL_WITH_RAMTRON 1
 
-# fallback to flash is no FRAM fitted
-define STORAGE_FLASH_PAGE 22
-
 # enable FAT filesystem
 define HAL_OS_FATFS_IO 1
 
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/luminousbee4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/luminousbee4/hwdef.dat
index cd28562929..5af02b7e7e 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/luminousbee4/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/luminousbee4/hwdef.dat
@@ -144,9 +144,6 @@ define HAL_STORAGE_SIZE        16384
 # enable RAMTROM parameter storage
 define HAL_WITH_RAMTRON 1
 
-# fallback to flash is no FRAM fitted
-define STORAGE_FLASH_PAGE 22
-
 # enable FAT filesystem
 define HAL_OS_FATFS_IO 1
 
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef.dat
index c90220277b..d6e6e800a5 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef.dat
@@ -197,9 +197,6 @@ define HAL_STORAGE_SIZE 16384
 # enable RAMTROM parameter storage
 define HAL_WITH_RAMTRON 1
 
-# fallback to flash storage
-define STORAGE_FLASH_PAGE 22
-
 # allow to have have a dedicated safety switch pin
 define HAL_HAVE_SAFETY_SWITCH 1
 
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat
index 22852e43d1..96152fdd93 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat
@@ -57,6 +57,9 @@ DMA_NOSHARE SPI2_*
 undef PA1
 PA1 UART4_RX UART4 NODMA
 
+# use flash storage
+define STORAGE_FLASH_PAGE 22
+
 env DEFAULT_PARAMETERS 'Tools/Frame_params/SkyViper-2450GPS/defaults.parm'
 
 # the web UI uses an abin file for firmware uploads