[bsp][STM32] update stm32 bsp

bsp/stm32/README.md

@@ -10,4 +10,11 @@ STM32 系列 BSP 目前支持情况如下表所示：
 | stm32f429-atk-apollo      | 正点原子 F429 阿波罗开发板 |
 | stm32f429-fire-challenger | 野火 F429 挑战者开发板     |
 
+了解每个 BSP 的详细情况可以阅读该 BSP 下的 readme 文件，如需使用 BSP 更多功能可参考 docs 文件夹下提供的说明文档：
+
+| 文档名称             | 简介                                              |
+| -------------------- | ------------------------------------------------- |
+| BSP 进阶使用指南     | 介绍如何使用 BSP 提供的高级功能以及添加更多新功能 |
+| STM32系列BSP添加教程 | 介绍如何添加一个新的 STM32 系列的 BSP             |
+| STM32系列BSP制作规范 | 介绍一个新 STM32 系列 BSP 的制作规范              |
 

bsp/stm32/docs/BSP进阶使用指南.md

@@ -0,0 +1,115 @@
+# BSP 进阶使用指南
+
+## 简介
+
+本文档是为需要在 RT-Thread 操作系统上使用更多开发板资源的开发者准备的。通过使用 ENV 工具对 BSP 进行配置，可以开启更多板载资源，实现更多高级功能。
+
+主要包括以下内容：
+
+1. 如何使用开发板上更多的板载资源
+2. 如何使用更多的片上资源
+3. 如何添加更多片上资源选项
+
+## 前提要求
+
+- 学会如何使用 ENV 工具，参考：[RT-Thread env 工具用户手册](https://www.rt-thread.org/document/site/rtthread-development-guide/rtthread-tool-manual/env/env-user-manual/)
+
+## 如何使用更多的板载资源
+
+开发板上一般有很多的板载资源，如 Flash、SD卡、以太网等，但是 BSP 工程默认没有添加对这些外设的支持。如何在工程里添加这些外设的支持呢？这就需要使用 ENV 工具了。下面以在正点原子阿波罗 F429 开发板上开启 SPI Flash 支持为例，一步步的展示如何使用 ENV 工具对 BSP 进行配置。
+
+### 1）打开配置工具
+
+在目录 `rt-thread\bsp\stm32\stm32f429-atk-apollo` 下打开 menuconfig 配置界面。
+
+![打开 menuconfig](figures/menuconfig_apolo.png)
+
+打开的配置工具界面如下所示：
+
+![RT-Thread 配置菜单](figures/config1.png)
+
+通过键盘上的上下键移动光标，选中 `Hardware Drivers Config`然后按回车键进入硬件驱动配置菜单。
+
+### 2）进入硬件驱动配置菜单
+
+在硬件配置菜单里有三个选项，分别是 **板载外设配置菜单**、**片上外设配置菜单**和**扩展模块配置菜单**，按回车键进入板载外设配置菜单。
+
+![硬件驱动 配置菜单](figures/config2.png)
+
+### 3）在板载外设配置菜单里开启 SPI Flash 选项
+
+![板载外设 配置菜单](figures/spi_flash.png)
+
+### 4）保存退出
+
+然后右移光标选中 Save 按回车键保存，然后按 Esc 键退出配置工具。
+
+![保存退出](figures/save.png)
+
+### 5）更新软件包
+
+输入命令 `pkgs --update` 使软件包配置生效。
+
+![1543477036034](figures/update.png)
+
+### 6）生成 MDK5 工程
+
+输入命令 `scons --target=mdk5 -s` 重新生成 MDK5 的工程。
+
+![1543477194829](figures/scons_mdk5.png)
+
+### 7）编译下载
+
+打开生成的 MDK5 工程文件，编译并下载。
+
+![1543478492157](figures/complise.png)
+
+### 8）查看运行结果
+
+程序运行后，输入命令 `list_device` 可以看到名为 W25Q256 的块设备，此时 `SPI Flash` 设备已经可以使用了。
+
+![1543478742034](figures/run_flash.png)
+
+## 如何使用更多的片上资源
+
+如果想要使用除了当前支持的片上资源（GPIO 和 UART1），又不想开启板载资源的支持，可以通过直接配置 **片上外设配置菜单** 的方式，使用更多片上资源。
+
+配置方法和上一章节介绍的 **如何使用更多的板载资源的配置方法** 一样，只是本次需要进入 `片上外设配置菜单`。
+
+![1543481275711](figures/on_chip_config.png)
+
+## 如何添加更多的片上资源选项
+
+如果想使用的片上外设是 `片上外设配置菜单` 里没有的，就需要自己添加了。下面以添加 SPI3 的驱动支持为例讲解如何添加更多片上外设支持。
+
+> 没有安装 stm32cubemx 软件的移步 STM32cube中文网：<http://www.stm32cube.com/> ，在 `资源下载` 里下载 stm32cubemx 软件。
+
+添加 SPI3 的外设支持需要以下几步：
+
+### 1）打开 Cube 的工程
+
+![1543486779576](figures/cubemx.png)
+
+### 2）配置好 SPI3 的引脚，并生成代码
+
+按照图中所示步骤操作：
+
+![1543487684698](figures/cube_spi3.png)
+
+### 3）修改 Konfig 文件
+
+打开board文件夹下的 Konfig 文件，拷贝 SPI2 的配置项，并重命名 SPI2 为 SPI3。
+
+![1543542657074](figures/Kconfig2.png)
+
+### 4）重新配置工程
+
+经过上一步的修改，此时重新打开 ENV 工具，在 menuconfig 中就会出现添加的 SPI3 的配置项。
+
+![1543543081284](figures/config5.png)
+
+### 5）生成工程，编译下载
+
+重新生成工程之后，编译下载到开发板，程序会自动开始运行。输入 `list_device` 命令可以看到 spi3 总线设备已经挂载成功了。
+
+![1543543446786](figures/run_spi3.png)

bsp/stm32/libraries/templates/STM32系列BSP添加教程.md → bsp/stm32/docs/STM32系列BSP添加教程.md

@@ -112,6 +112,8 @@ STM32 BSP 由三部分组成，分别是 (1) 通用库、(2) BSP 模板和 (3)
 | SOC_STM32F103RB | 芯片型号 | SOC_STM32xxx |
 | SOC_SERIES_STM32F1 | 芯片系列| SOC_SERIES_STM32xx |
 
+用户可参考这个链接学习 Kconfig语法：(https://blog.csdn.net/jianwen_hi/article/details/53398141)
+
 ### 修改工程构建相关文件
 接下来需要修改用于构建工程相关的文件。
 

bsp/stm32/libraries/HAL_Drivers/config/f1/spi_config.h

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author       Notes
  * 2018-11-06     SummerGift   change to new framework

bsp/stm32/libraries/HAL_Drivers/config/f1/uart_config.h

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author       Notes
  * 2018-10-30     BalanceTWK   change to new framework

bsp/stm32/libraries/HAL_Drivers/config/f4/spi_config.h

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author       Notes
  * 2018-11-06     SummerGift   change to new framework

bsp/stm32/libraries/HAL_Drivers/config/f4/uart_config.h

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author       Notes
  * 2018-10-30     SummerGift   change to new framework

bsp/stm32/libraries/HAL_Drivers/config/l4/spi_config.h

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author       Notes
  * 2018-11-06     SummerGift   change to new framework

bsp/stm32/libraries/HAL_Drivers/config/l4/uart_config.h

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author       Notes
  * 2018-11-06     SummerGift   change to new framework

bsp/stm32/libraries/HAL_Drivers/drv_common.c

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author       Notes
  * 2018-11-7      SummerGift   change to new framework

bsp/stm32/libraries/HAL_Drivers/drv_common.h

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author       Notes
  * 2018-11-7      SummerGift   change to new framework

bsp/stm32/libraries/HAL_Drivers/drv_config.h

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author            Notes
  * 2018-10-30     SummerGift   change to new framework

bsp/stm32/libraries/HAL_Drivers/drv_dma.h

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author       Notes
  * 2018-11-10      SummerGift   change to new framework

bsp/stm32/libraries/HAL_Drivers/drv_emac.c

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author       Notes
  * 2018-11-19     SummerGift   first version

bsp/stm32/libraries/HAL_Drivers/drv_gpio.c

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author            Notes
  * 2018-11-06     balanceTWK        change to new framework

bsp/stm32/libraries/HAL_Drivers/drv_gpio.h

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author            Notes
  * 2018-11-06     balanceTWK        change to new framework

bsp/stm32/libraries/HAL_Drivers/drv_qspi.c

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author       Notes
  * 2018-11-27     zylx         change to new framework
@@ -19,10 +18,7 @@
 #define LOG_TAG              "drv.qspi"
 #include <drv_log.h>
 
-#if !defined(BSP_USING_QSPI)
-    #error "Please define at least one BSP_USING_QSPI"
-    /* this driver can be disabled at menuconfig ? RT-Thread Components ? Device Drivers */
-#endif
+#if defined(BSP_USING_QSPI)
 
 struct stm32_hw_spi_cs
 {
@@ -33,6 +29,9 @@ struct stm32_qspi_bus
 {
     QSPI_HandleTypeDef QSPI_Handler;
     char *bus_name;
+#ifdef BSP_QSPI_USING_DMA
+    DMA_HandleTypeDef hdma_quadspi;
+#endif
 };
 
 struct rt_spi_bus _qspi_bus1;
@@ -94,6 +93,33 @@ static int stm32_qspi_init(struct rt_qspi_device *device, struct rt_qspi_configu
         LOG_E("qspi init failed (%d)!", result);
     }
 
+#ifdef BSP_QSPI_USING_DMA
+    /* QSPI interrupts must be enabled when using the HAL_QSPI_Receive_DMA */
+    HAL_NVIC_SetPriority(QUADSPI_IRQn, 0, 0);
+    HAL_NVIC_EnableIRQ(QUADSPI_IRQn);
+    HAL_NVIC_SetPriority(DMA1_Channel5_IRQn, 0, 0);
+    HAL_NVIC_EnableIRQ(DMA1_Channel5_IRQn);
+
+    /* init QSPI DMA */
+     __HAL_RCC_DMA1_CLK_ENABLE();
+    HAL_DMA_DeInit(qspi_bus->QSPI_Handler.hdma);
+    qspi_bus->hdma_quadspi.Instance = DMA1_Channel5;
+    qspi_bus->hdma_quadspi.Init.Request = DMA_REQUEST_5;
+    qspi_bus->hdma_quadspi.Init.Direction = DMA_PERIPH_TO_MEMORY;
+    qspi_bus->hdma_quadspi.Init.PeriphInc = DMA_PINC_DISABLE;
+    qspi_bus->hdma_quadspi.Init.MemInc = DMA_MINC_ENABLE;
+    qspi_bus->hdma_quadspi.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
+    qspi_bus->hdma_quadspi.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
+    qspi_bus->hdma_quadspi.Init.Mode = DMA_NORMAL;
+    qspi_bus->hdma_quadspi.Init.Priority = DMA_PRIORITY_LOW;
+    if (HAL_DMA_Init(&qspi_bus->hdma_quadspi) != HAL_OK)
+    {
+        LOG_E("qspi dma init failed (%d)!", result);
+    }
+    
+    __HAL_LINKDMA(&qspi_bus->QSPI_Handler,hdma,qspi_bus->hdma_quadspi);
+#endif /* BSP_QSPI_USING_DMA */
+
     return result;
 }
 
@@ -205,7 +231,6 @@ static rt_uint32_t qspixfer(struct rt_spi_device *device, struct rt_spi_message
         {
             if (HAL_QSPI_Transmit(&qspi_bus->QSPI_Handler, (rt_uint8_t *)sndb, 5000) == HAL_OK)
             {
-
                 len = length;
             }
             else
@@ -222,12 +247,17 @@ static rt_uint32_t qspixfer(struct rt_spi_device *device, struct rt_spi_message
     }
     else if (rcvb)/* recv data */
     {
-
         qspi_send_cmd(qspi_bus, qspi_message);
-
+#ifdef BSP_QSPI_USING_DMA
+        if (HAL_QSPI_Receive_DMA(&qspi_bus->QSPI_Handler, rcvb) == HAL_OK)
+#else
         if (HAL_QSPI_Receive(&qspi_bus->QSPI_Handler, rcvb, 5000) == HAL_OK)
+#endif
         {
             len = length;
+#ifdef BSP_QSPI_USING_DMA           
+            while(qspi_bus->QSPI_Handler.RxXferCount != 0);
+#endif
         }
         else
         {
@@ -283,20 +313,22 @@ static int stm32_qspi_register_bus(struct stm32_qspi_bus *qspi_bus, const char *
   */
 rt_err_t stm32_qspi_bus_attach_device(const char *bus_name, const char *device_name, rt_uint32_t pin, rt_uint8_t data_line_width, void (*enter_qspi_mode)(), void (*exit_qspi_mode)())
 {
+    struct rt_qspi_device *qspi_device = RT_NULL;
+    struct stm32_hw_spi_cs *cs_pin = RT_NULL;
     rt_err_t result = RT_EOK;
 
     RT_ASSERT(bus_name != RT_NULL);
     RT_ASSERT(device_name != RT_NULL);
     RT_ASSERT(data_line_width == 1 || data_line_width == 2 || data_line_width == 4);
 
-    struct rt_qspi_device *qspi_device = (struct rt_qspi_device *)rt_malloc(sizeof(struct rt_qspi_device));
+    qspi_device = (struct rt_qspi_device *)rt_malloc(sizeof(struct rt_qspi_device));
     if (qspi_device == RT_NULL)
     {
         LOG_E("no memory, qspi bus attach device failed!");
         result = RT_ENOMEM;
         goto __exit;
     }
-    struct stm32_hw_spi_cs *cs_pin = (struct stm32_hw_spi_cs *)rt_malloc(sizeof(struct stm32_hw_spi_cs));
+    cs_pin = (struct stm32_hw_spi_cs *)rt_malloc(sizeof(struct stm32_hw_spi_cs));
     if (qspi_device == RT_NULL)
     {
         LOG_E("no memory, qspi bus attach device failed!");
@@ -333,10 +365,35 @@ __exit:
     return  result;
 }
 
+#ifdef BSP_QSPI_USING_DMA
+void QUADSPI_IRQHandler(void)
+{
+    /* enter interrupt */
+    rt_interrupt_enter();
+
+    HAL_QSPI_IRQHandler(&_stm32_qspi_bus.QSPI_Handler);
+
+    /* leave interrupt */
+    rt_interrupt_leave();
+}
+
+void DMA1_Channel5_IRQHandler(void)
+{
+    /* enter interrupt */
+    rt_interrupt_enter();
+
+    HAL_DMA_IRQHandler(&_stm32_qspi_bus.hdma_quadspi);
+
+    /* leave interrupt */
+    rt_interrupt_leave();
+}
+#endif /* BSP_QSPI_USING_DMA */
+
 static int rt_hw_qspi_bus_init(void)
 {
     return stm32_qspi_register_bus(&_stm32_qspi_bus, "qspi1");
 }
 INIT_BOARD_EXPORT(rt_hw_qspi_bus_init);
 
+#endif /* BSP_USING_QSPI */
 #endif /* RT_USING_QSPI */

bsp/stm32/libraries/HAL_Drivers/drv_qspi.h

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author       Notes
  * 2018-11-27     zylx         change to new framework

bsp/stm32/libraries/HAL_Drivers/drv_spi.c

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author       Notes
  * 2018-11-5      SummerGift   change to new framework

bsp/stm32/libraries/HAL_Drivers/drv_spi.h

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author       Notes
  * 2018-11-5      SummerGift   change to new framework

bsp/stm32/libraries/HAL_Drivers/drv_usart.c

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author       Notes
  * 2018-10-30     SummerGift   change to new framework

bsp/stm32/libraries/HAL_Drivers/drv_usart.h

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author       Notes
  * 2018.10.30     SummerGift   change to new framework

bsp/stm32/libraries/templates/stm32f10x/applications/main.c

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author       Notes
  * 2018-11-06     SummerGift   change to new framework

bsp/stm32/libraries/templates/stm32f10x/board/board.c

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author       Notes
  * 2018-11-06     SummerGift   change to new framework

bsp/stm32/libraries/templates/stm32f10x/board/board.h

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author       Notes
  * 2018-11-5      SummerGift   change to new framework

bsp/stm32/libraries/templates/stm32f10x/project.ewp

@@ -651,7 +651,7 @@
         </option>
         <option>
           <name>OOCOutputFile</name>
-          <state>../../../rt-thread.bin</state>
+          <state>../../../rtthread.bin</state>
         </option>
         <option>
           <name>OOCCommandLineProducer</name>

bsp/stm32/libraries/templates/stm32f10x/project.uvproj

@@ -73,7 +73,7 @@
           <AfterMake>
             <RunUserProg1>1</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name>
+            <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name>
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>

bsp/stm32/libraries/templates/stm32f10x/project.uvprojx

@@ -79,7 +79,7 @@
           <AfterMake>
             <RunUserProg1>1</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name>
+            <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name>
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>

bsp/stm32/libraries/templates/stm32f10x/rtconfig.py

@@ -53,7 +53,7 @@ if PLATFORM == 'gcc':
     else:
         CFLAGS += ' -O2'
 
-    POST_ACTION = OBJCPY + ' -O binary $TARGET rt-thread.bin\n' + SIZE + ' $TARGET \n'
+    POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n'
 
 elif PLATFORM == 'armcc':
     # toolchains
@@ -81,7 +81,7 @@ elif PLATFORM == 'armcc':
     else:
         CFLAGS += ' -O2'
 
-    POST_ACTION = 'fromelf --bin $TARGET --output rt-thread.bin \nfromelf -z $TARGET'
+    POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
 
 elif PLATFORM == 'iar':
     # toolchains
@@ -127,4 +127,4 @@ elif PLATFORM == 'iar':
     LFLAGS += ' --entry __iar_program_start'
 
     EXEC_PATH = EXEC_PATH + '/arm/bin/'
-    POST_ACTION = 'ielftool --bin $TARGET rt-thread.bin'
+    POST_ACTION = 'ielftool --bin $TARGET rtthread.bin'

bsp/stm32/libraries/templates/stm32f10x/template.ewp

@@ -636,7 +636,7 @@
                 </option>
                 <option>
                     <name>OOCOutputFile</name>
-                    <state>../../../rt-thread.bin</state>
+                    <state>../../../rtthread.bin</state>
                 </option>
                 <option>
                     <name>OOCCommandLineProducer</name>

bsp/stm32/libraries/templates/stm32f10x/template.uvproj

@@ -76,7 +76,7 @@
           <AfterMake>
             <RunUserProg1>1</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name>
+            <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>

bsp/stm32/libraries/templates/stm32f10x/template.uvprojx

@@ -82,7 +82,7 @@
           <AfterMake>
             <RunUserProg1>1</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name>
+            <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>

bsp/stm32/libraries/templates/stm32f4xx/applications/main.c

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author       Notes
  * 2018-11-06     SummerGift   change to new framework

bsp/stm32/libraries/templates/stm32f4xx/board/board.h

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author       Notes
  * 2018-11-5      SummerGift   change to new framework

bsp/stm32/libraries/templates/stm32f4xx/project.ewp

@@ -651,7 +651,7 @@
         </option>
         <option>
           <name>OOCOutputFile</name>
-          <state>../../../rt-thread.bin</state>
+          <state>../../../rtthread.bin</state>
         </option>
         <option>
           <name>OOCCommandLineProducer</name>

bsp/stm32/libraries/templates/stm32f4xx/project.uvproj

@@ -73,7 +73,7 @@
           <AfterMake>
             <RunUserProg1>1</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name>
+            <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name>
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>

bsp/stm32/libraries/templates/stm32f4xx/project.uvprojx

@@ -79,7 +79,7 @@
           <AfterMake>
             <RunUserProg1>1</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name>
+            <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name>
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>

bsp/stm32/libraries/templates/stm32f4xx/rtconfig.py

@@ -53,7 +53,7 @@ if PLATFORM == 'gcc':
     else:
         CFLAGS += ' -O2'
 
-    POST_ACTION = OBJCPY + ' -O binary $TARGET rt-thread.bin\n' + SIZE + ' $TARGET \n'
+    POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n'
 
 elif PLATFORM == 'armcc':
     # toolchains
@@ -81,7 +81,7 @@ elif PLATFORM == 'armcc':
     else:
         CFLAGS += ' -O2'
 
-    POST_ACTION = 'fromelf --bin $TARGET --output rt-thread.bin \nfromelf -z $TARGET'
+    POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
 
 elif PLATFORM == 'iar':
     # toolchains
@@ -127,4 +127,4 @@ elif PLATFORM == 'iar':
     LFLAGS += ' --entry __iar_program_start'
 
     EXEC_PATH = EXEC_PATH + '/arm/bin/'
-    POST_ACTION = 'ielftool --bin $TARGET rt-thread.bin'
+    POST_ACTION = 'ielftool --bin $TARGET rtthread.bin'

bsp/stm32/libraries/templates/stm32f4xx/template.ewp

@@ -636,7 +636,7 @@
                 </option>
                 <option>
                     <name>OOCOutputFile</name>
-                    <state>../../../rt-thread.bin</state>
+                    <state>../../../rtthread.bin</state>
                 </option>
                 <option>
                     <name>OOCCommandLineProducer</name>

bsp/stm32/libraries/templates/stm32f4xx/template.uvproj

@@ -76,7 +76,7 @@
           <AfterMake>
             <RunUserProg1>1</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name>
+            <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>

bsp/stm32/libraries/templates/stm32f4xx/template.uvprojx

@@ -16,7 +16,7 @@
         <TargetCommonOption>
           <Device>STM32F407ZGTx</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32F4xx_DFP.2.11.0</PackID>
+          <PackID>Keil.STM32F4xx_DFP.2.13.0</PackID>
           <PackURL>http://www.keil.com/pack</PackURL>
           <Cpu>IRAM(0x20000000,0x20000) IRAM2(0x10000000,0x10000) IROM(0x08000000,0x100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
@@ -82,7 +82,7 @@
           <AfterMake>
             <RunUserProg1>1</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name>
+            <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>

bsp/stm32/libraries/templates/stm32l4xx/applications/main.c

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author       Notes
  * 2018-11-06     SummerGift   change to new framework

bsp/stm32/libraries/templates/stm32l4xx/board/board.c

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author       Notes
  * 2018-11-06     SummerGift   change to new framework

bsp/stm32/libraries/templates/stm32l4xx/board/board.h

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author       Notes
  * 2018-11-5      SummerGift   change to new framework

bsp/stm32/libraries/templates/stm32l4xx/project.ewp

@@ -651,7 +651,7 @@
         </option>
         <option>
           <name>OOCOutputFile</name>
-          <state>../../../rt-thread.bin</state>
+          <state>../../../rtthread.bin</state>
         </option>
         <option>
           <name>OOCCommandLineProducer</name>

bsp/stm32/libraries/templates/stm32l4xx/project.uvprojx

@@ -79,7 +79,7 @@
           <AfterMake>
             <RunUserProg1>1</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name>
+            <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name>
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>

bsp/stm32/libraries/templates/stm32l4xx/rtconfig.py

@@ -53,7 +53,7 @@ if PLATFORM == 'gcc':
     else:
         CFLAGS += ' -O2'
 
-    POST_ACTION = OBJCPY + ' -O binary $TARGET rt-thread.bin\n' + SIZE + ' $TARGET \n'
+    POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n'
 
 elif PLATFORM == 'armcc':
     # toolchains
@@ -81,7 +81,7 @@ elif PLATFORM == 'armcc':
     else:
         CFLAGS += ' -O2'
 
-    POST_ACTION = 'fromelf --bin $TARGET --output rt-thread.bin \nfromelf -z $TARGET'
+    POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
 
 elif PLATFORM == 'iar':
     # toolchains
@@ -127,4 +127,4 @@ elif PLATFORM == 'iar':
     LFLAGS += ' --entry __iar_program_start'
 
     EXEC_PATH = EXEC_PATH + '/arm/bin/'
-    POST_ACTION = 'ielftool --bin $TARGET rt-thread.bin'
+    POST_ACTION = 'ielftool --bin $TARGET rtthread.bin'

bsp/stm32/libraries/templates/stm32l4xx/template.ewp

@@ -636,7 +636,7 @@
                 </option>
                 <option>
                     <name>OOCOutputFile</name>
-                    <state>../../../rt-thread.bin</state>
+                    <state>../../../rtthread.bin</state>
                 </option>
                 <option>
                     <name>OOCCommandLineProducer</name>

bsp/stm32/libraries/templates/stm32l4xx/template.uvprojx

@@ -82,7 +82,7 @@
           <AfterMake>
             <RunUserProg1>1</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name>
+            <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>

bsp/stm32/stm32f103-atk-nano/applications/main.c

@@ -7,6 +7,7 @@
  * Date           Author       Notes
  * 2018-11-27     balanceTWK   change to new framework
  */
+
 #include <rtthread.h>
 #include <rtdevice.h>
 #include <board.h>

bsp/stm32/stm32f103-atk-nano/board/board.c

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author       Notes
  * 2018-11-06     balanceTWK   change to new framework

bsp/stm32/stm32f103-atk-nano/board/board.h

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author       Notes
  * 2018-11-5      SummerGift   change to new framework

bsp/stm32/stm32f103-atk-nano/board/ports/spi_flash_init.c

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  *
- *
  * Change Logs:
  * Date           Author       Notes
  * 2018-11-27     SummerGift   add spi flash port file

bsp/stm32/stm32f103-atk-nano/project.ewp

@@ -651,7 +651,7 @@
         </option>
         <option>
           <name>OOCOutputFile</name>
-          <state>../../../rt-thread.bin</state>
+          <state>../../../rtthread.bin</state>
         </option>
         <option>
           <name>OOCCommandLineProducer</name>

bsp/stm32/stm32f103-atk-nano/project.uvproj

@@ -73,7 +73,7 @@
           <AfterMake>
             <RunUserProg1>1</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name>
+            <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name>
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>

bsp/stm32/stm32f103-atk-nano/project.uvprojx

@@ -79,7 +79,7 @@
           <AfterMake>
             <RunUserProg1>1</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name>
+            <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name>
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>

bsp/stm32/stm32f103-atk-nano/rtconfig.py

@@ -53,7 +53,7 @@ if PLATFORM == 'gcc':
     else:
         CFLAGS += ' -O2'
 
-    POST_ACTION = OBJCPY + ' -O binary $TARGET rt-thread.bin\n' + SIZE + ' $TARGET \n'
+    POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n'
 
 elif PLATFORM == 'armcc':
     # toolchains
@@ -81,7 +81,7 @@ elif PLATFORM == 'armcc':
     else:
         CFLAGS += ' -O2'
 
-    POST_ACTION = 'fromelf --bin $TARGET --output rt-thread.bin \nfromelf -z $TARGET'
+    POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
 
 elif PLATFORM == 'iar':
     # toolchains
@@ -127,4 +127,4 @@ elif PLATFORM == 'iar':
     LFLAGS += ' --entry __iar_program_start'
 
     EXEC_PATH = EXEC_PATH + '/arm/bin/'
-    POST_ACTION = 'ielftool --bin $TARGET rt-thread.bin'
+    POST_ACTION = 'ielftool --bin $TARGET rtthread.bin'

bsp/stm32/stm32f103-atk-nano/template.ewp

@@ -636,7 +636,7 @@
                 </option>
                 <option>
                     <name>OOCOutputFile</name>
-                    <state>../../../rt-thread.bin</state>
+                    <state>../../../rtthread.bin</state>
                 </option>
                 <option>
                     <name>OOCCommandLineProducer</name>

bsp/stm32/stm32f103-atk-nano/template.uvproj

@@ -76,7 +76,7 @@
           <AfterMake>
             <RunUserProg1>1</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>fromelf --bin !L --output rt-thread.bin</UserProg1Name>
+            <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>