change bootloader family id to random generated value of 0xd663823c

Author: hathach

Makefile

@@ -355,7 +355,7 @@ $(BUILD)/$(OUT_FILE)-nosd.hex: $(BUILD)/$(OUT_FILE).hex
 # Bootolader only uf2
 $(BUILD)/$(OUT_FILE)-nosd.uf2: $(BUILD)/$(OUT_FILE)-nosd.hex
 	@echo CR $(notdir $@)
-	python lib/uf2/utils/uf2conv.py -f 0x239A0029 -c -o $@ $^
+	python lib/uf2/utils/uf2conv.py -f 0xd663823c -c -o $@ $^
 
 # merge bootloader and sd hex together
 $(BUILD)/$(MERGED_FILE).hex: $(BUILD)/$(OUT_FILE).hex

src/usb/uf2/configkeys.h

@@ -7,8 +7,6 @@
 #define CFG_PIN_NAME_MSK 0xffff
 #define CFG_PIN_CONFIG_MSK 0xffff0000
 #define CFG_PIN_CONFIG_ACTIVE_LO 0x10000
-#define CFG_MAGIC0 0x1e9e10f1
-#define CFG_MAGIC1 0x20227a79
 #define CFG_PIN_ACCELEROMETER_INT 1
 #define CFG_PIN_ACCELEROMETER_SCL 2
 #define CFG_PIN_ACCELEROMETER_SDA 3

src/usb/uf2/ghostfat.c

@@ -279,7 +279,7 @@ void read_block(uint32_t block_no, uint8_t *data) {
                 bl->targetAddr = addr;
                 bl->payloadSize = 256;
                 bl->flags = UF2_FLAG_FAMILYID;
-                bl->familyID = CFG_UF2_FAMILY_ID;
+                bl->familyID = CFG_UF2_FAMILY_APP_ID;
                 memcpy(bl->data, (void *)addr, bl->payloadSize);
             }
         }
@@ -305,7 +305,7 @@ int write_block (uint32_t block_no, uint8_t *data, WriteState *state)
 
   switch ( bl->familyID )
   {
-    case CFG_UF2_FAMILY_ID:
+    case CFG_UF2_FAMILY_APP_ID:
       /* Upgrading Application
        *
        * SoftDevice is considered as part of application and can be (or not) included in uf2.
@@ -339,7 +339,7 @@ int write_block (uint32_t block_no, uint8_t *data, WriteState *state)
       }
     break;
 
-    case CFG_UF2_BOOTLOADER_ID:
+    case CFG_UF2_FAMILY_BOOT_ID:
       /* Upgrading Bootloader
        *
        * - For simplicity, the Bootloader Start Address is fixed for now.

src/usb/uf2/uf2cfg.h

@@ -1,8 +1,11 @@
 #include "boards.h"
 #include "dfu_types.h"
 
-#define CFG_UF2_FAMILY_ID         0xADA52840
-#define CFG_UF2_BOOTLOADER_ID     ((USB_DESC_VID << 16) | USB_DESC_UF2_PID)
+// Family ID for updating Application
+#define CFG_UF2_FAMILY_APP_ID     0xADA52840
+
+// Family ID for updating Bootloader
+#define CFG_UF2_FAMILY_BOOT_ID    0xd663823c
 
 #define CFG_UF2_NUM_BLOCKS        8000        // at least 4,1 MB for FAT16
 #define CFG_UF2_FLASH_SIZE        (1024*1024) // 1 MB
@@ -11,9 +14,6 @@
 #define USER_FLASH_START          MBR_SIZE // skip MBR included in SD hex
 #define USER_FLASH_END            0xAD000
 
-// Due to SD_MBR_COMMAND_COPY_BL, bootloader start address cannot
-// be changed with DFU, and only done with a debugger
-
 // Bootloader start address
 #define BOOTLOADER_ADDR_START         BOOTLOADER_REGION_START