read back full app size for simplicity

Author: hathach

lib/sdk11/components/libraries/bootloader_dfu/bootloader.c

@@ -196,7 +196,7 @@ void bootloader_dfu_update_process(dfu_update_status_t update_status)
     {
         settings.bank_0_crc  = update_status.app_crc;
         settings.bank_0_size = update_status.app_size;
-        settings.bank_0      = (update_status.app_size ? BANK_VALID_APP : BANK_INVALID_APP);
+        settings.bank_0      = BANK_VALID_APP;
         settings.bank_1      = BANK_INVALID_APP;
 
         m_update_status      = BOOTLOADER_SETTINGS_SAVING;

src/usb/msc_uf2.c

@@ -184,25 +184,6 @@ void tud_msc_write10_complete_cb(uint8_t lun)
       {
         // update App
         update_status.status_code = DFU_UPDATE_APP_COMPLETE;
-        update_status.app_crc     = 0; // skip CRC checking with uf2 upgrade
-        update_status.app_size    = _wr_state.numBlocks*256;
-
-        if ( _wr_state.has_sd && is_sd_existed() )
-        {
-          /* Since the Bootloader Setting still needs to know the SD and App size separately
-           * to stay compatible with DFU CDC interface. We re-calculate it based on written
-           * address and its contents ( SD_MAGIC matches )
-           */
-          update_status.app_size -= (SD_SIZE_GET(MBR_SIZE) - MBR_SIZE);
-        }
-
-        if ( _wr_state.has_mbr )
-        {
-          // MBR write isn't counted app size as well
-          update_status.app_size -= MBR_SIZE;
-        }
-
-        PRINT_INT(update_status.app_size);
       }
 
       bootloader_dfu_update_process(update_status);

src/usb/uf2/ghostfat.c

@@ -183,27 +183,8 @@ static uint32_t current_flash_size(void)
     flash_sz = 256;
   }else
   {
-    bootloader_settings_t const * boot_setting;
-    bootloader_util_settings_get(&boot_setting);
-
-    flash_sz = boot_setting->bank_0_size;
-
-    // Include SoftDevice (excluding MBR) for current.uf2
-    if ( is_sd_existed() ) flash_sz += (SD_SIZE_GET(MBR_SIZE) - MBR_SIZE);
-
-    // Copy size must be multiple of 256 bytes
-    // else we will got an issue copying current.uf2
-    if (flash_sz & 0xff)
-    {
-      flash_sz = (flash_sz & ~0xff) + 256;
-    }
-
-    // if bank0 size is not valid, happens when flashed with jlink
-    // use maximum application size
-    if ( (flash_sz == 0) || (flash_sz == 0xFFFFFFFFUL) )
-    {
-      flash_sz = (USER_FLASH_END-USER_FLASH_START);
-    }
+    // Use full application size for simplicity
+    flash_sz = (USER_FLASH_END-USER_FLASH_START);
   }
 
   return flash_sz;