Apply 6b6d9c4 to GD32F1 side

Author: GrantM11235

config.h

@@ -45,6 +45,9 @@
 // The USB clock is the same for all boards
 #define RCC_APB1ENR_USB_CLK   0x00800000 
 
+// Clocks for the backup domain registers
+#define RCC_APB1ENR_PWR_CLK   0x10000000
+#define RCC_APB1ENR_BKP_CLK   0x08000000
 
 
 // Use the usb_description_strings_util.html to make new strngs for the next 3 arrays if you need to change the text.
@@ -134,4 +137,7 @@
 #define PROD_ID0 0x03
 #define PROD_ID1 0x00
 
+// Value to place in RTC backup register 10 for persistent bootloader mode
+#define RTC_BOOTLOADER_FLAG 0x424C
+#define RTC_BOOTLOADER_JUST_UPLOADED 0x424D
 #endif

dfu.c

@@ -101,6 +101,7 @@ bool dfuUpdateByRequest(void) {
 						break;
 						*/
 					case 1:
+					
 					    userAppAddr = USER_CODE_FLASH0X8005000;
 						userUploadType = DFU_UPLOAD_FLASH_0X8005000;
 
@@ -109,13 +110,17 @@ bool dfuUpdateByRequest(void) {
 						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);
+						bkp10Write(RTC_BOOTLOADER_JUST_UPLOADED);
+
 						break;
 					case 2:
 						userUploadType = DFU_UPLOAD_FLASH_0X8002000;
 						userAppAddr = USER_CODE_FLASH0X8002000;
 						/* make sure the flash is setup properly, unlock it */
 						setupFLASH();
 						flashUnlock();
+						bkp10Write(RTC_BOOTLOADER_JUST_UPLOADED);
+
 						break;
 					default:
 					// Roger Clark. Report error 

hardware.c

@@ -227,6 +227,52 @@ void jumpToUser(u32 usrAddr) {
     setMspAndJump(usrAddr);
 }
 
+void bkp10Write(u16 value)
+{
+		// Enable clocks for the backup domain registers
+		pRCC->APB1ENR |= (RCC_APB1ENR_PWR_CLK | RCC_APB1ENR_BKP_CLK);
+		
+        // Disable backup register write protection
+        pPWR->CR |= PWR_CR_DBP;
+
+        // store value in pBK DR10
+        pBKP->DR10 = value;
+
+        // Re-enable backup register write protection
+        pPWR->CR &=~ PWR_CR_DBP;	
+}
+
+int checkAndClearBootloaderFlag()
+{
+    bool flagSet = 0x00;// Flag not used
+
+    // Enable clocks for the backup domain registers
+    pRCC->APB1ENR |= (RCC_APB1ENR_PWR_CLK | RCC_APB1ENR_BKP_CLK);
+
+    switch (pBKP->DR10)
+	{
+		case RTC_BOOTLOADER_FLAG:
+			flagSet = 0x01;
+			break;
+		case RTC_BOOTLOADER_JUST_UPLOADED:
+			flagSet = 0x02;
+			break;		
+    }
+
+	if (flagSet!=0x00)
+	{
+		bkp10Write(0x0000);// Clear the flag
+		// Disable clocks
+		pRCC->APB1ENR &= ~(RCC_APB1ENR_PWR_CLK | RCC_APB1ENR_BKP_CLK);
+	}
+
+	
+
+    return flagSet;
+}
+
+
+
 void nvicInit(NVIC_InitTypeDef *NVIC_InitStruct) {
     u32 tmppriority = 0x00;
     u32 tmpreg      = 0x00;

hardware.h

@@ -191,6 +191,52 @@ typedef struct {
 } SCB_TypeDef;
 
 
+/** Power interface register map. */
+typedef struct pwr_reg_map {
+    vu32 CR;      /**< Control register */
+    vu32 CSR;     /**< Control and status register */
+} pwr_reg_map;
+
+/** Power peripheral register map base pointer. */
+#define pPWR                        ((struct pwr_reg_map*)0x40007000)
+
+/** Disable backup domain write protection bit */
+#define PWR_CR_DBP                  (1 << 8)
+
+
+/** Backup peripheral register map type. */
+typedef struct bkp_reg_map {
+    const u32 RESERVED1; ///< Reserved
+    vu16 DR1;            ///< Data register 1
+    const u16 RESERVED2;
+    vu16 DR2;            ///< Data register 2
+    const u16 RESERVED3;
+    vu16 DR3;            ///< Data register 3
+    const u16 RESERVED4;
+    vu16 DR4;            ///< Data register 4
+    const u16 RESERVED5;
+    vu16 DR5;            ///< Data register 5
+    const u16 RESERVED6;
+    vu16 DR6;            ///< Data register 6
+    const u16 RESERVED7;
+    vu16 DR7;            ///< Data register 7
+    const u16 RESERVED8;
+    vu16 DR8;            ///< Data register 8
+    const u16 RESERVED9;
+    vu16 DR9;            ///< Data register 9
+    const u16 RESERVED10;
+    vu16 DR10;           ///< Data register 10
+    const u16 RESERVED11;
+    vu32 RTCCR;          ///< RTC control register
+    vu32 CR;             ///< Control register
+    vu32 CSR;            ///< Control and status register
+} bkp_reg_map;
+
+/** Backup peripheral register map base pointer. */
+#define pBKP                        ((struct bkp_reg_map*)0x40006C00)
+
+void bkp10Write(u16 value);
+
 //void setPin(u32 bank, u8 pin);
 //void resetPin(u32 bank, u8 pin);
 void gpio_write_bit(u32 bank, u8 pin, u8 val);
@@ -206,6 +252,7 @@ void setupLEDAndButton(void);
 void setupFLASH(void);
 bool checkUserCode(u32 usrAddr);
 void jumpToUser(u32 usrAddr);
+int checkAndClearBootloaderFlag();
 
 bool flashWriteWord(u32 addr, u32 word);
 bool flashErasePage(u32 addr);

main.c

@@ -37,32 +37,52 @@ extern volatile dfuUploadTypes_t userUploadType;
 
 int main() 
 {
+	bool no_user_jump = FALSE;
+	bool dont_wait=FALSE;
+	
     systemReset(); // peripherals but not PC
     setupCLK();
     setupLEDAndButton();
     setupUSB();
     setupFLASH();
+		
+	switch(checkAndClearBootloaderFlag())
+	{
+		case 0x01:
+			no_user_jump = TRUE;
+			strobePin(LED_BANK, LED_PIN, STARTUP_BLINKS, BLINK_FAST,LED_ON_STATE);
+		break;
+		case 0x02:
+			dont_wait=TRUE;
+		break;		
+		default:
+			strobePin(LED_BANK, LED_PIN, STARTUP_BLINKS, BLINK_FAST,LED_ON_STATE);
+			if (!checkUserCode(USER_CODE_FLASH0X8005000) && !checkUserCode(USER_CODE_FLASH0X8002000))
+			{
+				no_user_jump = TRUE;
+			}
+			else if (readButtonState())
+			{
+				no_user_jump = TRUE;
+			}	
+		break;
+	}	
 
-
-	strobePin(LED_BANK, LED_PIN, STARTUP_BLINKS, BLINK_FAST,LED_ON_STATE);
-
-
-	/* wait for host to upload program or halt bootloader */
-	bool no_user_jump = (!checkUserCode(USER_CODE_FLASH0X8005000) && !checkUserCode(USER_CODE_FLASH0X8002000)) || readButtonState() ;
-	
-	int delay_count = 0;
-
-    while ((delay_count++ < BOOTLOADER_WAIT) || no_user_jump)
+	if (!dont_wait)
 	{
+		int delay_count = 0;
 
-        strobePin(LED_BANK, LED_PIN, 1, BLINK_SLOW,LED_ON_STATE);
-
-        if (dfuUploadStarted()) 
+		while ((delay_count++ < BOOTLOADER_WAIT) || no_user_jump)
 		{
-            dfuFinishUpload(); // systemHardReset from DFU once done
-        }
-    }
 
+			strobePin(LED_BANK, LED_PIN, 1, BLINK_SLOW,LED_ON_STATE);
+
+			if (dfuUploadStarted()) 
+			{
+				dfuFinishUpload(); // systemHardReset from DFU once done
+			}
+		}
+	}
 
 	if (checkUserCode(USER_CODE_FLASH0X8002000)) 
 	{