Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into xidatong

.gitmodules

@@ -1,11 +1,11 @@
-[submodule "Ubiquitous/RT_Thread/rt-thread"]
+[submodule "Ubiquitous/RT-Thread_Fusion_XiUOS/rt-thread"]
-	path = Ubiquitous/RT_Thread/rt-thread
+	path = Ubiquitous/RT-Thread_Fusion_XiUOS/rt-thread
 	url = https://code.gitlink.org.cn/chunyexixiaoyu/rt-thread.git
-[submodule "Ubiquitous/RT_Thread/aiit_board/k210/kendryte-sdk/kendryte-sdk-source"]
+[submodule "Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/k210/kendryte-sdk/kendryte-sdk-source"]
-	path = Ubiquitous/RT_Thread/aiit_board/k210/kendryte-sdk/kendryte-sdk-source
+	path = Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/k210/kendryte-sdk/kendryte-sdk-source
 	url = https://code.gitlink.org.cn/chunyexixiaoyu/kendryte-sdk-source.git
-[submodule "Ubiquitous/RT_Thread/aiit_board/aiit-riscv64-board/kendryte-sdk/kendryte-sdk-source"]
+[submodule "Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-riscv64-board/kendryte-sdk/kendryte-sdk-source"]
-	path = Ubiquitous/RT_Thread/aiit_board/aiit-riscv64-board/kendryte-sdk/kendryte-sdk-source
+	path = Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-riscv64-board/kendryte-sdk/kendryte-sdk-source
 	url = https://code.gitlink.org.cn/chunyexixiaoyu/kendryte-sdk-source.git
 [submodule "Ubiquitous/Nuttx_Fusion_XiUOS/apps"]
 	path = Ubiquitous/Nuttx_Fusion_XiUOS/apps

APP_Framework/Applications/app_test/test_spi_flash.c

@@ -1,21 +1,7 @@
 /*
- * File      : spi_flash_sfud.c
+ * Copyright (c) 2006-2021, RT-Thread Development Team
- * This file is part of RT-Thread RTOS
- * COPYRIGHT (C) 2006 - 2016, RT-Thread Development Team
  *
- *  This program is free software; you can redistribute it and/or modify
+ * SPDX-License-Identifier: Apache-2.0
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * Change Logs:
  * Date           Author       Notes

Ubiquitous/RT-Thread_Fusion_XiUOS/README.md

@@ -5,22 +5,22 @@
 ## 目录内容
 
 ```
-xiuos/Ubiquitous/Rt-thread
+xiuos/Ubiquitous/RT-Thread_Fusion_XiUOS
     ├── README.md    
     ├── aiit_board              板级支持包
         |──stm32f407_core
         |──k210
     ├── app_match_rt-thread     WiFi、Camera 等适配rt-thread的用户驱动
-    └── rt-thread               RT-Thread 代码
+    └── rt-thread               rt-thread 代码
 ```
 
 ## 支持平台
 
-Rt-thread/aiit_board 目前主要支持两个平台：STM32F4 和 Kendryte K210。如果后续用户想自己添加相关的板级支持包在此目录添加即可。
+RT-Thread_Fusion_XiUOS/aiit_board 目前主要支持平台：stm32f407_core，k210,aiit-riscv64-board,stm32h743_openmv_h7plus,xidatong.
 
-Rt-thread/app_match_rt-thread  目前主要支持 WiFi 和 Camera，其他驱动复用 RT-Thread 的内容。如果rt-thread官方仓库驱动不满足用户使用要求，如果用户增加相关驱动可在此目录。
+RT-Thread_Fusion_XiUOS/app_match_rt-thread  目前主要支持 WiFi 和 Camera，其他驱动复用 RT-Thread 的内容。如果rt-thread官方仓库驱动不满足用户使用要求，如果用户增加相关驱动可在此目录。
 
-Rt-thread/rt-thread 使用 RT-Thread 作为系统基础设施，提供底层支持。
+RT-Thread_Fusion_XiUOS/rt-thread 使用 RT-Thread 作为系统基础设施，提供底层支持。
 
 ## 使用
 
@@ -30,10 +30,10 @@ Rt-thread/rt-thread 使用 RT-Thread 作为系统基础设施，提供底层支
 # 下载代码
 # 进入xiuos目录下载更新子模块(包括RT-thread 和 K210 SDK（如果用到K210 需更新kendryte-sdk）)执行以下三条命令或者直接执行当前目录下的download.sh脚本命令
 git submodule init
-git submodule update Ubiquitous/RT_Thread/rt-thread
+git submodule update Ubiquitous/RT-Thread_Fusion_XiUOS/rt-thread
-git submodule update Ubiquitous/RT_Thread/aiit_board/k210/kendryte-sdk/kendryte-sdk-source
+git submodule update Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/k210/kendryte-sdk/kendryte-sdk-source
 
-# 进入 xiuos/Ubiquitous/Rt-thread/aiit_board/stm32f407_core 配置 Kconfig
+# 进入 xiuos/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/stm32f407_core 配置 Kconfig
 scons --menuconfig
 # 编译
 scons