Add DFU

Signed-off-by: Carlo.Parata <carlo.parata@st.com>

Author: cparata

boards.txt

@@ -1,6 +1,4 @@
 
-menu.upload_method=Upload method
-
 ##############################################################
 star_otto.name=Arduino Star OTTO
 
@@ -12,7 +10,7 @@ star_otto.upload.protocol=dfuse
 
 star_otto.upload.use_1200bps_touch=true
 star_otto.upload.file_type=bin
-star_otto.upload.ram.maximum_size=262144
+star_otto.upload.ram.maximum_size=323584
 star_otto.upload.flash.maximum_size=2097152
 star_otto.upload.maximum_size=2097152
 star_otto.upload.mem_start=0x08000000
@@ -34,11 +32,4 @@ star_otto.build.cmsis_lib_gcc=arm_cortexM4l_math
 #To enable CDC add also '-DUSBD_USE_CDC'
 star_otto.build.extra_flags=-DSTM32F469xx -DUSE_USB_FS -DUSBCON -DUSBD_USE_CDC {build.usb_flags} -DESP_CH_UART -DESP_CH_UART_BR={build.esp_ch_uart_br}
 
-star_otto.menu.upload_method.dfuMethod=arduinoSTM32load
-star_otto.menu.upload_method.dfuMethod.upload.protocol=dfuse
-star_otto.menu.upload_method.dfuMethod.upload.tool=arduinoSTM32load
-
-star_otto.menu.upload_method.STLinkMethod=STLink
-star_otto.menu.upload_method.STLinkMethod.upload.protocol=STLink
-star_otto.menu.upload_method.STLinkMethod.upload.tool=stlink_upload
 ##############################################################

cores/arduino/stm32/usbd_cdc_if.c

@@ -111,11 +111,9 @@ uint8_t lineSetup[] = {0x00, 0xc2, 0x01, 0x00, 0x00, 0x00, 0x08};
 
 TIM_HandleTypeDef  TimHandle;
 
-#ifdef USE_DFU
 volatile uint8_t dfu_request = 0;
 /* For a bug in some Linux 64 bit PC we need to delay the reset of the CPU of 500ms seconds */
 int counter_dfu_reset = 500; /* the unit is equal to CDC_POLLING_INTERVAL that is 5ms by default */
-#endif // USE_DFU
 
 static void TIM_Config(void);
 
@@ -239,11 +237,9 @@ static int8_t CDC_Control_FS  (uint8_t cmd, uint8_t* pbuf, uint16_t length)
   /*******************************************************************************/
   case CDC_SET_LINE_CODING:
     memcpy(lineSetup, pbuf, 7);
-#ifdef USE_DFU
     if(*((uint32_t*)pbuf) == 1200){
       dfu_request = 1;
     }
-#endif // USE_DFU
     break;
 
   case CDC_GET_LINE_CODING:
@@ -386,7 +382,6 @@ void HAL_TIM6_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
 {
   uint8_t status;
 
-#ifdef USE_DFU
   if(dfu_request) {
     counter_dfu_reset--;
     if(counter_dfu_reset == 0) {
@@ -396,7 +391,6 @@ void HAL_TIM6_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
       NVIC_SystemReset();
     }
   }
-#endif // USE_DFU
   if(USB_received) {
     USB_received = 0;
 

platform.txt

@@ -98,6 +98,18 @@ recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build
 recipe.size.regex=^(?:\.text|\.rodata|\.ARM.exidx)\s+([0-9]+).*
 recipe.size.regex.data=^(?:\.data|\.bss|\.noinit)\s+([0-9]+).*
 
+#
+# DFU Util
+# --------
+
+#tools.dfu-util.path={runtime.tools.dfu-util-0.9.0-arduino1.path}
+#tools.dfu-util.cmd=dfu-util
+#tools.dfu-util.cmd.windows=dfu-util.cmd
+
+#tools.dfu-util.upload.params.verbose=-v
+#tools.dfu-util.upload.params.quiet=
+#tools.dfu-util.upload.pattern="{path}/{cmd}" "{path}" {upload.usbID} {upload.altID} {upload.mem_start} "{build.path}/{build.project_name}.bin" "{serial.port}"
+
 #
 # arduinoSTM32load
 # ----------------
@@ -107,15 +119,4 @@ tools.arduinoSTM32load.upload.params.verbose=-v
 tools.arduinoSTM32load.upload.params.quiet=
 tools.arduinoSTM32load.upload.pattern="{path}/{cmd}" -dfu "{runtime.tools.dfu-util-0.9.0-arduino1.path}" -bin "{build.path}/{build.project_name}.bin" -port="{serial.port}" "{upload.params.verbose}"
 
-tools.arduinoSTM32load.upload.network_pattern="{runtime.tools.wifilink_mcuota-1.0.0.path}/wifilink_mcuota" -f "{build.path}/{build.project_name}.hex" -i "{serial.port}"
-
-# stlink upload
-tools.stlink_upload.cmd=stlink_upload
-tools.stlink_upload.cmd.windows=stlink_upload.bat
-tools.stlink_upload.path.windows={runtime.hardware.path}/tools/win
-tools.stlink_upload.path.macosx={runtime.hardware.path}/tools/macosx
-tools.stlink_upload.path.linux={runtime.hardware.path}/tools/linux
-tools.stlink_upload.path.linux64={runtime.hardware.path}/tools/linux64
-tools.stlink_upload.upload.params.verbose=-d
-tools.stlink_upload.upload.params.quiet=
-tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "{build.path}/{build.project_name}.bin"
+#tools.arduinoSTM32load.upload.network_pattern="{runtime.tools.wifilink_mcuota-1.0.0.path}/wifilink_mcuota" -f "{build.path}/{build.project_name}.hex" -i "{serial.port}"

system/STM32F4xx/system_stm32f4xx.c

@@ -74,6 +74,8 @@
   #define HSI_VALUE    ((uint32_t)16000000) /*!< Value of the Internal oscillator in Hz*/
 #endif /* HSI_VALUE */
 
+void enterSysROM(void);
+
 /**
   * @}
   */
@@ -167,6 +169,14 @@ const uint8_t APBPrescTable[8]  = {0, 0, 0, 0, 1, 2, 3, 4};
   */
 void SystemInit(void)
 {
+  /* Check if we are coming from a DFU enter request (see usbd_cdc_if.c)
+   * This MUST be done before any other board configuration
+   */
+  if(*((unsigned int*)0x2004FFF0) == 0xb311a21a) {
+    *((unsigned int*)0x2004FFF0) = 0;
+    enterSysROM();
+  }
+
   /* FPU settings ------------------------------------------------------------*/
   #if (__FPU_PRESENT == 1) && (__FPU_USED == 1)
     SCB->CPACR |= ((3UL << 10*2)|(3UL << 11*2));  /* set CP10 and CP11 Full Access */

variants/otto/ldscript.ld

@@ -43,7 +43,7 @@ _Min_Stack_Size = 0x400;; /* required amount of stack */
 MEMORY
 {
 FLASH (rx)      : ORIGIN = 0x8000000, LENGTH = 2048K
-RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = 320K
+RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = 319K
 CCMRAM (rw)      : ORIGIN = 0x10000000, LENGTH = 64K
 }