From 87dc5269ee33fa0f21d0adfacca128f47cae1271 Mon Sep 17 00:00:00 2001 From: Liu_Weichao Date: Wed, 10 May 2023 14:39:16 +0800 Subject: [PATCH 01/11] fix fpu-config error by set -mfloat-abi=softfp in hc32f4a0 --- Ubiquitous/XiZi_IIoT/board/hc32f4a0/config.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/config.mk b/Ubiquitous/XiZi_IIoT/board/hc32f4a0/config.mk index c52aca76a..ef43289d2 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/config.mk +++ b/Ubiquitous/XiZi_IIoT/board/hc32f4a0/config.mk @@ -1,11 +1,11 @@ export CROSS_COMPILE ?=/usr/bin/arm-none-eabi- -export CFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -ffunction-sections -fdata-sections -Dgcc -O0 -gdwarf-2 -g -fgnu89-inline -Wa,-mimplicit-it=thumb -Werror -export AFLAGS := -c -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -ffunction-sections -fdata-sections -x assembler-with-cpp -Wa,-mimplicit-it=thumb -gdwarf-2 -export LFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_hc32f4a0.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds -export CXXFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -ffunction-sections -fdata-sections -Dgcc -O0 -gdwarf-2 -g -Werror +export CFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -ffunction-sections -fdata-sections -Dgcc -O0 -gdwarf-2 -g -fgnu89-inline -Wa,-mimplicit-it=thumb -Werror +export AFLAGS := -c -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -ffunction-sections -fdata-sections -x assembler-with-cpp -Wa,-mimplicit-it=thumb -gdwarf-2 +export LFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_hc32f4a0.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds +export CXXFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -ffunction-sections -fdata-sections -Dgcc -O0 -gdwarf-2 -g -Werror -export APPLFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds +export APPLFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds export DEFINES := -DHAVE_CCONFIG_H -DHC32F4A0 -DUSE_DDL_DRIVER -DHAVE_SIGINFO From d3df1f97efc7ee0f76fb19bec52207b49f6c626b Mon Sep 17 00:00:00 2001 From: "Wien.b" <18058767332@163.com> Date: Thu, 11 May 2023 19:55:48 -0700 Subject: [PATCH 02/11] modify edu-riscv64 compiler download link --- Ubiquitous/XiZi_IIoT/board/edu-riscv64/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ubiquitous/XiZi_IIoT/board/edu-riscv64/README.md b/Ubiquitous/XiZi_IIoT/board/edu-riscv64/README.md index c65511c16..8d7ac8384 100644 --- a/Ubiquitous/XiZi_IIoT/board/edu-riscv64/README.md +++ b/Ubiquitous/XiZi_IIoT/board/edu-riscv64/README.md @@ -65,7 +65,7 @@ cd kconfig-frontends ### 编译工具链： -RISC-V: riscv-none-embed-，默认安装到Ubuntu的/opt/，下载源码并解压。[下载网址 http://101.36.126.201:8011/gnu-mcu-eclipse.tar.bz2](http://101.36.126.201:8011/gnu-mcu-eclipse.tar.bz2) +RISC-V: riscv-none-embed-，默认安装到Ubuntu的/opt/，下载源码并解压。[下载链接：https://pan.baidu.com/s/1mWlR86FMc-xPQwDXJ_hiQg 提取码：XUOS](http://101.36.126.201:8011/gnu-mcu-eclipse.tar.bz2) ```shell $ tar -xjf gnu-mcu-eclipse.tar.bz2 -C /opt/ From 65603817a44ad02170f9c71d4994ecef43aa486e Mon Sep 17 00:00:00 2001 From: "Wien.b" <18058767332@163.com> Date: Sun, 14 May 2023 19:49:41 -0700 Subject: [PATCH 03/11] modify risc-v compiler download link --- Ubiquitous/XiZi_IIoT/board/edu-riscv64/README.md | 2 +- Ubiquitous/XiZi_IIoT/board/gapuino/README.md | 2 +- Ubiquitous/XiZi_IIoT/board/hifive1-emulator/README.md | 2 +- Ubiquitous/XiZi_IIoT/board/hifive1-rev-B/README.md | 2 +- Ubiquitous/XiZi_IIoT/board/k210-emulator/README.md | 2 +- Ubiquitous/XiZi_IIoT/board/rv32m1-vega/README.md | 2 +- Ubiquitous/XiZi_IIoT/board/xidatong-riscv64/README.md | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Ubiquitous/XiZi_IIoT/board/edu-riscv64/README.md b/Ubiquitous/XiZi_IIoT/board/edu-riscv64/README.md index 8d7ac8384..f29654841 100644 --- a/Ubiquitous/XiZi_IIoT/board/edu-riscv64/README.md +++ b/Ubiquitous/XiZi_IIoT/board/edu-riscv64/README.md @@ -65,7 +65,7 @@ cd kconfig-frontends ### 编译工具链： -RISC-V: riscv-none-embed-，默认安装到Ubuntu的/opt/，下载源码并解压。[下载链接：https://pan.baidu.com/s/1mWlR86FMc-xPQwDXJ_hiQg 提取码：XUOS](http://101.36.126.201:8011/gnu-mcu-eclipse.tar.bz2) +RISC-V: riscv-none-embed-，默认安装到Ubuntu的/opt/，下载源码并解压。[下载链接：https://pan.baidu.com/s/1mWlR86FMc-xPQwDXJ_hiQg 提取码：XUOS] ```shell $ tar -xjf gnu-mcu-eclipse.tar.bz2 -C /opt/ diff --git a/Ubiquitous/XiZi_IIoT/board/gapuino/README.md b/Ubiquitous/XiZi_IIoT/board/gapuino/README.md index 9daf41671..b718d9e29 100755 --- a/Ubiquitous/XiZi_IIoT/board/gapuino/README.md +++ b/Ubiquitous/XiZi_IIoT/board/gapuino/README.md @@ -68,7 +68,7 @@ cd kconfig-frontends ### 编译工具链： -RISC-V: riscv-none-embed-，默认安装到Ubuntu的/opt/，下载源码并解压。[下载网址 http://101.36.126.201:8011/gnu-mcu-eclipse.tar.bz2](http://101.36.126.201:8011/gnu-mcu-eclipse.tar.bz2) +RISC-V: riscv-none-embed-，默认安装到Ubuntu的/opt/，下载源码并解压。[下载链接：https://pan.baidu.com/s/1mWlR86FMc-xPQwDXJ_hiQg 提取码：XUOS] ```shell $ tar -xjf gnu-mcu-eclipse.tar.bz2 -C /opt/ diff --git a/Ubiquitous/XiZi_IIoT/board/hifive1-emulator/README.md b/Ubiquitous/XiZi_IIoT/board/hifive1-emulator/README.md index 4e8db0d1b..2ada64bee 100644 --- a/Ubiquitous/XiZi_IIoT/board/hifive1-emulator/README.md +++ b/Ubiquitous/XiZi_IIoT/board/hifive1-emulator/README.md @@ -84,7 +84,7 @@ cd kconfig-frontends ### 编译工具链： -RISC-V: riscv-none-embed-，默认安装到Ubuntu的/opt/，下载源码并解压。[下载网址 http://101.36.126.201:8011/gnu-mcu-eclipse.tar.bz2](http://101.36.126.201:8011/gnu-mcu-eclipse.tar.bz2)，下载完成后，执行以下命令： +RISC-V: riscv-none-embed-，默认安装到Ubuntu的/opt/，下载源码并解压。[下载链接：https://pan.baidu.com/s/1mWlR86FMc-xPQwDXJ_hiQg 提取码：XUOS]，下载完成后，执行以下命令： ```c sudo tar -xvjf gnu-mcu-eclipse.tar.bz2 -C /opt/ diff --git a/Ubiquitous/XiZi_IIoT/board/hifive1-rev-B/README.md b/Ubiquitous/XiZi_IIoT/board/hifive1-rev-B/README.md index 6a25be059..b4de073aa 100644 --- a/Ubiquitous/XiZi_IIoT/board/hifive1-rev-B/README.md +++ b/Ubiquitous/XiZi_IIoT/board/hifive1-rev-B/README.md @@ -19,7 +19,7 @@ $ sudo apt install build-essential pkg-config $ sudo apt install gcc make libncurses5-dev openssl libssl-dev bison flex libelf-dev autoconf libtool gperf libc6-dev git ``` -**源码下载：** XiUOS [https://www.gitlink.org.cn/xuos/xiuos](https://www.gitlink.org.cn/xuos/xiuos) +**源码下载：** XiUOS [下载链接：https://pan.baidu.com/s/1mWlR86FMc-xPQwDXJ_hiQg 提取码：XUOS] 新建一个空文件夹并进入文件夹中，并下载源码，具体命令如下： diff --git a/Ubiquitous/XiZi_IIoT/board/k210-emulator/README.md b/Ubiquitous/XiZi_IIoT/board/k210-emulator/README.md index cbf4d7d49..52b314074 100644 --- a/Ubiquitous/XiZi_IIoT/board/k210-emulator/README.md +++ b/Ubiquitous/XiZi_IIoT/board/k210-emulator/README.md @@ -82,7 +82,7 @@ cd kconfig-frontends ### 编译工具链： -RISC-V: riscv-none-embed-，默认安装到Ubuntu的/opt/，下载源码并解压。[下载网址 http://101.36.126.201:8011/gnu-mcu-eclipse.tar.bz2](http://101.36.126.201:8011/gnu-mcu-eclipse.tar.bz2)，下载完成后，执行以下命令： +RISC-V: riscv-none-embed-，默认安装到Ubuntu的/opt/，下载源码并解压。[下载链接：https://pan.baidu.com/s/1mWlR86FMc-xPQwDXJ_hiQg 提取码：XUOS]，下载完成后，执行以下命令： ```c sudo tar -xvjf gnu-mcu-eclipse.tar.bz2 -C /opt/ diff --git a/Ubiquitous/XiZi_IIoT/board/rv32m1-vega/README.md b/Ubiquitous/XiZi_IIoT/board/rv32m1-vega/README.md index 889b3ef43..04f1dd8c8 100755 --- a/Ubiquitous/XiZi_IIoT/board/rv32m1-vega/README.md +++ b/Ubiquitous/XiZi_IIoT/board/rv32m1-vega/README.md @@ -68,7 +68,7 @@ cd kconfig-frontends ### 编译工具链： -RISC-V: riscv-none-embed-，默认安装到Ubuntu的/opt/，下载并解压。[下载网址 https://open-isa.org/downloads/] +RISC-V: riscv-none-embed-，默认安装到Ubuntu的/opt/，下载并解压。[下载链接：https://pan.baidu.com/s/1mWlR86FMc-xPQwDXJ_hiQg 提取码：XUOS ![gnu](img/riscv_gnu.png) diff --git a/Ubiquitous/XiZi_IIoT/board/xidatong-riscv64/README.md b/Ubiquitous/XiZi_IIoT/board/xidatong-riscv64/README.md index ee278d46d..37316d895 100644 --- a/Ubiquitous/XiZi_IIoT/board/xidatong-riscv64/README.md +++ b/Ubiquitous/XiZi_IIoT/board/xidatong-riscv64/README.md @@ -65,7 +65,7 @@ cd kconfig-frontends ### 编译工具链： -RISC-V: riscv-none-embed-，默认安装到Ubuntu的/opt/，下载源码并解压。[下载网址 http://101.36.126.201:8011/gnu-mcu-eclipse.tar.bz2](http://101.36.126.201:8011/gnu-mcu-eclipse.tar.bz2) +RISC-V: riscv-none-embed-，默认安装到Ubuntu的/opt/，下载源码并解压。[下载链接：https://pan.baidu.com/s/1mWlR86FMc-xPQwDXJ_hiQg 提取码：XUOS] ```shell $ tar -xjf gnu-mcu-eclipse.tar.bz2 -C /opt/ From b97b9c49cd115e38abb06c091f9c31c944ad1f02 Mon Sep 17 00:00:00 2001 From: "Wien.b" <18058767332@163.com> Date: Sun, 14 May 2023 20:07:15 -0700 Subject: [PATCH 04/11] modify risc-v compiler download link --- Ubiquitous/XiZi_IIoT/board/hifive1-rev-B/README.md | 2 +- Ubiquitous/XiZi_IIoT/board/kd233/README.md | 2 +- Ubiquitous/XiZi_IIoT/board/rv32m1-vega/README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Ubiquitous/XiZi_IIoT/board/hifive1-rev-B/README.md b/Ubiquitous/XiZi_IIoT/board/hifive1-rev-B/README.md index b4de073aa..eb5debdde 100644 --- a/Ubiquitous/XiZi_IIoT/board/hifive1-rev-B/README.md +++ b/Ubiquitous/XiZi_IIoT/board/hifive1-rev-B/README.md @@ -71,7 +71,7 @@ cd kconfig-frontends ### 编译工具链： -RISC-V: riscv-none-embed-，默认安装到Ubuntu的/opt/，下载源码并解压。[下载网址 http://101.36.126.201:8011/gnu-mcu-eclipse.tar.bz2](http://101.36.126.201:8011/gnu-mcu-eclipse.tar.bz2) +RISC-V: riscv-none-embed-，默认安装到Ubuntu的/opt/，下载源码并解压。[下载链接：https://pan.baidu.com/s/1mWlR86FMc-xPQwDXJ_hiQg 提取码：XUOS] ```shell $ tar -xjf gnu-mcu-eclipse.tar.bz2 -C /opt/ diff --git a/Ubiquitous/XiZi_IIoT/board/kd233/README.md b/Ubiquitous/XiZi_IIoT/board/kd233/README.md index 4b86c7e56..cc6bfb67e 100644 --- a/Ubiquitous/XiZi_IIoT/board/kd233/README.md +++ b/Ubiquitous/XiZi_IIoT/board/kd233/README.md @@ -67,7 +67,7 @@ cd kconfig-frontends ### 编译工具链： -RISC-V: riscv-none-embed-，默认安装到Ubuntu的/opt/，下载源码并解压。[下载网址 http://101.36.126.201:8011/gnu-mcu-eclipse.tar.bz2](http://101.36.126.201:8011/gnu-mcu-eclipse.tar.bz2) +RISC-V: riscv-none-embed-，默认安装到Ubuntu的/opt/，下载源码并解压。[下载链接：https://pan.baidu.com/s/1mWlR86FMc-xPQwDXJ_hiQg 提取码：XUOS] ```shell $ tar -xjf gnu-mcu-eclipse.tar.bz2 -C /opt/ diff --git a/Ubiquitous/XiZi_IIoT/board/rv32m1-vega/README.md b/Ubiquitous/XiZi_IIoT/board/rv32m1-vega/README.md index 04f1dd8c8..889b3ef43 100755 --- a/Ubiquitous/XiZi_IIoT/board/rv32m1-vega/README.md +++ b/Ubiquitous/XiZi_IIoT/board/rv32m1-vega/README.md @@ -68,7 +68,7 @@ cd kconfig-frontends ### 编译工具链： -RISC-V: riscv-none-embed-，默认安装到Ubuntu的/opt/，下载并解压。[下载链接：https://pan.baidu.com/s/1mWlR86FMc-xPQwDXJ_hiQg 提取码：XUOS +RISC-V: riscv-none-embed-，默认安装到Ubuntu的/opt/，下载并解压。[下载网址 https://open-isa.org/downloads/] ![gnu](img/riscv_gnu.png) From a656ffaa66b6ab2db2fb2730d6a4778fcaab3251 Mon Sep 17 00:00:00 2001 From: "Wien.b" <18058767332@163.com> Date: Sun, 14 May 2023 20:17:43 -0700 Subject: [PATCH 05/11] recover modify --- Ubiquitous/XiZi_IIoT/board/hifive1-rev-B/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ubiquitous/XiZi_IIoT/board/hifive1-rev-B/README.md b/Ubiquitous/XiZi_IIoT/board/hifive1-rev-B/README.md index eb5debdde..7b8201710 100644 --- a/Ubiquitous/XiZi_IIoT/board/hifive1-rev-B/README.md +++ b/Ubiquitous/XiZi_IIoT/board/hifive1-rev-B/README.md @@ -19,7 +19,7 @@ $ sudo apt install build-essential pkg-config $ sudo apt install gcc make libncurses5-dev openssl libssl-dev bison flex libelf-dev autoconf libtool gperf libc6-dev git ``` -**源码下载：** XiUOS [下载链接：https://pan.baidu.com/s/1mWlR86FMc-xPQwDXJ_hiQg 提取码：XUOS] +**源码下载：** XiUOS [https://www.gitlink.org.cn/xuos/xiuos](https://www.gitlink.org.cn/xuos/xiuos) 新建一个空文件夹并进入文件夹中，并下载源码，具体命令如下： From ffeaf4771e8758eb6903ebc1aa242fabbbdc425f Mon Sep 17 00:00:00 2001 From: wgzAIIT <820906721@qq.com> Date: Wed, 17 May 2023 14:32:48 +0800 Subject: [PATCH 06/11] fix cortex-m0-emulator and cortex-m3-emulator compile error --- Ubiquitous/XiZi_IIoT/arch/arm/cortex-m0/prepare_ahwstack.c | 1 + Ubiquitous/XiZi_IIoT/arch/arm/shared/prepare_ahwstack.c | 1 + Ubiquitous/XiZi_IIoT/board/cortex-m0-emulator/.defconfig | 4 ++-- Ubiquitous/XiZi_IIoT/board/cortex-m3-emulator/.defconfig | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Ubiquitous/XiZi_IIoT/arch/arm/cortex-m0/prepare_ahwstack.c b/Ubiquitous/XiZi_IIoT/arch/arm/cortex-m0/prepare_ahwstack.c index 3562c1cf7..0ad6744a2 100644 --- a/Ubiquitous/XiZi_IIoT/arch/arm/cortex-m0/prepare_ahwstack.c +++ b/Ubiquitous/XiZi_IIoT/arch/arm/cortex-m0/prepare_ahwstack.c @@ -16,6 +16,7 @@ #include "svc_handle.h" #include #include +#include #if (defined ( __GNUC__ ) && defined ( __VFP_FP__ ) && !defined(__SOFTFP__)) #define USE_FPU 1 diff --git a/Ubiquitous/XiZi_IIoT/arch/arm/shared/prepare_ahwstack.c b/Ubiquitous/XiZi_IIoT/arch/arm/shared/prepare_ahwstack.c index 57935a830..bb941dcf6 100644 --- a/Ubiquitous/XiZi_IIoT/arch/arm/shared/prepare_ahwstack.c +++ b/Ubiquitous/XiZi_IIoT/arch/arm/shared/prepare_ahwstack.c @@ -18,6 +18,7 @@ #ifdef TOOL_SHELL #include #endif +#include #if (defined ( __GNUC__ ) && defined ( __VFP_FP__ ) && !defined(__SOFTFP__)) #define USE_FPU 1 diff --git a/Ubiquitous/XiZi_IIoT/board/cortex-m0-emulator/.defconfig b/Ubiquitous/XiZi_IIoT/board/cortex-m0-emulator/.defconfig index 3306c4652..29620e5d2 100644 --- a/Ubiquitous/XiZi_IIoT/board/cortex-m0-emulator/.defconfig +++ b/Ubiquitous/XiZi_IIoT/board/cortex-m0-emulator/.defconfig @@ -146,8 +146,8 @@ CONFIG_SHELL_USING_CMD_EXPORT=y CONFIG_SHELL_HELP_SHOW_PERMISSION=y # CONFIG_SHELL_HELP_LIST_VAR is not set # CONFIG_SHELL_HELP_LIST_KEY is not set -#CONFIG_KERNEL_QUEUEMANAGE=y -# CONFIG_KERNEL_WORKQUEUE is not set +CONFIG_KERNEL_QUEUEMANAGE=y +CONFIG_KERNEL_WORKQUEUE=y CONFIG_WORKQUEUE_KTASK_STACKSIZE=256 CONFIG_WORKQUEUE_KTASK_PRIORITY=2 CONFIG_QUEUE_MAX=2 diff --git a/Ubiquitous/XiZi_IIoT/board/cortex-m3-emulator/.defconfig b/Ubiquitous/XiZi_IIoT/board/cortex-m3-emulator/.defconfig index 22fb37eba..428cfeecd 100644 --- a/Ubiquitous/XiZi_IIoT/board/cortex-m3-emulator/.defconfig +++ b/Ubiquitous/XiZi_IIoT/board/cortex-m3-emulator/.defconfig @@ -136,8 +136,8 @@ CONFIG_SHELL_USING_CMD_EXPORT=y CONFIG_SHELL_HELP_SHOW_PERMISSION=y # CONFIG_SHELL_HELP_LIST_VAR is not set # CONFIG_SHELL_HELP_LIST_KEY is not set -#CONFIG_KERNEL_QUEUEMANAGE=y -# CONFIG_KERNEL_WORKQUEUE is not set +CONFIG_KERNEL_QUEUEMANAGE=y +CONFIG_KERNEL_WORKQUEUE=y CONFIG_WORKQUEUE_KTASK_STACKSIZE=256 CONFIG_WORKQUEUE_KTASK_PRIORITY=2 CONFIG_QUEUE_MAX=2 From 13432d41c6063fee573d57150ddd1c9d4c2f16c0 Mon Sep 17 00:00:00 2001 From: Liu_Weichao Date: Thu, 18 May 2023 16:48:55 +0800 Subject: [PATCH 07/11] fix compile error when gcc using <-with-newlib> function --- .../xizi/user_api/posix_support/include/pthread arm.h | 2 ++ Ubiquitous/XiZi_IIoT/board/cortex-m0-emulator/.defconfig | 9 ++------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/include/pthread arm.h b/APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/include/pthread arm.h index c5b23a0f1..d7be4dc16 100644 --- a/APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/include/pthread arm.h +++ b/APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/include/pthread arm.h @@ -29,6 +29,7 @@ extern "C" { #include #include +#if !defined(_SYS_SCHED_H_) && !defined(_SYS__PTHREADTYPES_H_) typedef int pid_t; typedef unsigned long int pthread_t; @@ -59,6 +60,7 @@ typedef struct pthread_mutexattr { } pthread_mutexattr_t; typedef int pthread_mutex_t ; +#endif #ifdef __cplusplus } diff --git a/Ubiquitous/XiZi_IIoT/board/cortex-m0-emulator/.defconfig b/Ubiquitous/XiZi_IIoT/board/cortex-m0-emulator/.defconfig index 29620e5d2..3c3d859bb 100644 --- a/Ubiquitous/XiZi_IIoT/board/cortex-m0-emulator/.defconfig +++ b/Ubiquitous/XiZi_IIoT/board/cortex-m0-emulator/.defconfig @@ -100,8 +100,8 @@ CONFIG_SMALL_NUMBER_64B=16 # # CONFIG_KERNEL_SEMAPHORE=y # CONFIG_KERNEL_MUTEX=y -CONFIG_KERNEL_EVENT=n -CONFIG_KERNEL_MESSAGEQUEUE=n +CONFIG_KERNEL_EVENT=y +CONFIG_KERNEL_MESSAGEQUEUE=y CONFIG_KTASK_PRIORITY_8=y CONFIG_KTASK_PRIORITY_MAX=8 CONFIG_TICK_PER_SECOND=100 @@ -115,11 +115,6 @@ CONFIG_IDLE_KTASK_STACKSIZE=512 CONFIG_ZOMBIE_KTASK_STACKSIZE=512 # CONFIG_KERNEL_TASK_ISOLATION is not set -# -# Memory Management -# -# CONFIG_KERNEL_MEMBLOCK is not set - # # Command shell # From 65220e5aa75951f06ba3087592d788526adffc99 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Sat, 20 May 2023 12:52:41 +0800 Subject: [PATCH 08/11] Update .gitmodules subdomain --- .gitmodules | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4db194dfe..0c1a2eedf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,31 +1,31 @@ [submodule "Ubiquitous/RT-Thread_Fusion_XiUOS/rt-thread"] path = Ubiquitous/RT-Thread_Fusion_XiUOS/rt-thread - url = https://code.gitlink.org.cn/chunyexixiaoyu/rt-thread.git + url = https://www.gitlink.org.cn/chunyexixiaoyu/rt-thread.git [submodule "Ubiquitous/RT-Thread_Fusion_XiUOS/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 + url = https://www.gitlink.org.cn/chunyexixiaoyu/kendryte-sdk-source.git [submodule "Ubiquitous/RT-Thread_Fusion_XiUOS/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 + url = https://www.gitlink.org.cn/chunyexixiaoyu/kendryte-sdk-source.git [submodule "Ubiquitous/XiZi/fs/lwext4/lwext4_submodule"] path = Ubiquitous/XiZi/fs/lwext4/lwext4_submodule url = https://gitlink.org.cn/xuos/lwext4_filesystem_support_XiUOS.git [submodule "Ubiquitous/Nuttx_Fusion_XiUOS/nuttx"] path = Ubiquitous/Nuttx_Fusion_XiUOS/nuttx - url = https://code.gitlink.org.cn/wgzAIIT/incubator-nuttx.git + url = https://www.gitlink.org.cn/wgzAIIT/incubator-nuttx.git [submodule "Ubiquitous/Nuttx_Fusion_XiUOS/apps"] path = Ubiquitous/Nuttx_Fusion_XiUOS/apps - url = https://code.gitlink.org.cn/wgzAIIT/incubator-nuttx-apps.git + url = https://www.gitlink.org.cn/wgzAIIT/incubator-nuttx-apps.git [submodule "APP_Framework/Applications/webnet/WebNet_XiUOS"] path = APP_Framework/Applications/webnet/WebNet_XiUOS url = https://gitlink.org.cn/xuos/WebNet_XiUOS.git [submodule "Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-riscv64/kendryte-sdk/kendryte-sdk-source"] path = Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-riscv64/kendryte-sdk/kendryte-sdk-source - url = https://code.gitlink.org.cn/chunyexixiaoyu/kendryte-sdk-source.git + url = https://www.gitlink.org.cn/chunyexixiaoyu/kendryte-sdk-source.git [submodule "APP_Framework/lib/lorawan/lora_radio_driver"] path = APP_Framework/lib/lorawan/lora_radio_driver url = https://gitlink.org.cn/IACU/lora_radio_driver.git [submodule "APP_Framework/lib/lorawan/lorawan_devicenode"] path = APP_Framework/lib/lorawan/lorawan_devicenode url = https://gitlink.org.cn/IACU/lorawan_devicenode.git - branch = master + branch = master \ No newline at end of file From 4e5e12379919dd135684dd62de798e010ac0abcf Mon Sep 17 00:00:00 2001 From: xxq250 Date: Sat, 20 May 2023 12:54:37 +0800 Subject: [PATCH 09/11] Update .gitmodules subdomain --- .gitmodules | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4db194dfe..5774c7030 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,27 +1,27 @@ [submodule "Ubiquitous/RT-Thread_Fusion_XiUOS/rt-thread"] path = Ubiquitous/RT-Thread_Fusion_XiUOS/rt-thread - url = https://code.gitlink.org.cn/chunyexixiaoyu/rt-thread.git + url = https://www.gitlink.org.cn/chunyexixiaoyu/rt-thread.git [submodule "Ubiquitous/RT-Thread_Fusion_XiUOS/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 + url = https://www.gitlink.org.cn/chunyexixiaoyu/kendryte-sdk-source.git [submodule "Ubiquitous/RT-Thread_Fusion_XiUOS/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 + url = https://www.gitlink.org.cn/chunyexixiaoyu/kendryte-sdk-source.git [submodule "Ubiquitous/XiZi/fs/lwext4/lwext4_submodule"] path = Ubiquitous/XiZi/fs/lwext4/lwext4_submodule url = https://gitlink.org.cn/xuos/lwext4_filesystem_support_XiUOS.git [submodule "Ubiquitous/Nuttx_Fusion_XiUOS/nuttx"] path = Ubiquitous/Nuttx_Fusion_XiUOS/nuttx - url = https://code.gitlink.org.cn/wgzAIIT/incubator-nuttx.git + url = https://www.gitlink.org.cn/wgzAIIT/incubator-nuttx.git [submodule "Ubiquitous/Nuttx_Fusion_XiUOS/apps"] path = Ubiquitous/Nuttx_Fusion_XiUOS/apps - url = https://code.gitlink.org.cn/wgzAIIT/incubator-nuttx-apps.git + url = https://www.gitlink.org.cn/wgzAIIT/incubator-nuttx-apps.git [submodule "APP_Framework/Applications/webnet/WebNet_XiUOS"] path = APP_Framework/Applications/webnet/WebNet_XiUOS url = https://gitlink.org.cn/xuos/WebNet_XiUOS.git [submodule "Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-riscv64/kendryte-sdk/kendryte-sdk-source"] path = Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-riscv64/kendryte-sdk/kendryte-sdk-source - url = https://code.gitlink.org.cn/chunyexixiaoyu/kendryte-sdk-source.git + url = https://www.gitlink.org.cn/chunyexixiaoyu/kendryte-sdk-source.git [submodule "APP_Framework/lib/lorawan/lora_radio_driver"] path = APP_Framework/lib/lorawan/lora_radio_driver url = https://gitlink.org.cn/IACU/lora_radio_driver.git From 089f9c8975c674a5abbb0f63117e729d24319c80 Mon Sep 17 00:00:00 2001 From: Liu_Weichao Date: Mon, 22 May 2023 20:21:50 +0800 Subject: [PATCH 10/11] fix cortex-m3-emulator start shell failure and fix compile error when using gcc -with-newlib param --- .../posix_support/include/pthread arm.h | 4 +- .../board/cortex-m3-emulator/.defconfig | 233 ------------------ .../XiZi_IIoT/resources/serial/dev_serial.c | 2 +- 3 files changed, 4 insertions(+), 235 deletions(-) delete mode 100644 Ubiquitous/XiZi_IIoT/board/cortex-m3-emulator/.defconfig diff --git a/APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/include/pthread arm.h b/APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/include/pthread arm.h index c5b23a0f1..2cf90b6e7 100644 --- a/APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/include/pthread arm.h +++ b/APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/include/pthread arm.h @@ -29,6 +29,7 @@ extern "C" { #include #include +#if !defined(_SYS_SCHED_H_) && !defined(_SYS__PTHREADTYPES_H_) typedef int pid_t; typedef unsigned long int pthread_t; @@ -58,7 +59,8 @@ typedef struct pthread_mutexattr { int pshared; } pthread_mutexattr_t; -typedef int pthread_mutex_t ; +typedef int pthread_mutex_t; +#endif #ifdef __cplusplus } diff --git a/Ubiquitous/XiZi_IIoT/board/cortex-m3-emulator/.defconfig b/Ubiquitous/XiZi_IIoT/board/cortex-m3-emulator/.defconfig deleted file mode 100644 index 428cfeecd..000000000 --- a/Ubiquitous/XiZi_IIoT/board/cortex-m3-emulator/.defconfig +++ /dev/null @@ -1,233 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# XiZi_IIoT Project Configuration -# -CONFIG_BOARD_CORTEX_M3_EVB=y -CONFIG_KERNEL_CONSOLE_DEVICE_NAME="uart0" - -# -# cortex-m3-emulator feature -# -# CONFIG_BSP_USING_AUDIO is not set -# CONFIG_BSP_USING_CAMERA is not set -# CONFIG_BSP_USING_SDIO is not set -# CONFIG_BSP_USING_DMA is not set -CONFIG_BSP_USING_GPIO=y -# CONFIG_BSP_USING_I2C is not set -# CONFIG_BSP_USING_I2S is not set -# CONFIG_BSP_USING_LCD is not set -# CONFIG_BSP_USING_RTC is not set -# CONFIG_BSP_USING_SECURITY is not set -# CONFIG_BSP_USING_SPI is not set -CONFIG_BSP_USING_UART=y -# CONFIG_BSP_USING_UART_HS is not set -# CONFIG_BSP_USING_VIDEO is not set -# CONFIG_BSP_USING_WDT is not set - -# -# General Purpose UARTs -# - -CONFIG___STACKSIZE__=4096 - -# -# Hardware feature -# -CONFIG_RESOURCES_SERIAL=y -# CONFIG_SERIAL_USING_DMA=y -CONFIG_SERIAL_RB_BUFSZ=64 -CONFIG_FS_VFS=y -# CONFIG_RESOURCES_HWTIMER is not set -# CONFIG_RESOURCES_I2C is not set -# CONFIG_RESOURCES_LCD is not set -# CONFIG_RESOURCES_SDIO is not set -# CONFIG_RESOURCES_TOUCH is not set -# CONFIG_RESOURCES_PIN=y -# CONFIG_RESOURCES_RTC is not set -# CONFIG_RESOURCES_SPI is not set -#CONFIG_RESOURCES_SPI_SD is not set -#CONFIG_RESOURCES_SPI_SFUD is not set -# SFUD_USING_SFDP is not set -# SFUD_USING_FLASH_INFO_TABLE is not set -# SFUD_DEBUG_LOG is not set -# CONFIG_RESOURCES_WDT is not set -# CONFIG_RESOURCES_USB is not set -# CONFIG_RESOURCES_USB_HOST is not set -# CONFIG_UDISK_MOUNTPOINT is not set -# CONFIG_USBH_MSTORAGE is not set -# CONFIG_RESOURCES_USB_DEVICE is not set -# CONFIG_USBD_THREAD_STACK_SZ is not set - -# -# Kernel feature -# - -# -# Kernel Device Object -# -CONFIG_KERNEL_DEVICE=y -CONFIG_KERNEL_CONSOLE=y -CONFIG_KERNEL_CONSOLEBUF_SIZE=128 - -# -# Task feature -# -CONFIG_SCHED_POLICY_RR_REMAINSLICE=y -# CONFIG_SCHED_POLICY_RR is not set -# CONFIG_SCHED_POLICY_FIFO is not set - -# -# Memory Management -# -# CONFIG_KERNEL_MEMBLOCK is not set -CONFIG_MEM_ALIGN_SIZE=4 -CONFIG_MM_PAGE_SIZE=1024 - -# -# Using small memory allocator -# -CONFIG_KERNEL_SMALL_MEM_ALLOC=y -CONFIG_SMALL_NUMBER_32B=32 -CONFIG_SMALL_NUMBER_64B=16 - -# -# Inter-Task communication -# -# CONFIG_KERNEL_SEMAPHORE=y -# CONFIG_KERNEL_MUTEX=y -CONFIG_KERNEL_EVENT=y -CONFIG_KERNEL_MESSAGEQUEUE=y -CONFIG_KTASK_PRIORITY_8=y -CONFIG_KTASK_PRIORITY_MAX=8 -CONFIG_TICK_PER_SECOND=100 -# CONFIG_KERNEL_STACK_OVERFLOW_CHECK=y -CONFIG_KERNEL_BANNER=y -# CONFIG_KERNEL_HOOK is not set -# CONFIG_KERNEL_SOFTTIMER=y -# CONFIG_KERNEL_IDLE_HOOK=y -# CONFIG_IDEL_HOOK_LIST_SIZE=4 -CONFIG_IDLE_KTASK_STACKSIZE=512 -CONFIG_ZOMBIE_KTASK_STACKSIZE=512 -# CONFIG_KERNEL_TASK_ISOLATION is not set - -# -# Command shell -# -CONFIG_TOOL_SHELL=y -CONFIG_SHELL_TASK_PRIORITY=4 -CONFIG_SHELL_TASK_STACK_SIZE=2048 - -# -# User Control -# -CONFIG_SHELL_DEFAULT_USER="letter" -CONFIG_SHELL_DEFAULT_USER_PASSWORD="" -CONFIG_SHELL_LOCK_TIMEOUT=10000 -CONFIG_SHELL_ENTER_CR_AND_LF=y -# CONFIG_SHELL_ENTER_CRLF is not set -CONFIG_SHELL_ENTER_CR=y -CONFIG_SHELL_ENTER_LF=y -CONFIG_SHELL_MAX_NUMBER=5 -CONFIG_SHELL_PARAMETER_MAX_NUMBER=8 -CONFIG_SHELL_HISTORY_MAX_NUMBER=5 -CONFIG_SHELL_PRINT_BUFFER=128 -CONFIG_SHELL_USING_CMD_EXPORT=y -# CONFIG_SHELL_HELP_LIST_USER is not set -CONFIG_SHELL_HELP_SHOW_PERMISSION=y -# CONFIG_SHELL_HELP_LIST_VAR is not set -# CONFIG_SHELL_HELP_LIST_KEY is not set -CONFIG_KERNEL_QUEUEMANAGE=y -CONFIG_KERNEL_WORKQUEUE=y -CONFIG_WORKQUEUE_KTASK_STACKSIZE=256 -CONFIG_WORKQUEUE_KTASK_PRIORITY=2 -CONFIG_QUEUE_MAX=2 -CONFIG_KERNEL_WAITQUEUE=y -CONFIG_KERNEL_DATAQUEUE=y -# CONFIG_KERNEL_CIRCULAR_AREA is not set -# CONFIG_KERNEL_AVL_TREE is not set -CONFIG_NAME_MAX=32 -CONFIG_ALIGN_SIZE=8 -CONFIG_KERNEL_COMPONENTS_INIT=n -CONFIG_KERNEL_USER_MAIN=y -CONFIG_MAIN_KTASK_STACK_SIZE=2048 -CONFIG_ENV_INIT_KTASK_STACK_SIZE=2048 -CONFIG_MAIN_KTASK_PRIORITY=3 -# CONFIG_USER_TEST is not set -# CONFIG_TOOL_TEST_SEM is not set -# CONFIG_TOOL_TEST_MUTEX is not set -# CONFIG_TOOL_TEST_EVENT is not set -# CONFIG_TOOL_TEST_MSG is not set -# CONFIG_TOOL_TEST_AVLTREE is not set -# CONFIG_TEST_CRICULAR_AREA is not set -# CONFIG_TOOL_TEST_MEM is not set -# CONFIG_TOOL_TEST_TIMER is not set -# CONFIG_TOOL_TEST_IWG is not set -# CONFIG_TOOL_TEST_REALTIME is not set -# CONFIG_TOOL_TEST_DBG is not set -# CONFIG_TOOL_TEST_SCHED is not set -# CONFIG_KERNEL_DEBUG is not set -#CONFIG_DEBUG_INIT_CONFIG=y -#CONFIG_DBG_INIT=1 -#CONFIG_ARCH_SMP=y -#CONFIG_CPUS_NR=2 - -# -# hash table config -# -CONFIG_ID_HTABLE_SIZE=4 -CONFIG_ID_NUM_MAX=16 - -# -# File system -# -CONFIG_FS_DFS=n -#CONFIG_DFS_USING_WORKDIR=y -#CONFIG_FS_DFS_DEVFS=y - -# -# Fat filesystem -# - -# -# IOT-Device File system -# - -# -# Lwext4 filesystem -# - -# -# APP Framework -# - -# -# connection -# -# CONFIG_CONNECTION_AT is not set -# CONFIG_CONNECTION_MQTT is not set - -# -# medium communication -# - - -# -# Intelligence -# - -# -# Control -# - -# -# Lib -# -CONFIG_LIB=y -CONFIG_LIB_POSIX=y -CONFIG_LIB_NEWLIB=y - -# CONFIG_LITTLEVGL2RTT_USING_DEMO=y - -# -# Security -# diff --git a/Ubiquitous/XiZi_IIoT/resources/serial/dev_serial.c b/Ubiquitous/XiZi_IIoT/resources/serial/dev_serial.c index 428e1c935..37396e6ea 100644 --- a/Ubiquitous/XiZi_IIoT/resources/serial/dev_serial.c +++ b/Ubiquitous/XiZi_IIoT/resources/serial/dev_serial.c @@ -154,7 +154,7 @@ static inline int SerialDevIntRead(struct SerialHardwareDevice *serial_dev, stru CriticalAreaUnLock(lock); - MdelayKTask(20); + //MdelayKTask(20); *read_data = get_char; read_data++; From 93a8685c31540b15217351ec2701f11901256173 Mon Sep 17 00:00:00 2001 From: Liu_Weichao Date: Mon, 22 May 2023 20:37:08 +0800 Subject: [PATCH 11/11] fix cortex-m0-emulator start shell failure --- .../board/cortex-m0-emulator/.defconfig | 331 ++++++++++-------- 1 file changed, 177 insertions(+), 154 deletions(-) diff --git a/Ubiquitous/XiZi_IIoT/board/cortex-m0-emulator/.defconfig b/Ubiquitous/XiZi_IIoT/board/cortex-m0-emulator/.defconfig index 3c3d859bb..ed725c23c 100644 --- a/Ubiquitous/XiZi_IIoT/board/cortex-m0-emulator/.defconfig +++ b/Ubiquitous/XiZi_IIoT/board/cortex-m0-emulator/.defconfig @@ -2,90 +2,40 @@ # Automatically generated file; DO NOT EDIT. # XiZi_IIoT Project Configuration # -CONFIG_BOARD_CORTEX_M3_EVB=y +CONFIG_BOARD_CORTEX_M0_EVB=y CONFIG_KERNEL_CONSOLE_DEVICE_NAME="uart0" -#CONFIG_LED0=24 -#CONFIG_LED1=25 -CONFIG_ARCH_RISCV=y -CONFIG_ARCH_RISCV32=y -CONFIG_ARCH_CPU_32BIT=y +CONFIG_ARCH_ARM=y # -# cortex-m3-emulator feature +# cortex-m0 emulator feature # -# CONFIG_BSP_USING_AUDIO is not set -# CONFIG_BSP_USING_CAMERA is not set -# CONFIG_BSP_USING_SDIO is not set -# CONFIG_BSP_USING_DMA is not set -CONFIG_BSP_USING_GPIO=y -# CONFIG_BSP_USING_I2C is not set -# CONFIG_BSP_USING_I2S is not set -# CONFIG_BSP_USING_LCD is not set -# CONFIG_BSP_USING_RTC is not set -# CONFIG_BSP_USING_SECURITY is not set -# CONFIG_BSP_USING_SPI is not set -CONFIG_BSP_USING_UART=y -# CONFIG_BSP_USING_UART_HS is not set -# CONFIG_BSP_USING_VIDEO is not set -# CONFIG_BSP_USING_WDT is not set - -# -# General Purpose UARTs -# - -CONFIG___STACKSIZE__=4096 # # Hardware feature # CONFIG_RESOURCES_SERIAL=y -# CONFIG_SERIAL_USING_DMA=y +# CONFIG_SERIAL_USING_DMA is not set CONFIG_SERIAL_RB_BUFSZ=64 -CONFIG_FS_VFS=n -# CONFIG_RESOURCES_HWTIMER is not set -# CONFIG_RESOURCES_I2C is not set -# CONFIG_RESOURCES_LCD is not set -# CONFIG_RESOURCES_SDIO is not set -# CONFIG_RESOURCES_TOUCH is not set -# CONFIG_RESOURCES_PIN=y -# CONFIG_RESOURCES_RTC is not set -# CONFIG_RESOURCES_SPI is not set -#CONFIG_RESOURCES_SPI_SD is not set -#CONFIG_RESOURCES_SPI_SFUD is not set -# SFUD_USING_SFDP is not set -# SFUD_USING_FLASH_INFO_TABLE is not set -# SFUD_DEBUG_LOG is not set -# CONFIG_RESOURCES_WDT is not set -# CONFIG_RESOURCES_USB is not set -# CONFIG_RESOURCES_USB_HOST is not set -# CONFIG_UDISK_MOUNTPOINT is not set -# CONFIG_USBH_MSTORAGE is not set -# CONFIG_RESOURCES_USB_DEVICE is not set -# CONFIG_USBD_THREAD_STACK_SZ is not set # # Kernel feature # # -# Kernel Device Object +# separate compile(choose none for compile once) # -CONFIG_KERNEL_DEVICE=y -CONFIG_KERNEL_CONSOLE=y -CONFIG_KERNEL_CONSOLEBUF_SIZE=128 - -# -# Task feature -# -CONFIG_SCHED_POLICY_RR_REMAINSLICE=y -# CONFIG_SCHED_POLICY_RR is not set -# CONFIG_SCHED_POLICY_FIFO is not set +# CONFIG_SEPARATE_COMPILE is not set +# CONFIG_COMPILER_APP is not set +# CONFIG_APP_STARTUP_FROM_SDCARD is not set +CONFIG_APP_STARTUP_FROM_FLASH=y +# CONFIG_COMPILER_KERNEL is not set # # Memory Management # # CONFIG_KERNEL_MEMBLOCK is not set CONFIG_MEM_ALIGN_SIZE=4 +# CONFIG_MEM_EXTERN_SRAM is not set CONFIG_MM_PAGE_SIZE=1024 # @@ -95,149 +45,222 @@ CONFIG_KERNEL_SMALL_MEM_ALLOC=y CONFIG_SMALL_NUMBER_32B=32 CONFIG_SMALL_NUMBER_64B=16 +# +# Task feature +# +CONFIG_USER_APPLICATION=y +# CONFIG_TASK_ISOLATION is not set + # # Inter-Task communication # -# CONFIG_KERNEL_SEMAPHORE=y -# CONFIG_KERNEL_MUTEX=y +CONFIG_KERNEL_SEMAPHORE=y +CONFIG_KERNEL_MUTEX=y CONFIG_KERNEL_EVENT=y CONFIG_KERNEL_MESSAGEQUEUE=y +# CONFIG_KERNEL_SOFTTIMER is not set +CONFIG_SCHED_POLICY_RR_REMAINSLICE=y +# CONFIG_SCHED_POLICY_RR is not set +# CONFIG_SCHED_POLICY_FIFO is not set CONFIG_KTASK_PRIORITY_8=y +# CONFIG_KTASK_PRIORITY_32 is not set +# CONFIG_KTASK_PRIORITY_256 is not set CONFIG_KTASK_PRIORITY_MAX=8 CONFIG_TICK_PER_SECOND=100 -# CONFIG_KERNEL_STACK_OVERFLOW_CHECK=y -CONFIG_KERNEL_BANNER=y -# CONFIG_KERNEL_HOOK is not set -# CONFIG_KERNEL_SOFTTIMER=y -# CONFIG_KERNEL_IDLE_HOOK=y -# CONFIG_IDEL_HOOK_LIST_SIZE=4 +CONFIG_KERNEL_STACK_OVERFLOW_CHECK=y CONFIG_IDLE_KTASK_STACKSIZE=512 CONFIG_ZOMBIE_KTASK_STACKSIZE=512 -# CONFIG_KERNEL_TASK_ISOLATION is not set + +# +# Kernel Console +# +CONFIG_KERNEL_CONSOLE=y +CONFIG_KERNEL_BANNER=y +CONFIG_KERNEL_CONSOLEBUF_SIZE=128 + +# +# Kernel Hook +# +# CONFIG_KERNEL_HOOK is not set # # Command shell # CONFIG_TOOL_SHELL=y -CONFIG_SHELL_TASK_PRIORITY=4 -CONFIG_SHELL_TASK_STACK_SIZE=2048 +CONFIG_SHELL_ENTER_CR=y +CONFIG_SHELL_ENTER_LF=y +CONFIG_SHELL_ENTER_CR_AND_LF=y +# CONFIG_SHELL_ENTER_CRLF is not set # -# User Control +# Set shell user control # CONFIG_SHELL_DEFAULT_USER="letter" CONFIG_SHELL_DEFAULT_USER_PASSWORD="" CONFIG_SHELL_LOCK_TIMEOUT=10000 -CONFIG_SHELL_ENTER_CR_AND_LF=y -# CONFIG_SHELL_ENTER_CRLF is not set -CONFIG_SHELL_ENTER_CR=y -CONFIG_SHELL_ENTER_LF=y + +# +# Set shell config param +# +CONFIG_SHELL_TASK_STACK_SIZE=2048 +CONFIG_SHELL_TASK_PRIORITY=5 CONFIG_SHELL_MAX_NUMBER=5 CONFIG_SHELL_PARAMETER_MAX_NUMBER=8 CONFIG_SHELL_HISTORY_MAX_NUMBER=5 CONFIG_SHELL_PRINT_BUFFER=128 -CONFIG_SHELL_USING_CMD_EXPORT=y -# CONFIG_SHELL_HELP_LIST_USER is not set CONFIG_SHELL_HELP_SHOW_PERMISSION=y +# CONFIG_SHELL_HELP_LIST_USER is not set # CONFIG_SHELL_HELP_LIST_VAR is not set # CONFIG_SHELL_HELP_LIST_KEY is not set + +# +# Kernel data structure Manage +# CONFIG_KERNEL_QUEUEMANAGE=y -CONFIG_KERNEL_WORKQUEUE=y +# CONFIG_KERNEL_WORKQUEUE is not set CONFIG_WORKQUEUE_KTASK_STACKSIZE=256 -CONFIG_WORKQUEUE_KTASK_PRIORITY=2 +CONFIG_WORKQUEUE_KTASK_PRIORITY=6 CONFIG_QUEUE_MAX=2 -CONFIG_KERNEL_WAITQUEUE=y +CONFIG_KERNEL_WAITQUEUE is not set CONFIG_KERNEL_DATAQUEUE=y # CONFIG_KERNEL_CIRCULAR_AREA is not set # CONFIG_KERNEL_AVL_TREE is not set -CONFIG_NAME_MAX=32 -CONFIG_ALIGN_SIZE=8 -CONFIG_KERNEL_COMPONENTS_INIT=n -CONFIG_KERNEL_USER_MAIN=y -CONFIG_MAIN_KTASK_STACK_SIZE=2048 + +# +# Kernel components init +# +CONFIG_KERNEL_COMPONENTS_INIT=y CONFIG_ENV_INIT_KTASK_STACK_SIZE=2048 -CONFIG_MAIN_KTASK_PRIORITY=3 -# CONFIG_USER_TEST is not set -# CONFIG_TOOL_TEST_SEM is not set -# CONFIG_TOOL_TEST_MUTEX is not set -# CONFIG_TOOL_TEST_EVENT is not set -# CONFIG_TOOL_TEST_MSG is not set -# CONFIG_TOOL_TEST_AVLTREE is not set -# CONFIG_TEST_CRICULAR_AREA is not set -# CONFIG_TOOL_TEST_MEM is not set -# CONFIG_TOOL_TEST_TIMER is not set -# CONFIG_TOOL_TEST_IWG is not set -# CONFIG_TOOL_TEST_REALTIME is not set -# CONFIG_TOOL_TEST_DBG is not set -# CONFIG_TOOL_TEST_SCHED is not set +CONFIG_KERNEL_USER_MAIN=y +CONFIG_NAME_NUM_MAX=32 # CONFIG_KERNEL_DEBUG is not set -#CONFIG_DEBUG_INIT_CONFIG=y -#CONFIG_DBG_INIT=1 -#CONFIG_ARCH_SMP=y -#CONFIG_CPUS_NR=2 +# CONFIG_ARCH_SMP is not set # # hash table config # CONFIG_ID_HTABLE_SIZE=4 CONFIG_ID_NUM_MAX=16 +# CONFIG_KERNEL_TEST is not set # -# File system -# -CONFIG_FS_DFS=n -#CONFIG_DFS_USING_WORKDIR=y -#CONFIG_FS_DFS_DEVFS=y - -# -# Fat filesystem -# - -# -# IOT-Device File system -# - -# -# Lwext4 filesystem -# - -# -# APP Framework -# - -# -# Perception -# -# CONFIG_PERCEPTION_SENSORDEVICE is not set - -# -# connection -# -# CONFIG_CONNECTION_AT is not set -# CONFIG_CONNECTION_MQTT is not set - -# -# medium communication -# - - -# -# Intelligence -# - -# -# Control -# - -# -# Lib +# Kernel Lib # CONFIG_LIB=y CONFIG_LIB_POSIX=y CONFIG_LIB_NEWLIB=y +# CONFIG_LIB_MUSLLIB is not set +# CONFIG_LIB_OTHER is not set -# CONFIG_LITTLEVGL2RTT_USING_DEMO=y +# +# C++ features +# +# CONFIG_LIB_CPLUSPLUS is not set + +# +# File system +# +# CONFIG_FS_VFS is not set + +# +# Tool feature +# + +# +# OTA function +# +# CONFIG_TOOL_USING_OTA is not set + +# +# APP_Framework +# + +# +# Framework +# +CONFIG_TRANSFORM_LAYER_ATTRIUBUTE=y +CONFIG_ADD_XIZI_FETURES=y +# CONFIG_ADD_NUTTX_FETURES is not set +# CONFIG_ADD_RTTHREAD_FETURES is not set +# CONFIG_SUPPORT_SENSOR_FRAMEWORK is not set +# CONFIG_SUPPORT_CONNECTION_FRAMEWORK is not set +# CONFIG_SUPPORT_KNOWING_FRAMEWORK is not set +# CONFIG_SUPPORT_CONTROL_FRAMEWORK is not set # # Security # +# CONFIG_CRYPTO is not set +# CONFIG_MBEDTLS is not set + +# +# Applications +# + +# +# config stack size and priority of main task +# +CONFIG_MAIN_KTASK_STACK_SIZE=1024 +CONFIG_MAIN_KTASK_PRIORITY=4 + +# +# ota app +# +# CONFIG_APPLICATION_OTA is not set + +# +# test app +# +# CONFIG_USER_TEST is not set + +# +# connection app +# +# CONFIG_APPLICATION_CONNECTION is not set + +# +# control app +# + +# +# knowing app +# +# CONFIG_APPLICATION_KNOWING is not set + +# +# sensor app +# +# CONFIG_APPLICATION_SENSOR is not set +# CONFIG_USING_EMBEDDED_DATABASE_APP is not set +# CONFIG_APP_USING_WEBNET is not set + +# +# app lib +# +CONFIG_APP_SELECT_NEWLIB=y +# CONFIG_APP_SELECT_OTHER_LIB is not set + +# +# lib using cJSON +# +# CONFIG_LIB_USING_CJSON is not set + +# +# lib using queue +# +# CONFIG_LIB_USING_QUEUE is not set + +# +# lib using LVGL +# +# CONFIG_LIB_LV is not set + +# +# lib using embedded_database +# +# CONFIG_USING_EMBEDDED_DATABASE is not set + +# +# lib using LoRaWan +# +# CONFIG_LIB_USING_LORAWAN is not set