Bootloader and also boards.txt, so that its backwards compatible with the original bootloader. The new bootloader now has an additional altID for the new upload type (ID2) which is set in boards.txt for the maple mini on the Bootloader version menu. Note there was also a bug in the old version of boards.txt where the upload size params were not being set by the Bootloader version menu. Binaries folder has also been updated with the revised bootloader

Author: rogerclarkmelbourne

STM32F1/boards.txt

@@ -18,15 +18,13 @@ maple_mini.upload.file_type=bin
 
 
 maple_mini.upload.usbID=1EAF:0003
-maple_mini.upload.altID=1
 maple_mini.upload.auto_reset=true
 
 maple_mini.build.mcu=cortex-m3
 maple_mini.build.f_cpu=72000000L
 maple_mini.build.board=MAPLE_MINI
 maple_mini.build.core=maple
 maple_mini.build.extra_flags=-DMCU_STM32F103CB -mthumb  -DSERIAL_USB -march=armv7-m -D__STM32F1__ 
-maple_mini.build.ldscript=ld/flash.ld
 maple_mini.build.variant=maple_mini
 maple_mini.build.variant_system_lib=libmaple.a
 maple_mini.build.density=STM32_MEDIUM_DENSITY
@@ -37,16 +35,18 @@ maple_mini.build.gcc_ver=gcc-arm-none-eabi-4.8.3-2014q1
 maple_mini.menu.bootloader_version.original = Original
 maple_mini.menu.bootloader_version.original.build.vect=VECT_TAB_ADDR=0x8005000
 maple_mini.menu.bootloader_version.original.build.ldscript=ld/flash.ld
-maple_mini.menu.bootloader_version.upload.ram.maximum_size=17408
-maple_mini.menu.bootloader_version.upload.flash.maximum_size=110592
-maple_mini.menu.bootloader_version.upload.maximum_size=110592
+maple_mini.menu.bootloader_version.originalupload.ram.maximum_size=17408
+maple_mini.menu.bootloader_version.original.upload.flash.maximum_size=110592
+maple_mini.menu.bootloader_version.original.upload.maximum_size=110592
+maple_mini.menu.bootloader_version.original.upload.altID=1
 
 maple_mini.menu.bootloader_version.bootloader20 = Bootloader 2.0
 maple_mini.menu.bootloader_version.bootloader20.build.vect=VECT_TAB_ADDR=0x8002000
 maple_mini.menu.bootloader_version.bootloader20.build.ldscript=ld/bootloader_20.ld
-maple_mini.menu.bootloader_version.upload.ram.maximum_size=20480
-maple_mini.menu.bootloader_version.upload.flash.maximum_size=122880
-maple_mini.menu.bootloader_version.upload.maximum_size=122880
+maple_mini.menu.bootloader_version.bootloader20.upload.ram.maximum_size=20480
+maple_mini.menu.bootloader_version.bootloader20.upload.flash.maximum_size=122880
+maple_mini.menu.bootloader_version.bootloader20.upload.maximum_size=122880
+maple_mini.menu.bootloader_version.bootloader20.upload.altID=2
 
 ##############################################################
 maple.name=LeafLabs Maple Rev 3+ to Flash

usb_bootloader/STM32F1/binaries/maple_mini_boot20.bin

@@ -64,10 +64,11 @@
 #define STARTUP_BLINKS 5
 #define BOOTLOADER_WAIT 6
 
-#define USER_CODE_RAM     ((u32)0x20000C00)
-#define RAM_END           ((u32)0x20005000)
-#define USER_CODE_FLASH   ((u32)0x08002000)
-#define FLASH_END         ((u32)0x08020000)
+#define USER_CODE_RAM     			((u32)0x20000C00)
+#define RAM_END           			((u32)0x20005000)
+#define USER_CODE_FLASH0X8005000   	((u32)0x08005000)
+#define USER_CODE_FLASH0X8002000	((u32)0x08002000)
+#define FLASH_END         			((u32)0x08020000)
 
 #define VEND_ID0 0xAF
 #define VEND_ID1 0x1E

usb_bootloader/STM32F1/config.h

@@ -38,7 +38,7 @@
 static volatile u32 userAppAddr = USER_CODE_RAM; /* default RAM user code location */
 static volatile u32 userAppEnd = RAM_END;
 static volatile DFUStatus dfuAppStatus;       /* includes state */
