From 82c6d2751f4dd66e48f22be16ae366c2d688a27f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 16 Jan 2018 09:17:34 +1100 Subject: [PATCH] HAL_ChibiOS: fixed F412 ram and flash setup --- libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py | 2 +- libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412/hwdef.dat | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py b/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py index 23f6d0b8bc..6914ee52ca 100755 --- a/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py +++ b/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py @@ -308,7 +308,7 @@ def write_ldscript(fname): flash_reserve_end = get_config('FLASH_RESERVE_END_KB', default=0, type=int) # ram size - ram_size = get_config('RAM_SIZE_KB', default=192) + ram_size = get_config('RAM_SIZE_KB', default=192, type=int) flash_base = 0x08000000 + flash_reserve_start*1024 flash_length = flash_size - (flash_reserve_start + flash_reserve_end) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412/hwdef.dat index 895e584fad..60f93c1924 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412/hwdef.dat @@ -23,6 +23,8 @@ STM32_PWM_USE_TIM3 TRUE # board voltage STM32_VDD 330U +RAM_SIZE_KB 256 + # flash size FLASH_SIZE_KB 1024 @@ -91,6 +93,8 @@ SPIDEV cypress SPI1 DEVID1 RADIO_CS MODE0 2*MHZ 2*MHZ SPIDEV cc2500 SPI1 DEVID1 RADIO_CS MODE0 4*MHZ 4*MHZ SPIDEV pixartflow SPI2 DEVID2 FLOW_CS MODE3 2*MHZ 2*MHZ +# reserve 16k for bootloader and 32k for storage +FLASH_RESERVE_START_KB 48 define HAL_CHIBIOS_ARCH_F412 1 @@ -104,5 +108,6 @@ define HAL_GPIO_RADIO_IRQ 2 define HAL_RCINPUT_WITH_AP_RADIO 1 define STORAGE_FLASH_PAGE 1 -define HAL_STORAGE_SIZE 8192 +define HAL_STORAGE_SIZE 16384 +