diff --git a/Ubiquitous/XiZi_IIoT/Makefile b/Ubiquitous/XiZi_IIoT/Makefile index 9e8745526..08e117018 100755 --- a/Ubiquitous/XiZi_IIoT/Makefile +++ b/Ubiquitous/XiZi_IIoT/Makefile @@ -5,7 +5,7 @@ MAKEFLAGS += --no-print-directory .PHONY:COMPILE_APP COMPILE_KERNEL -riscv_support := kd233 maix-go hifive1-rev-B gapuino gd32vf103-rvstar rv32m1-vega aiit-riscv64-board xidatong-riscv64 edu-riscv64 ch32v307vct6 +riscv_support := kd233 maix-go hifive1-rev-B gapuino gd32vf103-rvstar rv32m1-vega aiit-riscv64-board xidatong-riscv64 edu-riscv64 ch32v307vct6 ch32v208rbt6 arm_support += stm32f407-st-discovery stm32f407zgt6 stm32f103-nano nuvoton-m2354 ok1052-c imxrt1176-sbc aiit-arm32-board xidatong-arm32 xiwangtong-arm32 edu-arm32 xishutong-arm32 rzv2l-m33 rzg2ul-m33 emulator_support += hifive1-emulator k210-emulator cortex-m0-emulator cortex-m3-emulator cortex-m4-emulator cortex-m7-emulator diff --git a/Ubiquitous/XiZi_IIoT/arch/risc-v/Makefile b/Ubiquitous/XiZi_IIoT/arch/risc-v/Makefile index 15102d3d5..15453583e 100755 --- a/Ubiquitous/XiZi_IIoT/arch/risc-v/Makefile +++ b/Ubiquitous/XiZi_IIoT/arch/risc-v/Makefile @@ -2,6 +2,10 @@ ifeq ($(CONFIG_BOARD_CH32V307VCT6), ) SRC_DIR := shared endif +ifeq ($(CONFIG_BOARD_CH32V208RBT6), ) +SRC_DIR := shared +endif + ifeq ($(CONFIG_BOARD_FE310_EVB),y) SRC_DIR +=fe310 endif @@ -37,6 +41,10 @@ ifeq ($(CONFIG_BOARD_CH32V307VCT6), y) SRC_DIR +=ch32v307vct6 endif +ifeq ($(CONFIG_BOARD_CH32V208RBT6), y) +SRC_DIR := ch32v208rbt6 +endif + ifeq ($(CONFIG_BOARD_RV32M1_VEGA),y) SRC_DIR +=rv32m1-vega endif diff --git a/Ubiquitous/XiZi_IIoT/board/ch32v307vct6/config.mk b/Ubiquitous/XiZi_IIoT/board/ch32v307vct6/config.mk index 630327afc..760c39480 100755 --- a/Ubiquitous/XiZi_IIoT/board/ch32v307vct6/config.mk +++ b/Ubiquitous/XiZi_IIoT/board/ch32v307vct6/config.mk @@ -11,7 +11,7 @@ export APPLFLAGS := -nostartfiles -Wl,--gc-sections,-Map=XiZi-app.map,-cref,-u, export CXXFLAGS := -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -fno-common # -std=gnu99 -export CROSS_COMPILE ?=/opt/riscv-embedded-gcc/bin/riscv-none-embed- +export CROSS_COMPILE ?=/opt/riscv64-toolchain/bin/riscv64-unknown-elf- export DEFINES := -DHAVE_CCONFIG_H -DHAVE_SIGINFO diff --git a/Ubiquitous/XiZi_IIoT/kernel/thread/init.c b/Ubiquitous/XiZi_IIoT/kernel/thread/init.c index 0a5269ff3..262424430 100644 --- a/Ubiquitous/XiZi_IIoT/kernel/thread/init.c +++ b/Ubiquitous/XiZi_IIoT/kernel/thread/init.c @@ -227,7 +227,8 @@ int XiUOSStartup(void) #ifdef TOOL_SHELL extern int userShellInit(void); - userShellInit(); + KPrintf("%s %d\n", __func__, __LINE__); + userShellInit(); #endif #ifdef USER_APPLICATION @@ -239,7 +240,8 @@ extern int InitUserspace(void); CreateMainTask(); } #else - CreateMainTask(); +KPrintf("%s %d\n", __func__, __LINE__); + CreateMainTask(); #endif #endif @@ -253,7 +255,10 @@ extern int InitUserspace(void); StartWatchdog(); #endif - StartupOsAssign(); + KPrintf("%s %d\n", __func__, __LINE__); + extern long ShowTask(void); + ShowTask(); + StartupOsAssign(); return 0; } diff --git a/Ubiquitous/XiZi_IIoT/path_kernel.mk b/Ubiquitous/XiZi_IIoT/path_kernel.mk index 0d43135e8..3fe649798 100755 --- a/Ubiquitous/XiZi_IIoT/path_kernel.mk +++ b/Ubiquitous/XiZi_IIoT/path_kernel.mk @@ -295,6 +295,18 @@ KERNELPATHS += \ -I$(KERNEL_ROOT)/include # endif +ifeq ($(BSP_ROOT),$(KERNEL_ROOT)/board/ch32v208rbt6) +KERNELPATHS += \ + -I$(KERNEL_ROOT)/arch/risc-v/ch32v208rbt6/Core \ + -I$(KERNEL_ROOT)/arch/risc-v/ch32v208rbt6/Debug \ + -I$(KERNEL_ROOT)/arch/risc-v/ch32v208rbt6/User \ + -I$(KERNEL_ROOT)/arch/risc-v/ch32v208rbt6 \ + -I$(BSP_ROOT)/third_party_driver/include \ + -I$(BSP_ROOT)/third_party_driver/Peripheral/inc \ + -I$(BSP_ROOT)/include \ + -I$(KERNEL_ROOT)/include # +endif + ifeq ($(BSP_ROOT),$(KERNEL_ROOT)/board/rv32m1-vega) KERNELPATHS += \ -I$(KERNEL_ROOT)/arch/risc-v/rv32m1-vega \