diff --git a/Tools/AP_Bootloader/AP_Bootloader.cpp b/Tools/AP_Bootloader/AP_Bootloader.cpp
index 96023a1bef..e028f7c28b 100644
--- a/Tools/AP_Bootloader/AP_Bootloader.cpp
+++ b/Tools/AP_Bootloader/AP_Bootloader.cpp
@@ -37,7 +37,11 @@ extern "C" {
     int main(void);
 }
 
-struct boardinfo board_info;
+struct boardinfo board_info = {
+    .board_type = APJ_BOARD_ID,
+    .board_rev = 0,
+    .fw_size = (BOARD_FLASH_SIZE - (FLASH_BOOTLOADER_LOAD_KB + FLASH_RESERVE_END_KB + APP_START_OFFSET_KB))*1024
+};
 
 #ifndef HAL_BOOTLOADER_TIMEOUT
 #define HAL_BOOTLOADER_TIMEOUT 5000
@@ -49,9 +53,6 @@ struct boardinfo board_info;
 
 int main(void)
 {
-    board_info.board_type = APJ_BOARD_ID;
-    board_info.board_rev = 0;
-    board_info.fw_size = (BOARD_FLASH_SIZE - (FLASH_BOOTLOADER_LOAD_KB + FLASH_RESERVE_END_KB + APP_START_OFFSET_KB))*1024;
     if (BOARD_FLASH_SIZE > 1024 && check_limit_flash_1M()) {
         board_info.fw_size = (1024 - (FLASH_BOOTLOADER_LOAD_KB + APP_START_OFFSET_KB))*1024;
     }