HAL_ChibiOS: move to using parameter STORAGE_FLASH_PAGE instead of define

3 years ago · 8651d99de6
56 changed files with 55 additions and 57 deletions
--- a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef.dat
@ -106,7 +106,7 @@ DMA_PRIORITY USART1* TIM1* TIM3*
				@@ -106,7 +106,7 @@ DMA_PRIORITY USART1* TIM1* TIM3*
 DMA_NOSHARE SPI3* TIM1_CH2

 define HAL_STORAGE_SIZE 16384
-define STORAGE_FLASH_PAGE 1
+STORAGE_FLASH_PAGE 1

 # enable logging to dataflash
 define HAL_LOGGING_DATAFLASH
--- a/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef.dat
@ -108,7 +108,7 @@ DMA_NOSHARE SPI1* SPI3* TIM1* TIM3* TIM4_UP USART1_TX
				@@ -108,7 +108,7 @@ DMA_NOSHARE SPI1* SPI3* TIM1* TIM3* TIM4_UP USART1_TX
 define HAL_STORAGE_SIZE 16384
 # use last 2 pages for flash storage
 # H743 has 16 pages of 128k each
-define STORAGE_FLASH_PAGE 14
+STORAGE_FLASH_PAGE 14

 # reserve space for flash storage in last 2 sectors
 FLASH_RESERVE_END_KB 256
--- a/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef.dat
@ -9,7 +9,7 @@ MCU STM32F4xx STM32F412Rx
				@@ -9,7 +9,7 @@ MCU STM32F4xx STM32F412Rx
 FLASH_RESERVE_START_KB 64

 # store parameters in pages 2 and 3
-define STORAGE_FLASH_PAGE 2
+STORAGE_FLASH_PAGE 2
 define HAL_STORAGE_SIZE 8192

 # board ID for firmware load
--- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat
@ -8,7 +8,7 @@ MCU STM32F4xx STM32F412Rx
				@@ -8,7 +8,7 @@ MCU STM32F4xx STM32F412Rx
 FLASH_RESERVE_START_KB 64

 # store parameters in pages 2 and 3
-define STORAGE_FLASH_PAGE 2
+STORAGE_FLASH_PAGE 2
 define HAL_STORAGE_SIZE 8192

 # board ID for firmware load
--- a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.dat
@ -22,8 +22,6 @@ env OPTIMIZE -O2
				@@ -22,8 +22,6 @@ env OPTIMIZE -O2
 FLASH_RESERVE_START_KB 128
 FLASH_RESERVE_END_KB 128

-define HAL_CRASH_DUMP_FLASHPAGE 15
-
 define HAL_STORAGE_SIZE 32768

 # order of I2C buses
--- a/libraries/AP_HAL_ChibiOS/hwdef/CubeYellow/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeYellow/hwdef.dat
@ -466,7 +466,7 @@ DMA_PRIORITY USART6*
				@@ -466,7 +466,7 @@ DMA_PRIORITY USART6*
 FLASH_RESERVE_START_KB 96

 # fallback storage in case FRAM is not populated
-define STORAGE_FLASH_PAGE 1
+STORAGE_FLASH_PAGE 1

 # list of files to put in ROMFS. For fmuv3 we need an IO firmware so
 # we can automatically update the IOMCU firmware on boot. The format
--- a/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat
@ -152,7 +152,7 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin
				@@ -152,7 +152,7 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin

 # available storage
 define HAL_STORAGE_SIZE 15360
-define STORAGE_FLASH_PAGE 1
+STORAGE_FLASH_PAGE 1

 # defaults for battery monitoring
 define HAL_BATT_MONITOR_DEFAULT 4
--- a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat
@ -121,7 +121,7 @@ DMA_PRIORITY USART1* TIM1* TIM3*
				@@ -121,7 +121,7 @@ DMA_PRIORITY USART1* TIM1* TIM3*
 DMA_NOSHARE SPI1_TX SPI1_RX TIM1_CH2 TIM3_CH3

 define HAL_STORAGE_SIZE 16384
-define STORAGE_FLASH_PAGE 1
+STORAGE_FLASH_PAGE 1

 # enable logging to dataflash
 define HAL_LOGGING_DATAFLASH
