Merge pull request #38 from bcmi-labs/dfu_entry

Add dedicated dfu entry to upload MCUBoot update

Author: pennam

envie_dfu/usbd_conf.h

@@ -38,7 +38,7 @@
 #define USBD_DEBUG_LEVEL                      0
 
 /* DFU Class Config */
-#define USBD_DFU_MAX_ITF_NUM                   3
+#define USBD_DFU_MAX_ITF_NUM                   4
 #define USBD_DFU_XFER_SIZE                     4096   /* Max DFU Packet Size = 4096 bytes */
 #define USBD_DFU_APP_DEFAULT_ADD               0x08040000 /* The first sector (32 KB) is reserved for DFU code */
 #define USBD_DFU_MAX_NB_OF_SECTORS             16 /* Max number of sectors */

envie_dfu/usbd_dfu_flash.cpp

@@ -33,7 +33,8 @@
 /* Private define ------------------------------------------------------------ */
 #define FLASH_DESC_STR      "@Internal Flash  2MB   /0x08000000/01*128Ka,15*128Kg"
 //#define BOOTLOADER_DESC_STR    "@Option Bits      /0x52002000/01*1Ka"
-#define QSPI_FLASH_DESC_STR "@External Flash 16MB   /0x90000000/16*128Kg"
+#define QSPI_FLASH_DESC_STR "@Ext RAW  Flash 16MB   /0x90000000/4096*4Kg"
+#define FILE_FLASH_DESC_STR "@Ext File Flash 16MB   /0xA0000000/16*128Kg"
 
 #define FLASH_ERASE_TIME    (uint16_t)0
 #define FLASH_PROGRAM_TIME  (uint16_t)0
@@ -54,14 +55,17 @@ uint16_t Flash_If_DeInit(void);
 uint16_t Flash_If_GetStatus(uint32_t Add, uint8_t Cmd, uint8_t * buffer);
 
 FlashIAP flash;
+QSPIFBlockDevice qspi_flash(PD_11, PD_12, PF_7, PD_13, PF_10, PG_6, QSPIF_POLARITY_MODE_1, 40000000);
 mbed::BlockDevice* dfu_secondary_bd = get_secondary_bd();
 
 const uint32_t QSPIFLASH_BASE_ADDRESS   =  0x90000000;
+const uint32_t FILEBLOCK_BASE_ADDRESS   =  0xA0000000;
 
 USBD_DFU_MediaTypeDef USBD_DFU_Flash_fops = {
   {
 		  (uint8_t *) FLASH_DESC_STR,
 		  (uint8_t *) QSPI_FLASH_DESC_STR,
+      (uint8_t *) FILE_FLASH_DESC_STR,
       (uint8_t *) BOOTLOADER_DESC_STR
   },
   Flash_If_Init,
@@ -76,6 +80,7 @@ bool Flash_If_Init_requested = false;
 
 void init_Memories() {
   flash.init();
+  qspi_flash.init();
   dfu_secondary_bd->init();
   snprintf(BOOTLOADER_DESC_STR, sizeof(BOOTLOADER_DESC_STR), "@MCUBoot version %d /0x00000000/0*4Kg", BOOTLOADER_VERSION);
 }
@@ -112,16 +117,23 @@ static bool isExternalFlash(uint32_t Add) {
 	return (Add >= QSPIFLASH_BASE_ADDRESS);
 }
 
+static bool isFileBlockFlash(uint32_t Add) {
+	return (Add >= FILEBLOCK_BASE_ADDRESS);
+}
+
 /**
   * @brief  Erases sector.
   * @param  Add: Address of sector to be erased.
   * @retval 0 if operation is successful, MAL_FAIL else.
   */
 uint16_t Flash_If_Erase(uint32_t Add)
 {
-  if (isExternalFlash(Add)) {
-    Add -= QSPIFLASH_BASE_ADDRESS;
+  if (isFileBlockFlash(Add)) {
+    Add -= FILEBLOCK_BASE_ADDRESS;
     return dfu_secondary_bd->erase(Add, dfu_secondary_bd->get_erase_size(Add));
+  } else if (isExternalFlash(Add)) {
+    Add -= QSPIFLASH_BASE_ADDRESS;
+    return qspi_flash.erase(Add, qspi_flash.get_erase_size(Add));
   } else {
     return flash.erase(Add, flash.get_sector_size(Add));
   }
@@ -148,12 +160,18 @@ void delayed_write(struct writeInfo* info) {
   */
 uint16_t Flash_If_Write(uint8_t * src, uint8_t * dest, uint32_t Len)
 {
-  if (isExternalFlash((uint32_t)dest)) {
-    dest -= QSPIFLASH_BASE_ADDRESS;
+  if (isFileBlockFlash((uint32_t)dest)) {
+    dest -= FILEBLOCK_BASE_ADDRESS;
     if (Len < dfu_secondary_bd->get_erase_size(0)) {
       Len = dfu_secondary_bd->get_erase_size(0);
     }
     return dfu_secondary_bd->program(src, (uint32_t)dest, Len);
+  } else if (isExternalFlash((uint32_t)dest)) {
+    dest -= QSPIFLASH_BASE_ADDRESS;
+    if (Len < qspi_flash.get_erase_size(0)) {
+      Len = qspi_flash.get_erase_size(0);
+    }
+    return qspi_flash.program(src, (uint32_t)dest, Len);
   } else {
     uint8_t* srcCopy = (uint8_t*)malloc(Len);
     memcpy(srcCopy, src, Len);
@@ -178,9 +196,12 @@ uint8_t *Flash_If_Read(uint8_t * src, uint8_t * dest, uint32_t Len)
   uint32_t i = 0;
   uint8_t *psrc = src;
 
-  if (isExternalFlash((uint32_t)src)) {
-    src -= QSPIFLASH_BASE_ADDRESS;
+  if (isFileBlockFlash((uint32_t)src)) {
+    src -= FILEBLOCK_BASE_ADDRESS;
     dfu_secondary_bd->read(dest, (uint32_t)src, Len);
+  } else if (isExternalFlash((uint32_t)src)) {
+    src -= QSPIFLASH_BASE_ADDRESS;
+    qspi_flash.read(dest, (uint32_t)src, Len);
   } else {
     for (i = 0; i < Len; i++)
     {