more update

Author: hathach

Makefile

@@ -340,7 +340,7 @@ erase:
 # flash SD only
 sd:
 	@echo Flashing: $(SD_HEX)
-	$(NRFJPROG) --program $(SD_HEX) -f nrf52 --chiperase  --reset
+	$(NRFJPROG) --program $(SD_HEX) -f nrf52 --sectorerase  --reset
 
 # flash MBR only
 mbr:

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

@@ -33,13 +33,16 @@
 #define SD_MAGIC_NUMBER 0x51B1E5DB
 #endif
 
-#define SD_MAGIC_OK() (*((uint32_t*)(SOFTDEVICE_INFO_STRUCT_ADDRESS+4)) == SD_MAGIC_NUMBER)
+static inline bool is_sd_existed(void)
+{
+  return *((uint32_t*)(SOFTDEVICE_INFO_STRUCT_ADDRESS+4)) == SD_MAGIC_NUMBER;
+}
 
 #define NRF_UICR_BOOT_START_ADDRESS         (NRF_UICR_BASE + 0x14)      /**< Register where the bootloader start address is stored in the UICR register. */
 #define NRF_UICR_MBR_PARAMS_PAGE_ADDRESS    (NRF_UICR_BASE + 0x18)      /**< Register where the mbr params page is stored in the UICR register. (Only in use in nRF52 MBR).*/
 
 // TODO more testing/checking
-#define CODE_REGION_1_START                 (SD_MAGIC_OK() ? SD_SIZE_GET(MBR_SIZE) : MBR_SIZE)       /**< This field should correspond to the size of Code Region 0, (which is identical to Start of Code Region 1), found in UICR.CLEN0 register. This value is used for compile safety, as the linker will fail if application expands into bootloader. Runtime, the bootloader will use the value found in UICR.CLEN0. */
+#define CODE_REGION_1_START                 (is_sd_existed() ? SD_SIZE_GET(MBR_SIZE) : MBR_SIZE)       /**< This field should correspond to the size of Code Region 0, (which is identical to Start of Code Region 1), found in UICR.CLEN0 register. This value is used for compile safety, as the linker will fail if application expands into bootloader. Runtime, the bootloader will use the value found in UICR.CLEN0. */
 #define SOFTDEVICE_REGION_START             MBR_SIZE                    /**< This field should correspond to start address of the bootloader, found in UICR.RESERVED, 0x10001014, register. This value is used for sanity check, so the bootloader will fail immediately if this value differs from runtime value. The value is used to determine max application size for updating. */
 #define CODE_PAGE_SIZE                      0x1000                      /**< Size of a flash codepage. Used for size of the reserved flash space in the bootloader region. Will be runtime checked against NRF_UICR->CODEPAGESIZE to ensure the region is correct. */
 

src/boards.h

@@ -119,7 +119,7 @@ bool is_ota(void);
 #define PRINT_MESS(x)         printf("%s: %d: %s \n"   , __FUNCTION__, __LINE__, (char*)(x))
 #define PRINT_STR(x)          printf("%s: %d: " #x " = %s\n"   , __FUNCTION__, __LINE__, (char*)(x) )
 #define PRINT_INT(x)          printf("%s: %d: " #x " = %ld\n"  , __FUNCTION__, __LINE__, (uint32_t) (x) )
-#define PRINT_HEX(x)          printf("%s: %d: " #x " = 0x%X\n"  , __FUNCTION__, __LINE__, (uint32_t) (x) )
+#define PRINT_HEX(x)          printf("%s: %d: " #x " = 0x%lX\n"  , __FUNCTION__, __LINE__, (uint32_t) (x) )
 
 #define PRINT_BUFFER(buf, n) \
   do {\

src/usb/uf2/uf2cfg.h

@@ -8,16 +8,11 @@
 #define CFG_UF2_FLASH_SIZE              (1024*1024) // 1 MB
 
 // Softdevice Address Space
-#define CFG_UF2_SOFTDEVICE_ADDR_START   0
-#define CFG_UF2_SOFTDEVICE_ADDR_END     USER_FLASH_START
+#define CFG_UF2_SOFTDEVICE_ADDR_START   MBR_SIZE // skip MBR included in SD hex
+#define CFG_UF2_SOFTDEVICE_ADDR_END     SD_SIZE_GET(MBR_SIZE)
 
 // Application Address Space
-#ifdef SOFTDEVICE_PRESENT
-  #define USER_FLASH_START   (SD_FLASH_SIZE + MBR_SIZE)
-#else
-  #define USER_FLASH_START   0x1000 // MBR is still required
-#endif
-
+#define USER_FLASH_START                MBR_SIZE // skip MBR included in SD hex
 #define USER_FLASH_END                  0xAD000
 
 // Bootloader Address Space

src/usb/usb.c

@@ -66,7 +66,7 @@ void usb_init(bool cdc_only)
 #ifdef SOFTDEVICE_PRESENT
   uint8_t sd_en = false;
 
-  if ( SD_MAGIC_OK() )
+  if ( is_sd_existed() )
   {
     sd_softdevice_is_enabled(&sd_en);
   }