--- a/libraries/AP_HAL_ChibiOS/hwdef/FreeflyRTK/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/FreeflyRTK/hwdef.dat
@ -8,7 +8,7 @@ MCU STM32F7xx STM32F732xx
				@@ -8,7 +8,7 @@ MCU STM32F7xx STM32F732xx
 FLASH_RESERVE_START_KB 64

 # store parameters in pages 2 and 3
-define STORAGE_FLASH_PAGE 2
+STORAGE_FLASH_PAGE 2
 define HAL_STORAGE_SIZE 8192

 # board ID for firmware load
--- a/libraries/AP_HAL_ChibiOS/hwdef/G4-ESC/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/G4-ESC/hwdef.dat
@ -7,7 +7,7 @@ MCU STM32G474 STM32G474xx
				@@ -7,7 +7,7 @@ MCU STM32G474 STM32G474xx
 FLASH_RESERVE_START_KB 30

 # store parameters in pages 13 and 14
-define STORAGE_FLASH_PAGE 13
+STORAGE_FLASH_PAGE 13
 define HAL_STORAGE_SIZE 800

 # board ID for firmware load
--- a/libraries/AP_HAL_ChibiOS/hwdef/Hitec-Airspeed/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/Hitec-Airspeed/hwdef.dat
@ -7,7 +7,7 @@ MCU STM32G441 STM32G441xx
				@@ -7,7 +7,7 @@ MCU STM32G441 STM32G441xx
 FLASH_RESERVE_START_KB 26

 # store parameters in pages 11 and 12
-define STORAGE_FLASH_PAGE 11
+STORAGE_FLASH_PAGE 11
 define HAL_STORAGE_SIZE 800

 # board ID for firmware load
--- a/libraries/AP_HAL_ChibiOS/hwdef/HitecMosaic/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/HitecMosaic/hwdef.dat
@ -7,7 +7,7 @@ MCU STM32F303 STM32F303xC
				@@ -7,7 +7,7 @@ MCU STM32F303 STM32F303xC
 FLASH_RESERVE_START_KB 26

 # store parameters in pages 11 and 12
-define STORAGE_FLASH_PAGE 11
+STORAGE_FLASH_PAGE 11
 define HAL_STORAGE_SIZE 800

 # board ID for firmware load
--- a/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef.dat
@ -8,7 +8,7 @@ MCU STM32F4xx STM32F412Rx
				@@ -8,7 +8,7 @@ MCU STM32F4xx STM32F412Rx
 FLASH_RESERVE_START_KB 64

 # store parameters in pages 2 and 3
-define STORAGE_FLASH_PAGE 2
+STORAGE_FLASH_PAGE 2
 define HAL_STORAGE_SIZE 8192

 # board ID for firmware load
--- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat
@ -117,7 +117,7 @@ PC8 TIM8_CH3 TIM8 PWM(5) GPIO(54) # LED strip
				@@ -117,7 +117,7 @@ PC8 TIM8_CH3 TIM8 PWM(5) GPIO(54) # LED strip
 define HAL_NEOPIXEL_COUNT 8

 define HAL_STORAGE_SIZE 15360
-define STORAGE_FLASH_PAGE 2
+STORAGE_FLASH_PAGE 2

 # reserve 32k for bootloader and 32k for flash storage
 FLASH_RESERVE_START_KB 64
--- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat
@ -116,7 +116,7 @@ PA3  TIM5_CH4 TIM5 PWM(6) GPIO(55)
				@@ -116,7 +116,7 @@ PA3  TIM5_CH4 TIM5 PWM(6) GPIO(55)
 DMA_PRIORITY TIM1* TIM3* SPI4* SPI1*

 define HAL_STORAGE_SIZE 16384
-define STORAGE_FLASH_PAGE 1
+STORAGE_FLASH_PAGE 1

 # spi devices
 SPIDEV mpu6000  SPI4 DEVID1 ICM20689_CS MODE3  1*MHZ  4*MHZ
--- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat
@ -121,7 +121,7 @@ DMA_PRIORITY ADC* USART6* TIM1* TIM3* SPI4* SPI1*
				@@ -121,7 +121,7 @@ DMA_PRIORITY ADC* USART6* TIM1* TIM3* SPI4* SPI1*
 DMA_NOSHARE SPI4_RX

 define HAL_STORAGE_SIZE 16384
-define STORAGE_FLASH_PAGE 1
+STORAGE_FLASH_PAGE 1

 # enable logging to dataflash
 define HAL_LOGGING_DATAFLASH
--- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7/hwdef.dat
@ -21,7 +21,7 @@ FLASH_RESERVE_START_KB 128
				@@ -21,7 +21,7 @@ FLASH_RESERVE_START_KB 128

 # use last 2 pages for flash storage
 # H743 has 16 pages of 128k each
-define STORAGE_FLASH_PAGE 14
+STORAGE_FLASH_PAGE 14
 define HAL_STORAGE_SIZE 32768

 # reserve space for flash storage in last 2 sectors
--- a/libraries/AP_HAL_ChibiOS/hwdef/MambaF405US-I2C/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/MambaF405US-I2C/hwdef.dat
@ -134,7 +134,7 @@ define HAL_COMPASS_AUTO_ROT_DEFAULT 2
				@@ -134,7 +134,7 @@ define HAL_COMPASS_AUTO_ROT_DEFAULT 2
 # enable logging to dataflash
 define HAL_LOGGING_DATAFLASH
 define HAL_STORAGE_SIZE 16384
-define STORAGE_FLASH_PAGE 1
+STORAGE_FLASH_PAGE 1

 # flash size
 FLASH_SIZE_KB 1024
--- a/libraries/AP_HAL_ChibiOS/hwdef/MambaF405v2/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/MambaF405v2/hwdef.dat
@ -130,7 +130,7 @@ define HAL_COMPASS_AUTO_ROT_DEFAULT 2
				@@ -130,7 +130,7 @@ define HAL_COMPASS_AUTO_ROT_DEFAULT 2
 # enable logging to dataflash
 define HAL_LOGGING_DATAFLASH
 define HAL_STORAGE_SIZE 16384
-define STORAGE_FLASH_PAGE 1
+STORAGE_FLASH_PAGE 1

 # flash size
 FLASH_SIZE_KB 1024
--- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef.dat
@ -8,7 +8,7 @@ FLASH_RESERVE_START_KB 64
				@@ -8,7 +8,7 @@ FLASH_RESERVE_START_KB 64
 FLASH_SIZE_KB 1024

 # store parameters in pages 11 and 12
-define STORAGE_FLASH_PAGE 1
+STORAGE_FLASH_PAGE 1
 define HAL_STORAGE_SIZE 15360

 # board ID for firmware load
--- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat
@ -36,7 +36,7 @@ FLASH_RESERVE_START_KB 64
				@@ -36,7 +36,7 @@ FLASH_RESERVE_START_KB 64
 FLASH_SIZE_KB 1024

 define HAL_STORAGE_SIZE 15360
-define STORAGE_FLASH_PAGE 1
+STORAGE_FLASH_PAGE 1


 # I2C Buses
--- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat
@ -122,7 +122,7 @@ PA15 TIM2_CH1 TIM2 PWM(5) GPIO(54)
				@@ -122,7 +122,7 @@ PA15 TIM2_CH1 TIM2 PWM(5) GPIO(54)
 PA8  TIM1_CH1 TIM1 PWM(6) GPIO(55)

 define HAL_STORAGE_SIZE 15360
-define STORAGE_FLASH_PAGE 2
+STORAGE_FLASH_PAGE 2

 # reserve 32k for bootloader and 32k for flash storage
 FLASH_RESERVE_START_KB 64
--- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef.dat
@ -180,7 +180,7 @@ PE15 PINIO2 OUTPUT GPIO(82) LOW
				@@ -180,7 +180,7 @@ PE15 PINIO2 OUTPUT GPIO(82) LOW
 DMA_PRIORITY S*

 define HAL_STORAGE_SIZE 16384
-define STORAGE_FLASH_PAGE 1
+STORAGE_FLASH_PAGE 1

 # spi devices
 SPIDEV mpu6000  SPI1 DEVID1 IMU1_CS MODE3  1*MHZ  4*MHZ
--- a/libraries/AP_HAL_ChibiOS/hwdef/MatekH743/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekH743/hwdef.dat
@ -178,7 +178,7 @@ define HAL_STORAGE_SIZE 16384
				@@ -178,7 +178,7 @@ define HAL_STORAGE_SIZE 16384

 # use last 2 pages for flash storage
 # H743 has 16 pages of 128k each
-define STORAGE_FLASH_PAGE 14
+STORAGE_FLASH_PAGE 14

 # reserve space for flash storage in last 2 sectors
 FLASH_RESERVE_END_KB 256
