mark app as invalid when updating Softdevice only as application in uf2 mode

able to flash combine SD + cpy as single uf2. still has issue writing
back CURRENT.UF2

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      = BANK_VALID_APP;
+        settings.bank_0      = (update_status.app_size ? BANK_VALID_APP : BANK_INVALID_APP);
         settings.bank_1      = BANK_INVALID_APP;
 
         m_update_status      = BOOTLOADER_SETTINGS_SAVING;

lib/sdk11/components/libraries/bootloader_dfu/dfu_types.h

@@ -138,7 +138,8 @@ typedef enum
     DFU_UPDATE_BOOT_COMPLETE,                                                                           /**< Status update complete.*/
     DFU_BANK_0_ERASED,                                                                                  /**< Status bank 0 erased.*/
     DFU_TIMEOUT,                                                                                        /**< Status timeout.*/
-    DFU_RESET                                                                                           /**< Status Reset to indicate current update procedure has been aborted and system should reset. */
+    DFU_RESET,                                                                                           /**< Status Reset to indicate current update procedure has been aborted and system should reset. */
+    DFU_UF2_BOOTLOADER_COMPLETE
 } dfu_update_status_code_t;
 
 /**@brief Structure holding DFU complete event.

src/usb/msc_uf2.c

@@ -183,7 +183,7 @@ void tud_msc_write10_complete_cb(uint8_t lun)
       }else
       {
         // update App
-        update_status.status_code = DFU_UF2_APP_COMPLETE;
+        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;
 
@@ -193,8 +193,16 @@ void tud_msc_write10_complete_cb(uint8_t lun)
            * 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);
+          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

@@ -212,6 +212,7 @@ static uint32_t current_flash_size(void)
 void uf2_init(void)
 {
   uf2current_flash_sz = current_flash_size();
+  PRINT_INT(uf2current_flash_sz);
 }
 
 /*------------------------------------------------------------------*/
@@ -348,7 +349,7 @@ int write_block (uint32_t block_no, uint8_t *data, WriteState *state)
       /* Upgrading Application
        *
        * Although SoftDevice is considered as part of application and the flashing is the same with/without it.
-       * There are still 3 cases with slight differences in finishing procedure:
+       * There are still 4 cases with slight differences in finishing procedure:
        *  1. Application with SoftDevice:
        *      - starting address 0x0000
        *      - since MBR is included in SD Hex file (then uf2 file), we must skip it
@@ -357,6 +358,8 @@ int write_block (uint32_t block_no, uint8_t *data, WriteState *state)
        *      - starting address is right after SD e.g 0x26000
        *    b. For running without SoftDevice e.g using other stack such as nimble or zephyr.
        *      - starting address is right after MBR 0x1000
+       *  3. SoftDevice only, should user somehow only flash with SD only. Bootloader mark app as invalid and wiil
+       *  back on bootloader mode after reset.
        *
        *                          -------------         -------------
        *                         |             |       |             |
@@ -377,13 +380,17 @@ int write_block (uint32_t block_no, uint8_t *data, WriteState *state)
         PRINTF("Write addr = 0x%08lX, block = %ld (%ld of %ld)\r\n", bl->targetAddr, bl->blockNo, state->numWritten, bl->numBlocks);
 
         // writing to SD Info struct is used as SD detector
-        if (bl->targetAddr == (SOFTDEVICE_INFO_STRUCT_ADDRESS & 0xff) ) state->has_sd = true;
+        if (bl->targetAddr == (SOFTDEVICE_INFO_STRUCT_ADDRESS & 0xFFFFFF00) )
+        {
+          state->has_sd = true;
+        }
 
         flash_nrf5x_write(bl->targetAddr, bl->data, bl->payloadSize, true);
       }else if ( bl->targetAddr < USER_FLASH_START )
       {
         // do nothing if writing to MBR
         // keep going as successful write
+        state->has_mbr = true;
       }else
       {
         return -1;

src/usb/uf2/uf2.h

@@ -52,7 +52,8 @@ SOFTWARE.
 typedef struct {
     uint32_t numBlocks;
     uint32_t numWritten;
-    bool has_sd;            // if SD is included as part of uf2 file
+    bool has_sd;            // if uf2 includes SD
+    bool has_mbr;           // if uf2 includes MBR
     bool update_bootloader; // if updating bootloader
     uint8_t writtenMask[MAX_BLOCKS / 8 + 1];
 } WriteState;