Merge pull request #51 from rbm78bln/master

STM32F4x1xE Blackpill targets added
dmitrystu · Dec 9, 2022 · 89812e5 · 89812e5
2 parents 57dac4d + e57cd86
commit 89812e5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -173,7 +173,7 @@ FWTARGETS  += stm32l073v8 stm32l073xb stm32l073xc
 FWTARGETS  += stm32l476xc stm32l476xe stm32l476xg
 FWTARGETS  += stm32f103x4 stm32f103x6 stm32f103x8 stm32f103xb stm32f103xc
 FWTARGETS  += stm32f303xb stm32f303xc stm32f303xd stm32f303xe
-FWTARGETS  += stm32f429xe stm32f429xg stm32f429xi stm32f429xi_hs
+FWTARGETS  += stm32f401xe stm32f411xe stm32f429xe stm32f429xg stm32f429xi stm32f429xi_hs
 FWTARGETS  += stm32f105xb stm32f107xb
 FWTARGETS  += stm32l433xb stm32l433xc
 FWTARGETS  += stm32f070x6 stm32f070xb stm32f072x8
@@ -448,6 +448,18 @@ stm32f373xc :
 	                   FWDEFS='STM32F3 STM32F373xC USBD_ASM_DRIVER' \
 	                   LDPARAMS='ROMLEN=256K RAMLEN=32K'
 
+stm32f401xe :
+	$(MAKE) bootloader FWCPU='-mcpu=cortex-m4' \
+	                   FWSTARTUP='mcu/stm32f4xx.S' \
+	                   FWDEFS='STM32F4 STM32F401xE' \
+	                   LDPARAMS='ROMLEN=512K RAMLEN=96K APPALIGN=0x4000'
+
+stm32f411xe :
+	$(MAKE) bootloader FWCPU='-mcpu=cortex-m4' \
+	                   FWSTARTUP='mcu/stm32f4xx.S' \
+	                   FWDEFS='STM32F4 STM32F411xE' \
+	                   LDPARAMS='ROMLEN=512K RAMLEN=128K APPALIGN=0x4000'
+
 stm32f429xe :
 	$(MAKE) bootloader FWCPU='-mcpu=cortex-m4' \
 	                   FWSTARTUP='mcu/stm32f4xx.S' \

diff --git a/mcu/stm32f4xx.S b/mcu/stm32f4xx.S
@@ -134,7 +134,7 @@ Reset_Handler:
     str     r0, [r1, SCB_VTOR]  //set VTOR
     ldr     r1, [r0, 0x00]      //load new MSP
     msr     MSP, r1             //set MSP
-    ldr     r3, [r0, 0x04]      //load reet vector
+    ldr     r3, [r0, 0x04]      //load reset vector
     bx      r3                  //jump to user_app
 
 .L_check_boot:

diff --git a/src/bootloader.c b/src/bootloader.c
@@ -148,7 +148,7 @@ static usbd_respond dfu_dnload(void *buf, size_t blksize) {
         if (dfu_data.bStatus == USB_DFU_STATUS_OK) {
             dfu_data.dptr += blksize;
             dfu_data.remained -= blksize;
-#if (DFU_DNLOAD_NOSYNC == _ENABLED)
+#if (DFU_DNLOAD_NOSYNC == _ENABLE)
             dfu_data.bState = USB_DFU_STATE_DFU_DNLOADIDLE;
 #else
             dfu_data.bState = USB_DFU_STATE_DFU_DNLOADSYNC;