--- a/libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef.dat
@ -137,7 +137,7 @@ PA3  TIM5_CH4 TIM5 PWM(6) GPIO(25)
				@@ -137,7 +137,7 @@ PA3  TIM5_CH4 TIM5 PWM(6) GPIO(25)
 DMA_PRIORITY S*

 define HAL_STORAGE_SIZE 16384
-define STORAGE_FLASH_PAGE 1
+STORAGE_FLASH_PAGE 1

 # spi devices
 SPIDEV icm20689 SPI4 DEVID1 ICM20689_CS MODE3 2*MHZ  8*MHZ
--- a/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-G491/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-G491/hwdef.dat
@ -7,7 +7,7 @@ MCU STM32G491 STM32G491xx
				@@ -7,7 +7,7 @@ MCU STM32G491 STM32G491xx
 FLASH_RESERVE_START_KB 30

 # store parameters in pages 13 and 14
-define STORAGE_FLASH_PAGE 13
+STORAGE_FLASH_PAGE 13
 define HAL_STORAGE_SIZE 800

 # board ID for firmware load
--- a/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L476/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L476/hwdef.dat
@ -7,7 +7,7 @@ MCU STM32L476 STM32L476xx
				@@ -7,7 +7,7 @@ MCU STM32L476 STM32L476xx
 FLASH_RESERVE_START_KB 40

 # store parameters in pages 18 and 19
-define STORAGE_FLASH_PAGE 18
+STORAGE_FLASH_PAGE 18
 define HAL_STORAGE_SIZE 800

 # board ID for firmware load
--- a/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L496/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L496/hwdef.dat
@ -7,7 +7,7 @@ MCU STM32L496 STM32L496xx
				@@ -7,7 +7,7 @@ MCU STM32L496 STM32L496xx
 FLASH_RESERVE_START_KB 40

 # store parameters in pages 18 and 19
-define STORAGE_FLASH_PAGE 18
+STORAGE_FLASH_PAGE 18
 define HAL_STORAGE_SIZE 800

 # board ID for firmware load
--- a/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2-bdshot/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2-bdshot/hwdef.dat
@ -107,7 +107,7 @@ PE11 TIM1_CH2 TIM1 PWM(4) GPIO(53)
				@@ -107,7 +107,7 @@ PE11 TIM1_CH2 TIM1 PWM(4) GPIO(53)
 DMA_PRIORITY ADC* USART6* TIM1_CH1 TIM3_CH4 TIM1_UP TIM3_UP SPI4* SPI1*

 define HAL_STORAGE_SIZE 16384
-define STORAGE_FLASH_PAGE 1
+STORAGE_FLASH_PAGE 1

 # spi devices
 SPIDEV bmp280  SPI1 DEVID1 BMP280_CS MODE3   1*MHZ  8*MHZ
--- a/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat
@ -105,7 +105,7 @@ PE9  TIM1_CH1 TIM1 PWM(3) GPIO(52)
				@@ -105,7 +105,7 @@ PE9  TIM1_CH1 TIM1 PWM(3) GPIO(52)
 PE11 TIM1_CH2 TIM1 PWM(4) GPIO(53)

 define HAL_STORAGE_SIZE 16384
-define STORAGE_FLASH_PAGE 1
+STORAGE_FLASH_PAGE 1

 # spi devices
 SPIDEV bmp280  SPI1 DEVID1 BMP280_CS MODE3   1*MHZ  8*MHZ
--- a/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat
@ -123,7 +123,7 @@ define HAL_COMPASS_DEFAULT HAL_COMPASS_NONE
				@@ -123,7 +123,7 @@ define HAL_COMPASS_DEFAULT HAL_COMPASS_NONE
 define HAL_PROBE_EXTERNAL_I2C_COMPASSES
 define HAL_I2C_INTERNAL_MASK 0

-define STORAGE_FLASH_PAGE 1
+STORAGE_FLASH_PAGE 1
 define HAL_STORAGE_SIZE 15360


--- a/libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef.dat
@ -16,7 +16,7 @@ STM32_ST_USE_TIMER 5
				@@ -16,7 +16,7 @@ STM32_ST_USE_TIMER 5
 FLASH_RESERVE_START_KB 64

 # store parameters in pages 2 and 3
-define STORAGE_FLASH_PAGE 2
+STORAGE_FLASH_PAGE 2
 define HAL_STORAGE_SIZE 16384

 # board ID for firmware load