-static volatile bool userFlash = FALSE;
+volatile dfuUploadTypes_t userUploadType = DFU_UPLOAD_NONE;
 volatile bool dfuBusy = FALSE;
 
 static volatile u8 recvBuffer[wTransferSize] __attribute__((aligned(4)));
@@ -61,7 +61,7 @@ void dfuInit(void) {
     thisBlockLen = 0;;
     userAppAddr = USER_CODE_RAM; /* default RAM user code location */
     userAppEnd = RAM_END;
-    userFlash = FALSE;
+    userUploadType=DFU_UPLOAD_RAM;
     code_copy_lock = WAIT;
     dfuBusy = FALSE;
 }
@@ -83,19 +83,34 @@ bool dfuUpdateByRequest(void) {
             if (pInformation->USBwLengths.w > 0) {
                 userFirmwareLen = 0;
                 dfuAppStatus.bState  = dfuDNLOAD_SYNC;
-
-                if (pInformation->Current_AlternateSetting == 1) {
-                    userAppAddr = USER_CODE_FLASH;
-                    userFlash = TRUE;
-
-                    /* make sure the flash is setup properly, unlock it */
-                    setupFLASH();
-                    flashUnlock();
-
-                } else {
-                    userAppAddr = USER_CODE_RAM;
-                    userFlash = FALSE;
-                }
+				switch(pInformation->Current_AlternateSetting)
+				{
+					case 0:
+					    userAppAddr = USER_CODE_RAM;
+						userUploadType = DFU_UPLOAD_RAM;
+						break;
+					case 1:
+					    userAppAddr = USER_CODE_FLASH0X8005000;
+						userUploadType = DFU_UPLOAD_FLASH_0X8005000;
+						
+						/* make sure the flash is setup properly, unlock it */
+						setupFLASH();
+						flashUnlock();
+						// Clear lower memory so that we can check on cold boot, whether the last upload was to 0x8002000 or 0x8005000
+						flashErasePage((u32)USER_CODE_FLASH0X8002000);
+						break;
+					case 2:
+						userUploadType = DFU_UPLOAD_FLASH_0X8002000;
+						userAppAddr = USER_CODE_FLASH0X8002000;
+						/* make sure the flash is setup properly, unlock it */
+						setupFLASH();
+						flashUnlock();
+						break;
+					default:
+					    userAppAddr = USER_CODE_RAM;
+						userUploadType = DFU_UPLOAD_RAM;
+						break;
+				}
             } else {
                 dfuAppStatus.bState  = dfuERROR;
                 dfuAppStatus.bStatus = errNOTDONE;
@@ -108,13 +123,24 @@ bool dfuUpdateByRequest(void) {
             thisBlockLen = uploadBlockLen; /* for this first block as well */
             /* calculate where the data should be copied from */
             userFirmwareLen = uploadBlockLen * pInformation->USBwValue;
-            if (pInformation->Current_AlternateSetting == 1) {
-                userAppAddr = USER_CODE_FLASH;
-                userAppEnd = FLASH_END;
-            } else {
-                userAppAddr = USER_CODE_RAM;
-                userAppEnd = RAM_END;
-            }
+			switch(pInformation->Current_AlternateSetting)
+			{
+				case 0:
+					userAppAddr = USER_CODE_RAM;
+					userAppEnd = RAM_END;
+				case 1:
+				    userAppAddr = USER_CODE_FLASH0X8005000;
+					userAppEnd = FLASH_END;
+					break;
+				case 2: 
+				    userAppAddr = USER_CODE_FLASH0X8002000;
+					userAppEnd = FLASH_END;
+					break;
+				default:
+					userAppAddr = USER_CODE_RAM;
+					userAppEnd = RAM_END;
+					break;					
+			}
         } else if (pInformation->USBbRequest == DFU_ABORT) {
             dfuAppStatus.bState  = dfuIDLE;
             dfuAppStatus.bStatus = OK;  /* are we really ok? we were just aborted */
@@ -132,7 +158,7 @@ bool dfuUpdateByRequest(void) {
 
         if (pInformation->USBbRequest == DFU_GETSTATUS) {
             /* todo, add routine to wait for last block write to finish */
-            if (userFlash) {
+            if (userUploadType == DFU_UPLOAD_RAM) {
                 if (code_copy_lock == WAIT) {
                     code_copy_lock = BEGINNING;
                     dfuAppStatus.bwPollTimeout0 = 0x20; /* 32 ms */
@@ -358,15 +384,25 @@ void dfuCopyBufferToExec() {
     int i;
     u32 *userSpace;
 
-    if (!userFlash) {
+    if (userUploadType == DFU_UPLOAD_RAM) 
+	{
         userSpace = (u32 *)(USER_CODE_RAM + userFirmwareLen);
         /* we dont need to handle when thisBlock len is not divisible by 4,
            since the linker will align everything to 4B anyway */
         for (i = 0; i < thisBlockLen; i = i + 4) {
             *userSpace++ = *(u32 *)(recvBuffer + i);
         }
-    } else {
-        userSpace = (u32 *)(USER_CODE_FLASH + userFirmwareLen);
+    } 
+	else 
+	{
+		if (userUploadType == DFU_UPLOAD_FLASH_0X8005000)
+		{
+			userSpace = (u32 *)(USER_CODE_FLASH0X8005000 + userFirmwareLen);
+		}
+		else
+		{
+			userSpace = (u32 *)(USER_CODE_FLASH0X8002000 + userFirmwareLen);		
+		}
 
         flashErasePage((u32)(userSpace));
 
@@ -394,7 +430,7 @@ bool dfuUploadStarted() {
 
 void dfuFinishUpload() {
     while (1) {
-        if (userFlash) {
+        if (userUploadType==DFU_UPLOAD_RAM) {
             if (code_copy_lock == BEGINNING) {
                 code_copy_lock = MIDDLE;
                 strobePin(LED_BANK, LED, 2, 0x1000);

usb_bootloader/STM32F1/dfu.c

@@ -26,6 +26,13 @@
 #define __DFU_H
 
 #include "common.h"
+/*
+#define DFU_UPLOAD_NONE 0
+#define DFU_UPLOAD_RAM 1
+#define DFU_UPLOAD_FLASH_0X8005000 2
+#define DFU_UPLOAD_FLASH_0X8002000 3
+*/
+typedef enum {DFU_UPLOAD_NONE, DFU_UPLOAD_RAM, DFU_UPLOAD_FLASH_0X8005000,DFU_UPLOAD_FLASH_0X8002000} dfuUploadTypes_t;
 
 /* exposed types */
 typedef u8 *(*ClassReqCB)(u16);

usb_bootloader/STM32F1/dfu.h

@@ -33,8 +33,10 @@
 
 #include "common.h"
 #include "dfu.h"
+extern volatile dfuUploadTypes_t userUploadType;
 
-int main() {
+int main() 
+{
     systemReset(); // peripherals but not PC
     setupCLK();
     setupLED();
@@ -44,26 +46,43 @@ int main() {
 
     strobePin(LED_BANK, LED, STARTUP_BLINKS, BLINK_FAST);
 
-  /* wait for host to upload program or halt bootloader */
-  bool no_user_jump = !checkUserCode(USER_CODE_FLASH) || readPin(BUTTON_BANK,BUTTON);
-  int delay_count = 0;
+	/* wait for host to upload program or halt bootloader */
+	bool no_user_jump = (!checkUserCode(USER_CODE_FLASH0X8005000) && !checkUserCode(USER_CODE_FLASH0X8002000)) || readPin(BUTTON_BANK,BUTTON);
+	int delay_count = 0;
 
-    while ((delay_count++ < BOOTLOADER_WAIT)
-            || no_user_jump) {
+    while ((delay_count++ < BOOTLOADER_WAIT) || no_user_jump)
+	{
 
         strobePin(LED_BANK, LED, 1, BLINK_SLOW);
 
-        if (dfuUploadStarted()) {
+        if (dfuUploadStarted()) 
+		{
             dfuFinishUpload(); // systemHardReset from DFU once done
         }
     }
 
-	if (checkUserCode(USER_CODE_FLASH)) 
+	if (checkUserCode(USER_CODE_FLASH0X8002000)) 
+	{
+        jumpToUser(USER_CODE_FLASH0X8002000);
+    } 
+	else 
 	{
-        jumpToUser(USER_CODE_FLASH);
-    } else {
-        // some sort of fault occurred, hard reset
-        strobePin(LED_BANK, LED, 5, BLINK_FAST);
-        systemHardReset();
+		if (checkUserCode(USER_CODE_FLASH0X8005000))
+		{
+			jumpToUser(USER_CODE_FLASH0X8005000);
+		} 
+		else
+		{
+			if (checkUserCode(USER_CODE_RAM) && userUploadType==DFU_UPLOAD_RAM)
+			{
+				jumpToUser(USER_CODE_RAM);
+			} 		
+			else
+			{
+				// Nothing to execute in either Flash or RAM
+			    strobePin(LED_BANK, LED, 5, BLINK_FAST);
+				systemHardReset();
+			}
+		}
     }
-}
+}

usb_bootloader/STM32F1/main.c

@@ -81,7 +81,7 @@ ONE_DESCRIPTOR usbFunctionalDescriptor = {
 };
 
 
-u8 u8_usbConfigDescriptorDFU[36] = {
+u8 u8_usbConfigDescriptorDFU[45] = {
     0x09,   /* bLength: Configuation Descriptor size */
     0x02,   /* bDescriptorType: Configuration */
     0x24,   /* wTotalLength: Bytes returned */
@@ -118,6 +118,20 @@ u8 u8_usbConfigDescriptorDFU[36] = {
     0x02,   /* nInterfaceProtocol, switched to 0x02 while in dfu_mode */
 
     0x05,   /* iInterface: */
+	
+    /************ Descriptor of DFU interface 0 Alternate setting 2 *********/
+    0x09,   /* bLength: Interface Descriptor size */
+    0x04,   /* bDescriptorType: */
+    0x00,   /* bInterfaceNumber: Number of Interface */
+    0x02,   /* bAlternateSetting: Alternate setting */
+    0x00,   /* bNumEndpoints*/
+    0xFE,   /* bInterfaceClass: DFU */
+    0x01,   /* bInterfaceSubClass */
+
+    0x02,   /* nInterfaceProtocol, switched to 0x02 while in dfu_mode */
+
+    0x06,   /* iInterface: */	
+	
 
     /******************** DFU Functional Descriptor********************/
     0x09,   /*blength = 7 Bytes*/
@@ -172,6 +186,15 @@ u8 u8_usbStringAlt0[0x36] = {
 };
 
 u8 u8_usbStringAlt1[0x3A] = {
+    0x3A,
+    0x03,
+    'D', 0, 'F', 0, 'U', 0, ' ', 0, 'P', 0, 'r', 0, 'o', 0, 'g', 0, 'r', 0,
+    'a', 0, 'm', 0, ' ', 0, 'F', 0, 'L', 0, 'A', 0, 'S', 0, 'H', 0, ' ', 0,
+    '0', 0, 'x', 0, '0', 0, '8', 0, '0', 0, '0', 0, '5', 0, '0', 0, '0', 0,
+    '0', 0
+};
+
+u8 u8_usbStringAlt2[0x3A] = {
     0x3A,
     0x03,
     'D', 0, 'F', 0, 'U', 0, ' ', 0, 'P', 0, 'r', 0, 'o', 0, 'g', 0, 'r', 0,
@@ -188,6 +211,7 @@ ONE_DESCRIPTOR usbStringDescriptor[STR_DESC_LEN] = {
     { (u8 *)u8_usbStringProduct, 0x20 },
     { (u8 *)u8_usbStringSerial,  0x10 },
     { (u8 *)u8_usbStringAlt0,    0x36 },
-    { (u8 *)u8_usbStringAlt1,    0x3A }
+    { (u8 *)u8_usbStringAlt1,    0x3A },
+	{ (u8 *)u8_usbStringAlt2,    0x3A }
 };
 

usb_bootloader/STM32F1/usb_descriptor.c

@@ -29,12 +29,12 @@
 #include "usb_lib.h"
 #include "usb.h"
 
-#define NUM_ALT_SETTINGS 2
-#define STR_DESC_LEN 6
+#define NUM_ALT_SETTINGS 3
+#define STR_DESC_LEN 7
 
 extern ONE_DESCRIPTOR  usbDeviceDescriptorDFU;
 extern ONE_DESCRIPTOR  usbConfigDescriptorDFU;
-extern ONE_DESCRIPTOR  usbStringDescriptor[6];
+extern ONE_DESCRIPTOR  usbStringDescriptor[STR_DESC_LEN];
 extern ONE_DESCRIPTOR  usbFunctionalDescriptor;
 
 #endif