add check for boatloader id in cf2 config

Author: hathach

src/boards/feather_nrf52840_express/pinconfig.c

@@ -0,0 +1,25 @@
+#include "boards.h"
+#include "uf2/configkeys.h"
+
+__attribute__((used, section(".bootloaderConfig")))
+const uint32_t bootloaderConfig[] =
+{
+  /* CF2 START */
+  CFG_MAGIC0, CFG_MAGIC1,                       // magic
+  32, 100,                                      // used entries, total entries
+
+#ifdef LED_NEOPIXEL
+  20, LED_NEOPIXEL,                             // PIN_NEOPIXEL
+  200, NEOPIXELS_NUMBER,                        // NUM_NEOPIXELS
+#endif
+
+  204, 0x100000,                                // FLASH_BYTES = 0x100000
+  205, 0x40000,                                 // RAM_BYTES = 0x40000
+  CFG_BOOTLOADER_BOARD_ID, (USB_DESC_VID << 16) | USB_DESC_UF2_PID,
+  209, 0xada52840,                              // UF2_FAMILY = 0xada52840
+  210, 0x20,                                    // PINS_PORT_SIZE = PA_32
+
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  /* CF2 END */
+};

src/flash_nrf5x.c

@@ -47,7 +47,7 @@ void flash_nrf5x_flush (bool need_erase)
     // Note: MSC uf2 does not erase page in advance like dfu serial
     if ( need_erase )
     {
-      PRINTF("Erase 0x%08lX\r\n", _fl_addr);
+      PRINTF("Erase and ");
       nrfx_nvmc_page_erase(_fl_addr);
     }
 

src/usb/uf2/ghostfat.c

@@ -1,6 +1,7 @@
 #include "compile_date.h"
 
 #include "uf2.h"
+#include "configkeys.h"
 #include "flash_nrf5x.h"
 #include <string.h>
 
@@ -140,6 +141,10 @@ static FAT_BootBlock const BootBlock = {
     .FilesystemIdentifier = "FAT16   ",
 };
 
+// Use bootloaderConfig to detect BOOTLOADER ID when updating bootloader
+// This helps to prevent incorrect uf2 from other boards.
+extern const uint32_t bootloaderConfig[];
+
 //--------------------------------------------------------------------+
 //
 //--------------------------------------------------------------------+
@@ -406,6 +411,37 @@ int write_block (uint32_t block_no, uint8_t *data, WriteState *state)
       }
       else if ( in_bootloader_space(bl->targetAddr) )
       {
+        // Bootloader CF2 config
+        if ( !state->boot_id_matches && (bl->targetAddr >= ((uint32_t) bootloaderConfig)) )
+        {
+          // check if bootloader ID matches current VID/PID
+          for (uint32_t i=0; i < bl->payloadSize; i += 8)
+          {
+            uint32_t key;
+            memcpy(&key, bl->data+i, 4);
+
+            if ( key == CFG_BOOTLOADER_BOARD_ID )
+            {
+              uint32_t value;
+              memcpy(&value, bl->data+i+4, 4);
+
+              PRINTF("Bootloader ID = 0x%08lX and ", value);
+              if ( value == ((USB_DESC_VID << 16) | USB_DESC_UF2_PID) )
+              {
+                PRINTF("matches our VID/PID\r\n");
+                state->boot_id_matches = true;
+                break;
+              }
+              else
+              {
+                PRINTF("DOES NOT mismatches our VID/PID\r\n");
+                state->aborted = true;
+                return -1;
+              }
+            }
+          }
+        }
+
         // Offset to write the new bootloader address (skipping the App Data)
         uint32_t const offset_addr = BOOTLOADER_ADDR_END-USER_FLASH_END;
         flash_nrf5x_write(bl->targetAddr-offset_addr, bl->data, bl->payloadSize, true);

src/usb/uf2/uf2.h

@@ -56,6 +56,7 @@ typedef struct {
     bool aborted;             // aborting update and reset
     bool update_bootloader;   // if updating bootloader (else app)
     bool has_uicr;            // if containing uicr data
+    bool boot_id_matches;     // if bootloader id in cf2 config matches our VID/PID
 
     uint8_t writtenMask[MAX_BLOCKS / 8 + 1];
 } WriteState;