Merge branch 'master' of https://github.com/RT-Thread/rt-thread into nuvoton

7 files changed, 29 insertions, 16 deletions

diff --git a/bsp/nuclei/README.md b/bsp/nuclei/README.md
index cd043b1527..8892c73bdb 100644
--- a/bsp/nuclei/README.md
+++ b/bsp/nuclei/README.md
@@ -1,12 +1,12 @@
 # Nuclei RISC-V Processor Support Package
 
-This directory provided support for [Nuclei RISC-V Processor](https://nucleisys.com/) based board,
+This directory provided support for [Nuclei RISC-V Processor](https://nucleisys.com/) based boards,
 currently we mainly provided the following board support packages.
 
-| **BSP**                              | **Development Board Name**                                                                                                  |
-| :----------------------------------- | :-------------------------------------------------------------------------------------------------------------------------- |
-| [gd32vf103_rvstar](gd32vf103_rvstar) | [Nuclei RV-STAR Arduino Compatible Development Board](https://www.riscv-mcu.com/quickstart-quickstart-index-u-RV_STAR.html) |
-| [hbird_eval](hbird_eval)             | [Nuclei HummingBird FPGA Evaluation Development Board](https://nucleisys.com/developboard.php)                              |
+| **BSP**                              | **Development Board Name**                                                                                 |
+| :----------------------------------- | :--------------------------------------------------------------------------------------------------------- |
+| [gd32vf103_rvstar](gd32vf103_rvstar) | [Nuclei RV-STAR Arduino Compatible Development Board](https://www.rvmcu.com/quickstart-doc-u-rvstar.html)  |
+| [hbird_eval](hbird_eval)             | [Nuclei HummingBird FPGA Evaluation Development Board](https://nucleisys.com/developboard.php#ddr200t)     |
 
 **If you want to learn more about Nuclei Processors, please click the following links:**
 
@@ -16,6 +16,6 @@ currently we mainly provided the following board support packages.
 * [RISC-V MCU Open Source Software Organization in Github](https://github.com/riscv-mcu/)
 * [RISC-V MCU Open Source Software Organization in Gitee](https://gitee.com/riscv-mcu/)
 * [Professional Nuclei Processor Development Boards](https://nucleisys.com/developboard.php)
-* [Comprehensive Documents and Development Tools](https://nucleisys.com/download.php)
+* [Comprehensive Documents and Development Tools](https://nucleisys.com/download.php#tools)
 * [Active RISC-V IP and MCU Community](https://www.rvmcu.com/)
 * [Professional University Program](https://nucleisys.com/campus.php)
diff --git a/bsp/nuclei/gd32vf103_rvstar/README.md b/bsp/nuclei/gd32vf103_rvstar/README.md
index 5b8c61804a..6b3548e705 100644
--- a/bsp/nuclei/gd32vf103_rvstar/README.md
+++ b/bsp/nuclei/gd32vf103_rvstar/README.md
@@ -4,7 +4,7 @@
 
 **RVSTAR开发板** 是由[芯来科技Nuclei](https://nucleisys.com/)公司推出的基于采用芯来科技RISC-V架构处理器芯片的GD32VF103的开发板。
 
-更多关于 **RVSTAR开发板** 开发板的详细资料请参见 [RVSTAR开发板快速入门](https://www.rvmcu.com/quickstart-quickstart-index-u-RV_STAR.html)
+更多关于 **RVSTAR开发板** 开发板的详细资料请参见 [RVSTAR开发板快速入门](https://www.rvmcu.com/quickstart-doc-u-rvstar.html)
 
 ### 板载资源
 
@@ -103,7 +103,7 @@ A debugging session is active.
         Inferior 1 [Remote target] will be detached.
 
 Quit anyway? (y or n) [answered Y; input not from terminal]
-Remote communication error.  Target disconnected.: Success.
+[Inferior 1 (Remote target) detached]
 ~~~
 
 下载程序之后, 连接串口(115200-N-8-1), 可以看到 RT-Thread 的输出信息：
diff --git a/bsp/nuclei/gd32vf103_rvstar/SConstruct b/bsp/nuclei/gd32vf103_rvstar/SConstruct
index 58c5d745d7..11e4a3ee3c 100644
--- a/bsp/nuclei/gd32vf103_rvstar/SConstruct
+++ b/bsp/nuclei/gd32vf103_rvstar/SConstruct
@@ -75,7 +75,7 @@ if run_target in SUPPORT_RUN_TARGETS:
             upload_cmd = '{} {} -ex "set remotetimeout 240" \
                     -ex "target remote | openocd --pipe -f {}" \
                     --batch -ex "monitor halt" -ex "monitor flash protect 0 0 last off" -ex "load" \
-                    -ex "monitor resume" -ex "monitor shutdown" -ex "quit"'.format(GDB, TARGET, openocd_cfg)
+                    -ex "monitor resume" -ex "quit"'.format(GDB, TARGET, openocd_cfg)
             print("Upload application {} using openocd and gdb".format(TARGET))
             print(upload_cmd)
             os.system(upload_cmd)
diff --git a/bsp/nuclei/hbird_eval/README.md b/bsp/nuclei/hbird_eval/README.md
index 6664ed5a32..4d87066959 100644
--- a/bsp/nuclei/hbird_eval/README.md
+++ b/bsp/nuclei/hbird_eval/README.md
@@ -1,10 +1,14 @@
-# 芯来科技蜂鸟FPGA评估板 #
+# 芯来科技蜂鸟FPGA评估板
 
 ## 简介
 
-**蜂鸟FPGA评估板** 是由芯来科技公司推出的用于测试评估芯来RISC-V内核处理器的FPGA评估板。
+**蜂鸟FPGA系列评估板** 是由芯来科技公司推出的用于一系列测试评估芯来RISC-V内核处理器的FPGA评估板。
 
-更多关于 **蜂鸟FPGA评估板** 开发板的详细资料请参见 [蜂鸟FPGA评估板](https://nucleisys.com/developboard.php)
+更多关于 **蜂鸟FPGA评估板** 开发板的详细资料请参见:
+
+* [Nuclei DDR200T开发板](https://nucleisys.com/developboard.php#ddr200t)
+* [Nuclei MCU200T开发板](https://nucleisys.com/developboard.php#mcu200t)
+* [蜂鸟开发板](https://nucleisys.com/developboard.php#hbird100t)
 
 ### 板载资源
 
@@ -57,7 +61,9 @@ export PATH=~/Software/Nuclei/gcc/bin:~/Software/Nuclei/openocd/bin:$PATH
 
 ## 烧写及执行
 
-### [驱动设置](https://nucleisys.com/developboard.php)
+### 驱动设置
+
+驱动安装设置，请参考[Nuclei FPGA开发板介绍](https://nucleisys.com/upload/files/fpga/doc/Nuclei_FPGA_DebugKit_Intro_202012.pdf)
 
 ### 编译程序
 
@@ -110,7 +116,7 @@ A debugging session is active.
         Inferior 1 [Remote target] will be detached.
 
 Quit anyway? (y or n) [answered Y; input not from terminal]
-Remote communication error.  Target disconnected.: Success.
+[Inferior 1 (Remote target) detached]
 ~~~
 
 下载程序之后, 连接**串口(57600-N-8-1)**, 可以看到 RT-Thread 的输出信息:
diff --git a/bsp/nuclei/hbird_eval/SConstruct b/bsp/nuclei/hbird_eval/SConstruct
index 58c5d745d7..11e4a3ee3c 100644
--- a/bsp/nuclei/hbird_eval/SConstruct
+++ b/bsp/nuclei/hbird_eval/SConstruct
@@ -75,7 +75,7 @@ if run_target in SUPPORT_RUN_TARGETS:
             upload_cmd = '{} {} -ex "set remotetimeout 240" \
                     -ex "target remote | openocd --pipe -f {}" \
                     --batch -ex "monitor halt" -ex "monitor flash protect 0 0 last off" -ex "load" \
-                    -ex "monitor resume" -ex "monitor shutdown" -ex "quit"'.format(GDB, TARGET, openocd_cfg)
+                    -ex "monitor resume" -ex "quit"'.format(GDB, TARGET, openocd_cfg)
             print("Upload application {} using openocd and gdb".format(TARGET))
             print(upload_cmd)
             os.system(upload_cmd)
diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_crypto.c b/bsp/stm32/libraries/HAL_Drivers/drv_crypto.c
index a6723f8a70..b093516ca5 100644
--- a/bsp/stm32/libraries/HAL_Drivers/drv_crypto.c
+++ b/bsp/stm32/libraries/HAL_Drivers/drv_crypto.c
@@ -9,6 +9,7 @@
  * 2020-10-14     Dozingfiretruck   Porting for stm32wbxx
  * 2020-11-26     thread-liu   add hash
  * 2020-11-26     thread-liu   add cryp
+ * 2020-12-11     WKJay        fix build problem
  */
 
 #include <rtthread.h>
@@ -628,6 +629,7 @@ static void _crypto_reset(struct rt_hwcrypto_ctx *ctx)
     }
 }
 
+#if defined(HASH2_IN_DMA_INSTANCE)
 void HASH2_DMA_IN_IRQHandler(void)
 {
     extern DMA_HandleTypeDef hdma_hash_in;
@@ -640,7 +642,9 @@ void HASH2_DMA_IN_IRQHandler(void)
     /* leave interrupt */
     rt_interrupt_leave();
 }
+#endif
 
+#if defined(CRYP2_IN_DMA_INSTANCE)
 void CRYP2_DMA_IN_IRQHandler(void)
 {   
     extern DMA_HandleTypeDef hdma_cryp_in;
@@ -653,7 +657,9 @@ void CRYP2_DMA_IN_IRQHandler(void)
     /* leave interrupt */
     rt_interrupt_leave();
 }
+#endif
 
+#if defined (CRYP2_OUT_DMA_INSTANCE)
 void CRYP2_DMA_OUT_IRQHandler(void)
 {
     extern DMA_HandleTypeDef hdma_cryp_out;
@@ -666,6 +672,7 @@ void CRYP2_DMA_OUT_IRQHandler(void)
     /* leave interrupt */
     rt_interrupt_leave();
 }
+#endif
 
 static const struct rt_hwcrypto_ops _ops =
 {
diff --git a/bsp/stm32/stm32f746-st-disco/rtconfig.py b/bsp/stm32/stm32f746-st-disco/rtconfig.py
index 32cb0dd9d4..de934eeac7 100644
--- a/bsp/stm32/stm32f746-st-disco/rtconfig.py
+++ b/bsp/stm32/stm32f746-st-disco/rtconfig.py
@@ -42,7 +42,7 @@ if PLATFORM == 'gcc':
     OBJCPY = PREFIX + 'objcopy'
     STRIP = PREFIX + 'strip'
 
-    DEVICE = ' -mcpu=' + CPU + ' -mthumb -mfpu=fpv5-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections'
+    DEVICE = ' -mcpu=' + CPU + ' -mthumb -mfpu=fpv5-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections'
     CFLAGS = DEVICE + ' -g -Wall'
     AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp -Wa,-mimplicit-it=thumb '
     LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,Reset_Handler -T board/linker_scripts/link.lds'