Move FlashIAP declaration from dfu to default_bd

pennam · pennam · commit 6f0efd375f19 · 2022-04-05T09:47:08.000+02:00
diff --git a/app/dfu/usbd_dfu_flash.cpp b/app/dfu/usbd_dfu_flash.cpp
@@ -53,7 +53,7 @@ uint8_t *Flash_If_Read(uint8_t * src, uint8_t * dest, uint32_t Len);
 uint16_t Flash_If_DeInit(void);
 uint16_t Flash_If_GetStatus(uint32_t Add, uint8_t Cmd, uint8_t * buffer);
 
-FlashIAP flash;
+extern FlashIAP flash;
 mbed::BlockDevice* qspi_flash = mbed::BlockDevice::get_default_instance();
 mbed::BlockDevice* dfu_secondary_bd = get_secondary_bd();
 
diff --git a/default_bd.cpp b/default_bd.cpp
@@ -393,6 +393,8 @@ mbed::BlockDevice* BlockDevice::get_default_instance()
     return &default_bd;
 }
 
+FlashIAP flash;
+
 #else // MCUBOOT_APPLICATION_HOOKS
 
 #include "BlockDevice.h"

Original file line number	Diff line number	Diff line change
`@@ -393,6 +393,8 @@ mbed::BlockDevice* BlockDevice::get_default_instance()`
`393`	`393`	`return &default_bd;`
`394`	`394`	`}`
`395`	`395`
	`396`	`+FlashIAP flash;`
	`397`	`+`
`396`	`398`	`#else // MCUBOOT_APPLICATION_HOOKS`
`397`	`399`
`398`	`400`	`#include "BlockDevice.h"`