From 578680f6e57d56192bd2739decc8ef756ab12e8c Mon Sep 17 00:00:00 2001 From: Wang_Weigen Date: Wed, 22 Jun 2022 17:11:04 +0800 Subject: [PATCH] rename board name 'gd32vf103_rvstar' as 'gd32vf103-rvstar' --- Ubiquitous/XiZi/Makefile | 2 +- Ubiquitous/XiZi/README.md | 2 +- Ubiquitous/XiZi/arch/risc-v/Makefile | 2 +- .../Makefile | 0 .../arch_interrupt.h | 0 .../boot.S | 0 .../interrupt.c | 0 .../intexc_gd32vf103.S | 0 .../tick.c | 0 .../Kconfig | 2 +- .../Makefile | 0 .../README.md | 18 +++++++++--------- .../board.c | 0 .../board.h | 0 .../config.mk | 0 .../gd32vf103v_rvstar.c | 0 .../gd32vf103v_rvstar.h | 0 .../img/GigaDevice.png | Bin .../img/ISP_support_usart.png | Bin .../img/bin_flash.png | Bin .../img/boot_mode.png | Bin .../img/gdb_load.png | Bin .../img/menuconfig.png | Bin .../img/openocd.png | Bin .../img/riscv_gnu.png | Bin .../img/terminal.png | Bin .../img/vscode.jpg | Bin .../link.lds | 0 .../nuclei_sdk_hal.h | 0 .../nuclei_sdk_soc.h | 0 .../third_party_driver/Kconfig | 0 .../third_party_driver/Makefile | 0 .../third_party_driver/gpio/Kconfig | 0 .../third_party_driver/gpio/Makefile | 0 .../third_party_driver/gpio/gd32vf103_gpio.c | 0 .../third_party_driver/include/connect_uart.h | 0 .../include/core_feature_base.h | 0 .../include/core_feature_eclic.h | 0 .../include/core_feature_timer.h | 0 .../third_party_driver/include/gd32vf103.h | 0 .../include/gd32vf103_gpio.h | 0 .../include/gd32vf103_rcu.h | 0 .../include/gd32vf103_timer.h | 0 .../include/gd32vf103_usart.h | 0 .../third_party_driver/include/nmsis_gcc.h | 0 .../third_party_driver/include/riscv_bits.h | 0 .../include/riscv_encoding.h | 0 .../third_party_driver/sys_clock/Kconfig | 0 .../third_party_driver/sys_clock/Makefile | 0 .../sys_clock/gd32vf103_rcu.c | 0 .../sys_clock/gd32vf103_soc.c | 0 .../third_party_driver/system_gd32vf103.c | 0 .../third_party_driver/system_gd32vf103.h | 0 .../third_party_driver/uart/Kconfig | 0 .../third_party_driver/uart/Makefile | 0 .../third_party_driver/uart/connect_uart.c | 0 .../third_party_driver/uart/gd32vf103_usart.c | 0 Ubiquitous/XiZi/kernel/Kconfig | 2 +- Ubiquitous/XiZi/path_kernel.mk | 4 ++-- 59 files changed, 16 insertions(+), 16 deletions(-) rename Ubiquitous/XiZi/arch/risc-v/{gd32vf103_rvstar => gd32vf103-rvstar}/Makefile (100%) rename Ubiquitous/XiZi/arch/risc-v/{gd32vf103_rvstar => gd32vf103-rvstar}/arch_interrupt.h (100%) rename Ubiquitous/XiZi/arch/risc-v/{gd32vf103_rvstar => gd32vf103-rvstar}/boot.S (100%) rename Ubiquitous/XiZi/arch/risc-v/{gd32vf103_rvstar => gd32vf103-rvstar}/interrupt.c (100%) rename Ubiquitous/XiZi/arch/risc-v/{gd32vf103_rvstar => gd32vf103-rvstar}/intexc_gd32vf103.S (100%) rename Ubiquitous/XiZi/arch/risc-v/{gd32vf103_rvstar => gd32vf103-rvstar}/tick.c (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/Kconfig (93%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/Makefile (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/README.md (94%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/board.c (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/board.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/config.mk (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/gd32vf103v_rvstar.c (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/gd32vf103v_rvstar.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/img/GigaDevice.png (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/img/ISP_support_usart.png (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/img/bin_flash.png (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/img/boot_mode.png (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/img/gdb_load.png (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/img/menuconfig.png (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/img/openocd.png (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/img/riscv_gnu.png (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/img/terminal.png (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/img/vscode.jpg (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/link.lds (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/nuclei_sdk_hal.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/nuclei_sdk_soc.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/Kconfig (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/Makefile (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/gpio/Kconfig (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/gpio/Makefile (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/gpio/gd32vf103_gpio.c (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/include/connect_uart.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/include/core_feature_base.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/include/core_feature_eclic.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/include/core_feature_timer.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/include/gd32vf103.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/include/gd32vf103_gpio.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/include/gd32vf103_rcu.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/include/gd32vf103_timer.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/include/gd32vf103_usart.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/include/nmsis_gcc.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/include/riscv_bits.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/include/riscv_encoding.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/sys_clock/Kconfig (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/sys_clock/Makefile (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/sys_clock/gd32vf103_rcu.c (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/sys_clock/gd32vf103_soc.c (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/system_gd32vf103.c (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/system_gd32vf103.h (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/uart/Kconfig (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/uart/Makefile (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/uart/connect_uart.c (100%) rename Ubiquitous/XiZi/board/{gd32vf103_rvstar => gd32vf103-rvstar}/third_party_driver/uart/gd32vf103_usart.c (100%) diff --git a/Ubiquitous/XiZi/Makefile b/Ubiquitous/XiZi/Makefile index ada5ef36a..93f046a2c 100755 --- a/Ubiquitous/XiZi/Makefile +++ b/Ubiquitous/XiZi/Makefile @@ -5,7 +5,7 @@ MAKEFLAGS += --no-print-directory .PHONY:COMPILE_APP COMPILE_KERNEL -support :=kd233 stm32f407-st-discovery maix-go stm32f407zgt6 aiit-riscv64-board aiit-arm32-board hifive1-rev-B hifive1-emulator k210-emulator cortex-m3-emulator cortex-m4-emulator ok1052-c gapuino stm32f103-nano gd32vf103_rvstar cortex-m0-emulator rv32m1-vega nuvoton-m2354 +support :=kd233 stm32f407-st-discovery maix-go stm32f407zgt6 aiit-riscv64-board aiit-arm32-board hifive1-rev-B hifive1-emulator k210-emulator cortex-m3-emulator cortex-m4-emulator ok1052-c gapuino stm32f103-nano gd32vf103-rvstar cortex-m0-emulator rv32m1-vega nuvoton-m2354 support += xidatong-arm32 SRC_DIR := diff --git a/Ubiquitous/XiZi/README.md b/Ubiquitous/XiZi/README.md index 745303e72..12cb57a16 100644 --- a/Ubiquitous/XiZi/README.md +++ b/Ubiquitous/XiZi/README.md @@ -29,7 +29,7 @@ ARM架构系列的开发板有 RISC-V架构系列的开发板有 - aiit-riscv64-board gapuino gd32vf103_rvstar hifive1-rev-B kd233 maix-go rv32m1-vega + aiit-riscv64-board gapuino gd32vf103-rvstar hifive1-rev-B kd233 maix-go rv32m1-vega ## 开发环境 diff --git a/Ubiquitous/XiZi/arch/risc-v/Makefile b/Ubiquitous/XiZi/arch/risc-v/Makefile index 1b818a6b3..4b8d48fd7 100755 --- a/Ubiquitous/XiZi/arch/risc-v/Makefile +++ b/Ubiquitous/XiZi/arch/risc-v/Makefile @@ -21,7 +21,7 @@ SRC_DIR +=gap8 endif ifeq ($(CONFIG_BOARD_GD32VF103RVSTAR),y) -SRC_DIR +=gd32vf103_rvstar +SRC_DIR +=gd32vf103-rvstar endif ifeq ($(CONFIG_BOARD_RV32M1_VEGA),y) diff --git a/Ubiquitous/XiZi/arch/risc-v/gd32vf103_rvstar/Makefile b/Ubiquitous/XiZi/arch/risc-v/gd32vf103-rvstar/Makefile similarity index 100% rename from Ubiquitous/XiZi/arch/risc-v/gd32vf103_rvstar/Makefile rename to Ubiquitous/XiZi/arch/risc-v/gd32vf103-rvstar/Makefile diff --git a/Ubiquitous/XiZi/arch/risc-v/gd32vf103_rvstar/arch_interrupt.h b/Ubiquitous/XiZi/arch/risc-v/gd32vf103-rvstar/arch_interrupt.h similarity index 100% rename from Ubiquitous/XiZi/arch/risc-v/gd32vf103_rvstar/arch_interrupt.h rename to Ubiquitous/XiZi/arch/risc-v/gd32vf103-rvstar/arch_interrupt.h diff --git a/Ubiquitous/XiZi/arch/risc-v/gd32vf103_rvstar/boot.S b/Ubiquitous/XiZi/arch/risc-v/gd32vf103-rvstar/boot.S similarity index 100% rename from Ubiquitous/XiZi/arch/risc-v/gd32vf103_rvstar/boot.S rename to Ubiquitous/XiZi/arch/risc-v/gd32vf103-rvstar/boot.S diff --git a/Ubiquitous/XiZi/arch/risc-v/gd32vf103_rvstar/interrupt.c b/Ubiquitous/XiZi/arch/risc-v/gd32vf103-rvstar/interrupt.c similarity index 100% rename from Ubiquitous/XiZi/arch/risc-v/gd32vf103_rvstar/interrupt.c rename to Ubiquitous/XiZi/arch/risc-v/gd32vf103-rvstar/interrupt.c diff --git a/Ubiquitous/XiZi/arch/risc-v/gd32vf103_rvstar/intexc_gd32vf103.S b/Ubiquitous/XiZi/arch/risc-v/gd32vf103-rvstar/intexc_gd32vf103.S similarity index 100% rename from Ubiquitous/XiZi/arch/risc-v/gd32vf103_rvstar/intexc_gd32vf103.S rename to Ubiquitous/XiZi/arch/risc-v/gd32vf103-rvstar/intexc_gd32vf103.S diff --git a/Ubiquitous/XiZi/arch/risc-v/gd32vf103_rvstar/tick.c b/Ubiquitous/XiZi/arch/risc-v/gd32vf103-rvstar/tick.c similarity index 100% rename from Ubiquitous/XiZi/arch/risc-v/gd32vf103_rvstar/tick.c rename to Ubiquitous/XiZi/arch/risc-v/gd32vf103-rvstar/tick.c diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/Kconfig b/Ubiquitous/XiZi/board/gd32vf103-rvstar/Kconfig similarity index 93% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/Kconfig rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/Kconfig index ee5e727dd..f893d3ae1 100755 --- a/Ubiquitous/XiZi/board/gd32vf103_rvstar/Kconfig +++ b/Ubiquitous/XiZi/board/gd32vf103-rvstar/Kconfig @@ -17,7 +17,7 @@ config BOARD_GD32VF103RVSTAR source "$KERNEL_DIR/arch/Kconfig" -menu "gd32vf103_rvstar feature" +menu "gd32vf103-rvstar feature" source "$BSP_DIR/third_party_driver/Kconfig" endmenu diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/Makefile b/Ubiquitous/XiZi/board/gd32vf103-rvstar/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/Makefile rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/Makefile diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/README.md b/Ubiquitous/XiZi/board/gd32vf103-rvstar/README.md similarity index 94% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/README.md rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/README.md index be1f87f3c..86340a591 100755 --- a/Ubiquitous/XiZi/board/gd32vf103_rvstar/README.md +++ b/Ubiquitous/XiZi/board/gd32vf103-rvstar/README.md @@ -1,4 +1,4 @@ -# 从零开始构建矽璓工业物联操作系统：使用risc-v架构的gd32vf103_rvstar 开发板 +# 从零开始构建矽璓工业物联操作系统：使用risc-v架构的gd32vf103-rvstar 开发板 [XiUOS](http://xuos.io/) (X Industrial Ubiquitous Operating System) 矽璓工业物联操作系统是一款面向工业物联场景的泛在操作系统，来自泛在操作系统研究计划。所谓泛在操作系统(UOS: Ubiquitous Operating Systems)，是支持互联网时代人机物融合泛在计算应用模式的新型操作系统，是传统操作系统概念的泛化与延伸。在泛在操作系统技术体系中，不同的泛在计算设备和泛在应用场景需要符合各自特性的不同UOS，XiUOS即是面向工业物联场景的一种UOS，主要由一个极简的微型实时操作系统(RTOS)内核和其上的智能工业物联框架构成，支持工业物联网(IIoT: Industrial Internet of Things)应用。 @@ -83,9 +83,9 @@ export CROSS_COMPILE ?=/opt/Nuclei/gcc/bin/riscv-nuclei-elf- 若已存在`export CROSS_COMPILE ?=xxxx` 应该将原有的语句注释，再写入上面的语句。 -# 在gd32vf103_rvstar board 上创建第一个应用 +# 在gd32vf103-rvstar board 上创建第一个应用 -## 1.gd32vf103_rvstar board 简介 +## 1.gd32vf103-rvstar board 简介 | 硬件 | 描述 | | -- | -- | @@ -116,8 +116,8 @@ XiUOS板级当前支持使用UART。 ``` cd ./Ubiquitous/XiZi -make BOARD=gd32vf103_rvstar distclean -make BOARD=gd32vf103_rvstar menuconfig +make BOARD=gd32vf103-rvstar distclean +make BOARD=gd32vf103-rvstar menuconfig ``` 2.在menuconfig界面配置需要关闭和开启的功能，按回车键进入下级菜单，按Y键选中需要开启的功能，按N键选中需要关闭的功能，配置结束后选择Exit保存并退出 @@ -127,15 +127,15 @@ make BOARD=gd32vf103_rvstar menuconfig 3.继续执行以下命令，进行编译 ``` -make BOARD=gd32vf103_rvstar +make BOARD=gd32vf103-rvstar ``` -4.如果编译正确无误，build文件夹下会产生XiZi-gd32vf103_rvstar.elf、XiZi-gd32vf103_rvstar.bin文件。 +4.如果编译正确无误，build文件夹下会产生XiZi-gd32vf103-rvstar.elf、XiZi-gd32vf103-rvstar.bin文件。 >注：最后可以执行以下命令，清除配置文件和编译生成的文件 ``` -make BOARD=gd32vf103_rvstar distclean +make BOARD=gd32vf103-rvstar distclean ``` ## 3. 烧写及调试执行 @@ -177,7 +177,7 @@ screen /dev/ttyUSB0 115200 5、打开一个新的终端，进入编译生成的elf路径,输入例如： ``` -riscv-nuclei-elf-gdb build/XiZi-gd32vf103_rvstar.elf -ex "target remote localhost:3333" +riscv-nuclei-elf-gdb build/XiZi-gd32vf103-rvstar.elf -ex "target remote localhost:3333" ``` 结果如下图所示： ![gdb](./img/gdb_load.png) diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/board.c b/Ubiquitous/XiZi/board/gd32vf103-rvstar/board.c similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/board.c rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/board.c diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/board.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/board.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/board.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/board.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/config.mk b/Ubiquitous/XiZi/board/gd32vf103-rvstar/config.mk similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/config.mk rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/config.mk diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/gd32vf103v_rvstar.c b/Ubiquitous/XiZi/board/gd32vf103-rvstar/gd32vf103v_rvstar.c similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/gd32vf103v_rvstar.c rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/gd32vf103v_rvstar.c diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/gd32vf103v_rvstar.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/gd32vf103v_rvstar.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/gd32vf103v_rvstar.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/gd32vf103v_rvstar.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/img/GigaDevice.png b/Ubiquitous/XiZi/board/gd32vf103-rvstar/img/GigaDevice.png similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/img/GigaDevice.png rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/img/GigaDevice.png diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/img/ISP_support_usart.png b/Ubiquitous/XiZi/board/gd32vf103-rvstar/img/ISP_support_usart.png similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/img/ISP_support_usart.png rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/img/ISP_support_usart.png diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/img/bin_flash.png b/Ubiquitous/XiZi/board/gd32vf103-rvstar/img/bin_flash.png similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/img/bin_flash.png rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/img/bin_flash.png diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/img/boot_mode.png b/Ubiquitous/XiZi/board/gd32vf103-rvstar/img/boot_mode.png similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/img/boot_mode.png rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/img/boot_mode.png diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/img/gdb_load.png b/Ubiquitous/XiZi/board/gd32vf103-rvstar/img/gdb_load.png similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/img/gdb_load.png rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/img/gdb_load.png diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/img/menuconfig.png b/Ubiquitous/XiZi/board/gd32vf103-rvstar/img/menuconfig.png similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/img/menuconfig.png rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/img/menuconfig.png diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/img/openocd.png b/Ubiquitous/XiZi/board/gd32vf103-rvstar/img/openocd.png similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/img/openocd.png rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/img/openocd.png diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/img/riscv_gnu.png b/Ubiquitous/XiZi/board/gd32vf103-rvstar/img/riscv_gnu.png similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/img/riscv_gnu.png rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/img/riscv_gnu.png diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/img/terminal.png b/Ubiquitous/XiZi/board/gd32vf103-rvstar/img/terminal.png similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/img/terminal.png rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/img/terminal.png diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/img/vscode.jpg b/Ubiquitous/XiZi/board/gd32vf103-rvstar/img/vscode.jpg similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/img/vscode.jpg rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/img/vscode.jpg diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/link.lds b/Ubiquitous/XiZi/board/gd32vf103-rvstar/link.lds similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/link.lds rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/link.lds diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/nuclei_sdk_hal.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/nuclei_sdk_hal.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/nuclei_sdk_hal.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/nuclei_sdk_hal.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/nuclei_sdk_soc.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/nuclei_sdk_soc.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/nuclei_sdk_soc.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/nuclei_sdk_soc.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/Kconfig b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/Kconfig similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/Kconfig rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/Kconfig diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/Makefile b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/Makefile rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/Makefile diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/gpio/Kconfig b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/gpio/Kconfig similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/gpio/Kconfig rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/gpio/Kconfig diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/gpio/Makefile b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/gpio/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/gpio/Makefile rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/gpio/Makefile diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/gpio/gd32vf103_gpio.c b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/gpio/gd32vf103_gpio.c similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/gpio/gd32vf103_gpio.c rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/gpio/gd32vf103_gpio.c diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/connect_uart.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/connect_uart.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/connect_uart.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/connect_uart.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/core_feature_base.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/core_feature_base.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/core_feature_base.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/core_feature_base.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/core_feature_eclic.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/core_feature_eclic.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/core_feature_eclic.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/core_feature_eclic.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/core_feature_timer.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/core_feature_timer.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/core_feature_timer.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/core_feature_timer.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/gd32vf103.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/gd32vf103.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/gd32vf103.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/gd32vf103.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/gd32vf103_gpio.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/gd32vf103_gpio.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/gd32vf103_gpio.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/gd32vf103_gpio.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/gd32vf103_rcu.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/gd32vf103_rcu.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/gd32vf103_rcu.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/gd32vf103_rcu.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/gd32vf103_timer.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/gd32vf103_timer.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/gd32vf103_timer.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/gd32vf103_timer.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/gd32vf103_usart.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/gd32vf103_usart.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/gd32vf103_usart.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/gd32vf103_usart.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/nmsis_gcc.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/nmsis_gcc.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/nmsis_gcc.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/nmsis_gcc.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/riscv_bits.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/riscv_bits.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/riscv_bits.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/riscv_bits.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/riscv_encoding.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/riscv_encoding.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/include/riscv_encoding.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/include/riscv_encoding.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/sys_clock/Kconfig b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/sys_clock/Kconfig similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/sys_clock/Kconfig rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/sys_clock/Kconfig diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/sys_clock/Makefile b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/sys_clock/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/sys_clock/Makefile rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/sys_clock/Makefile diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/sys_clock/gd32vf103_rcu.c b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/sys_clock/gd32vf103_rcu.c similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/sys_clock/gd32vf103_rcu.c rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/sys_clock/gd32vf103_rcu.c diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/sys_clock/gd32vf103_soc.c b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/sys_clock/gd32vf103_soc.c similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/sys_clock/gd32vf103_soc.c rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/sys_clock/gd32vf103_soc.c diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/system_gd32vf103.c b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/system_gd32vf103.c similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/system_gd32vf103.c rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/system_gd32vf103.c diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/system_gd32vf103.h b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/system_gd32vf103.h similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/system_gd32vf103.h rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/system_gd32vf103.h diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/uart/Kconfig b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/uart/Kconfig similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/uart/Kconfig rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/uart/Kconfig diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/uart/Makefile b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/uart/Makefile similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/uart/Makefile rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/uart/Makefile diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/uart/connect_uart.c b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/uart/connect_uart.c similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/uart/connect_uart.c rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/uart/connect_uart.c diff --git a/Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/uart/gd32vf103_usart.c b/Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/uart/gd32vf103_usart.c similarity index 100% rename from Ubiquitous/XiZi/board/gd32vf103_rvstar/third_party_driver/uart/gd32vf103_usart.c rename to Ubiquitous/XiZi/board/gd32vf103-rvstar/third_party_driver/uart/gd32vf103_usart.c diff --git a/Ubiquitous/XiZi/kernel/Kconfig b/Ubiquitous/XiZi/kernel/Kconfig index 48ac755e0..9d8756ef8 100644 --- a/Ubiquitous/XiZi/kernel/Kconfig +++ b/Ubiquitous/XiZi/kernel/Kconfig @@ -97,7 +97,6 @@ menu "Kernel feature" config KERNEL_SOFTTIMER bool "Enable softtimer " - select KERNEL_WORKQUEUE default y endmenu @@ -210,6 +209,7 @@ menu "Kernel feature" config KERNEL_WORKQUEUE bool "Config kernel work queue" default y + select KERNEL_SOFTTIMER if KERNEL_WORKQUEUE config WORKQUEUE_KTASK_STACKSIZE diff --git a/Ubiquitous/XiZi/path_kernel.mk b/Ubiquitous/XiZi/path_kernel.mk index fac90f611..f980f0406 100755 --- a/Ubiquitous/XiZi/path_kernel.mk +++ b/Ubiquitous/XiZi/path_kernel.mk @@ -109,9 +109,9 @@ KERNELPATHS :=-I$(BSP_ROOT) \ -I$(KERNEL_ROOT)/include # endif -ifeq ($(BSP_ROOT),$(KERNEL_ROOT)/board/gd32vf103_rvstar) +ifeq ($(BSP_ROOT),$(KERNEL_ROOT)/board/gd32vf103-rvstar) KERNELPATHS :=-I$(BSP_ROOT) \ - -I$(KERNEL_ROOT)/arch/risc-v/gd32vf103_rvstar \ + -I$(KERNEL_ROOT)/arch/risc-v/gd32vf103-rvstar \ -I$(BSP_ROOT)/include \ -I$(BSP_ROOT)/third_party_driver \ -I$(BSP_ROOT)/third_party_driver/include \