Merge pull request ARMmbed#103 from juhoeskeli/IOTUC-333

LiyouZhou · web-flow · commit e31ea41e8ec7 · 2018-05-08T17:19:27.000+01:00
Fix for erase size calculation when header is contiguous with app.
diff --git a/source/active_application.cpp b/source/active_application.cpp
@@ -257,7 +257,7 @@ bool eraseActiveFirmware(uint32_t firmwareSize)
     else /* header contiguous with app */
     {
         /* setup erase of the header + application region */
-        size_needed = fw_metadata_hdr_size + firmwareSize;
+        size_needed = (MBED_CONF_APP_APPLICATION_START_ADDRESS - FIRMWARE_METADATA_HEADER_ADDRESS) + firmwareSize;
         erase_start_addr = FIRMWARE_METADATA_HEADER_ADDRESS;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ bool eraseActiveFirmware(uint32_t firmwareSize)`
`257`	`257`	`else /* header contiguous with app */`
`258`	`258`	`{`
`259`	`259`	`/* setup erase of the header + application region */`
`260`		`- size_needed = fw_metadata_hdr_size + firmwareSize;`
	`260`	`+ size_needed = (MBED_CONF_APP_APPLICATION_START_ADDRESS - FIRMWARE_METADATA_HEADER_ADDRESS) + firmwareSize;`
`261`	`261`	`erase_start_addr = FIRMWARE_METADATA_HEADER_ADDRESS;`
`262`	`262`	`}`
`263`	`263`