--- a/libraries/AP_HAL_ChibiOS/hwdef/R9Pilot/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/R9Pilot/hwdef.dat
@ -140,7 +140,7 @@ PC8  SW1 INPUT GPIO(70)
				@@ -140,7 +140,7 @@ PC8  SW1 INPUT GPIO(70)
 DMA_PRIORITY SPI* ADC*

 define HAL_STORAGE_SIZE 16384
-define STORAGE_FLASH_PAGE 1
+STORAGE_FLASH_PAGE 1

 # spi devices
 SPIDEV icm20602 SPI3 DEVID1 IMU_CS  MODE3  1*MHZ  8*MHZ
--- a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-L431/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-L431/hwdef.dat
@ -7,7 +7,7 @@ MCU STM32L431 STM32L431xx
				@@ -7,7 +7,7 @@ MCU STM32L431 STM32L431xx
 FLASH_RESERVE_START_KB 40

 # store parameters in pages 18 and 19
-define STORAGE_FLASH_PAGE 18
+STORAGE_FLASH_PAGE 18
 define HAL_STORAGE_SIZE 800

 # ChibiOS system timer
--- a/libraries/AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef.dat
@ -108,7 +108,7 @@ define HAL_PROBE_EXTERNAL_I2C_COMPASSES
				@@ -108,7 +108,7 @@ define HAL_PROBE_EXTERNAL_I2C_COMPASSES
 define HAL_I2C_INTERNAL_MASK 0
 define HAL_COMPASS_AUTO_ROT_DEFAULT 2

-define STORAGE_FLASH_PAGE 1
+STORAGE_FLASH_PAGE 1
 define HAL_STORAGE_SIZE 15360

 # enable logging to dataflash
--- a/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef.dat
@ -132,7 +132,7 @@ define HAL_BOARD_LOG_DIRECTORY "/APM/LOGS"
				@@ -132,7 +132,7 @@ define HAL_BOARD_LOG_DIRECTORY "/APM/LOGS"
 define HAL_BOARD_TERRAIN_DIRECTORY "/APM/TERRAIN"

 define HAL_STORAGE_SIZE      15360
-define STORAGE_FLASH_PAGE    2
+STORAGE_FLASH_PAGE    2
 # reserve 32k for bootloader and 32k for flash storage
 FLASH_RESERVE_START_KB 64

--- a/libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef.dat
@ -13,7 +13,7 @@ define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_ZubaxGNSS"
				@@ -13,7 +13,7 @@ define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_ZubaxGNSS"
 FLASH_RESERVE_START_KB 34

 # store parameters in last 2 pages
-define STORAGE_FLASH_PAGE 126
+STORAGE_FLASH_PAGE 126
 define HAL_STORAGE_SIZE 800

 # reserve space for flash storage in last 2 sectors
--- a/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat
@ -90,7 +90,7 @@ define HAL_PROBE_EXTERNAL_I2C_COMPASSES
				@@ -90,7 +90,7 @@ define HAL_PROBE_EXTERNAL_I2C_COMPASSES
 define HAL_I2C_INTERNAL_MASK 0
 define HAL_COMPASS_AUTO_ROT_DEFAULT 2

-define STORAGE_FLASH_PAGE 1
+STORAGE_FLASH_PAGE 1
 define HAL_STORAGE_SIZE 15360

 # define default battery setup
--- a/libraries/AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef.dat
@ -93,7 +93,7 @@ define HAL_I2C_MAX_CLOCK 400000
				@@ -93,7 +93,7 @@ define HAL_I2C_MAX_CLOCK 400000
 SERIAL_ORDER OTG1 USART3 USART6 USART2

 define HAL_STORAGE_SIZE 15360
-define STORAGE_FLASH_PAGE 1
+STORAGE_FLASH_PAGE 1

 # reserve 32k for bootloader and 32k for flash storage
 FLASH_RESERVE_START_KB 64
--- a/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef.inc
+++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef.inc
@ -7,7 +7,7 @@ MCU STM32F103 STM32F103xB
				@@ -7,7 +7,7 @@ MCU STM32F103 STM32F103xB
 FLASH_RESERVE_START_KB 25

 # store parameters in pages 23 and 24
-define STORAGE_FLASH_PAGE 23
+STORAGE_FLASH_PAGE 23
 define HAL_STORAGE_SIZE 800

 # board ID for firmware load
--- a/libraries/AP_HAL_ChibiOS/hwdef/f303-MatekGPS/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-MatekGPS/hwdef.dat
@ -7,7 +7,7 @@ MCU STM32F303 STM32F303xC
				@@ -7,7 +7,7 @@ MCU STM32F303 STM32F303xC
 FLASH_RESERVE_START_KB 26

 # store parameters in pages 11 and 12
-define STORAGE_FLASH_PAGE 11
+STORAGE_FLASH_PAGE 11
 define HAL_STORAGE_SIZE 800

 # board ID for firmware load
--- a/libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef.inc
+++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef.inc
@ -7,7 +7,7 @@ MCU STM32F303 STM32F303xC
				@@ -7,7 +7,7 @@ MCU STM32F303 STM32F303xC
 FLASH_RESERVE_START_KB 26

 # store parameters in pages 11 and 12
-define STORAGE_FLASH_PAGE 11
+STORAGE_FLASH_PAGE 11
 define HAL_STORAGE_SIZE 800

 # board ID for firmware load
--- a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat
@ -8,7 +8,7 @@ FLASH_RESERVE_START_KB 64
				@@ -8,7 +8,7 @@ FLASH_RESERVE_START_KB 64
 FLASH_SIZE_KB 1024

 # store parameters in pages 11 and 12
-define STORAGE_FLASH_PAGE 1
+STORAGE_FLASH_PAGE 1
 define HAL_STORAGE_SIZE 15360

 # board ID for firmware load
--- a/libraries/AP_HAL_ChibiOS/hwdef/luminousbee5/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/luminousbee5/hwdef.dat
@ -179,7 +179,7 @@ define HAL_STORAGE_SIZE        16384
				@@ -179,7 +179,7 @@ define HAL_STORAGE_SIZE        16384
 define HAL_WITH_RAMTRON 1

 # fallback to flash is no FRAM fitted
-#define STORAGE_FLASH_PAGE 22
+#STORAGE_FLASH_PAGE 22

 # Enable FAT filesystem support (needs a microSD defined via SDMMC).
 define HAL_OS_FATFS_IO 1
--- a/libraries/AP_HAL_ChibiOS/hwdef/mRo-M10095/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/mRo-M10095/hwdef.dat
@ -12,7 +12,7 @@ define CAN_APP_NODE_NAME "io.mrobotics.mRo-M10095"
				@@ -12,7 +12,7 @@ define CAN_APP_NODE_NAME "io.mrobotics.mRo-M10095"
 FLASH_RESERVE_START_KB 30

 # store parameters in pages 13 and 14
-define STORAGE_FLASH_PAGE 13
+STORAGE_FLASH_PAGE 13
 define HAL_STORAGE_SIZE 800

 # setup build for a peripheral firmware
--- a/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroF7/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroF7/hwdef.dat
@ -43,7 +43,7 @@ define HAL_STORAGE_SIZE 32768
				@@ -43,7 +43,7 @@ define HAL_STORAGE_SIZE 32768
 define HAL_WITH_RAMTRON 1

 # fallback storage in case FRAM is not populated
-define STORAGE_FLASH_PAGE 1
+STORAGE_FLASH_PAGE 1

 # USB setup
 USB_STRING_MANUFACTURER "mRo"
--- a/libraries/AP_HAL_ChibiOS/hwdef/mRoX21-777/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/mRoX21-777/hwdef.dat
@ -426,7 +426,7 @@ DMA_PRIORITY USART6*
				@@ -426,7 +426,7 @@ DMA_PRIORITY USART6*
 FLASH_RESERVE_START_KB 96

 # fallback storage in case FRAM is not populated
-define STORAGE_FLASH_PAGE 1
+STORAGE_FLASH_PAGE 1

 # list of files to put in ROMFS. For fmuv3 we need an IO firmware so
 # we can automatically update the IOMCU firmware on boot. The format
--- a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat
@ -126,7 +126,7 @@ define HAL_PROBE_EXTERNAL_I2C_COMPASSES
				@@ -126,7 +126,7 @@ define HAL_PROBE_EXTERNAL_I2C_COMPASSES
 define HAL_I2C_INTERNAL_MASK 0
 define HAL_COMPASS_AUTO_ROT_DEFAULT 2

-define STORAGE_FLASH_PAGE 1
+STORAGE_FLASH_PAGE 1
 define HAL_STORAGE_SIZE 15360

 define HAL_OS_FATFS_IO 1
--- a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat
@ -127,7 +127,7 @@ define HAL_COMPASS_DEFAULT HAL_COMPASS_NONE
				@@ -127,7 +127,7 @@ define HAL_COMPASS_DEFAULT HAL_COMPASS_NONE
 define HAL_PROBE_EXTERNAL_I2C_COMPASSES
 define HAL_I2C_INTERNAL_MASK 0

-define STORAGE_FLASH_PAGE 1
+STORAGE_FLASH_PAGE 1
 define HAL_STORAGE_SIZE 15360


--- a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c/hwdef.dat
@ -125,7 +125,7 @@ PC9 TIM8_CH4 TIM8 PWM(8) GPIO(57)
				@@ -125,7 +125,7 @@ PC9 TIM8_CH4 TIM8 PWM(8) GPIO(57)
 PB7 DRDY_HMC5883 INPUT PULLUP

 define HAL_STORAGE_SIZE 15360
-define STORAGE_FLASH_PAGE 2
+STORAGE_FLASH_PAGE 2

 # reserve 32k for bootloader and 32k for flash storage
 FLASH_RESERVE_START_KB 64
--- a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat
@ -106,7 +106,7 @@ PA0 TIM2_CH1 TIM2 PWM(6) GPIO(55)
				@@ -106,7 +106,7 @@ PA0 TIM2_CH1 TIM2 PWM(6) GPIO(55)
 PB7 DRDY_HMC5883 INPUT PULLUP

 define HAL_STORAGE_SIZE 15360
-define STORAGE_FLASH_PAGE 2
+STORAGE_FLASH_PAGE 2

 # reserve 32k for bootloader and 32k for flash storage
 FLASH_RESERVE_START_KB 64
--- a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat
@ -117,7 +117,7 @@ IMU Invensense SPI:icm20789 ROTATION_NONE
				@@ -117,7 +117,7 @@ IMU Invensense SPI:icm20789 ROTATION_NONE
 define HAL_GPIO_RADIO_IRQ 100

 define HAL_RCINPUT_WITH_AP_RADIO 1
-define STORAGE_FLASH_PAGE	 1
+STORAGE_FLASH_PAGE	 1
 define HAL_STORAGE_SIZE 15360

 # setup defines for ArduCopter config
--- a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-journey/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-journey/hwdef.dat
@ -107,7 +107,7 @@ IMU Invensense I2C:1:0x68 ROTATION_NONE
				@@ -107,7 +107,7 @@ IMU Invensense I2C:1:0x68 ROTATION_NONE
 define HAL_GPIO_RADIO_IRQ 100

 define HAL_RCINPUT_WITH_AP_RADIO 1
-define STORAGE_FLASH_PAGE	 1
+STORAGE_FLASH_PAGE	 1
 define HAL_STORAGE_SIZE 15360

 # setup defines for ArduCopter config
--- a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat
@ -58,7 +58,7 @@ undef PA1
				@@ -58,7 +58,7 @@ undef PA1
 PA1 UART4_RX UART4 NODMA

 # use flash storage
-define STORAGE_FLASH_PAGE 22
+STORAGE_FLASH_PAGE 22

 env DEFAULT_PARAMETERS 'Tools/Frame_params/SkyViper-2450GPS/defaults.parm'

--- a/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat
@ -110,7 +110,7 @@ PA0 TIM2_CH1 TIM2 PWM(6) GPIO(55)
				@@ -110,7 +110,7 @@ PA0 TIM2_CH1 TIM2 PWM(6) GPIO(55)
 PB14 TIM1_CH2N TIM1 PWM(7) GPIO(35)

 define HAL_STORAGE_SIZE 15360
-define STORAGE_FLASH_PAGE 1
+STORAGE_FLASH_PAGE 1

 # reserve 16k for bootloader and 32k for flash storage
 FLASH_RESERVE_START_KB 64
--- a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat
@ -114,7 +114,7 @@ PA15 TIM2_CH1 TIM2 PWM(5) GPIO(54)
				@@ -114,7 +114,7 @@ PA15 TIM2_CH1 TIM2 PWM(5) GPIO(54)
 PA8  TIM1_CH1 TIM1 PWM(6) GPIO(55)

 define HAL_STORAGE_SIZE 15360
-define STORAGE_FLASH_PAGE 2
+STORAGE_FLASH_PAGE 2

 # reserve 32k for bootloader and 32k for flash storage
 FLASH_RESERVE_START_KB 64