diff --git a/.github/workflows/action_utest.yml b/.github/workflows/action_utest.yml index eb85038c6096186ef72f63809846473ed78f8e6e..1cf4be122038f07f96cf0f48b4ca4d0e9a587f14 100644 --- a/.github/workflows/action_utest.yml +++ b/.github/workflows/action_utest.yml @@ -36,7 +36,7 @@ jobs: - {UTEST: "kernel/thread", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "kernel/thread.conf", SD_FILE: "sd.bin"} - {UTEST: "components/utest", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "utest_self/self.conf", SD_FILE: "sd.bin"} - {UTEST: "components/cpp11", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "cpp11/cpp11.conf", SD_FILE: "sd.bin"} - - {UTEST: "kernel/mem/riscv64", RTT_BSP: "bsp/qemu-riscv-virt64", QEMU_ARCH: "riscv64", QEMU_MACHINE: "virt", CONFIG_FILE: "kernel/mem.conf", SD_FILE: "None"} + - {UTEST: "kernel/mem/riscv64", RTT_BSP: "bsp/qemu-virt64-riscv", QEMU_ARCH: "riscv64", QEMU_MACHINE: "virt", CONFIG_FILE: "kernel/mem.conf", SD_FILE: "None"} env: TEST_QEMU_ARCH: ${{ matrix.legs.QEMU_ARCH }} TEST_QEMU_MACHINE: ${{ matrix.legs.QEMU_MACHINE }} @@ -105,4 +105,4 @@ jobs: python3 qemu_runner.py --system $TEST_QEMU_ARCH --machine $TEST_QEMU_MACHINE --elf ../$TEST_BSP_ROOT/rtthread.elf fi cat rtt_console.log - popd \ No newline at end of file + popd diff --git a/bsp/qemu-riscv-virt64/.config b/bsp/qemu-virt64-riscv/.config similarity index 100% rename from bsp/qemu-riscv-virt64/.config rename to bsp/qemu-virt64-riscv/.config diff --git a/bsp/qemu-riscv-virt64/Kconfig b/bsp/qemu-virt64-riscv/Kconfig similarity index 100% rename from bsp/qemu-riscv-virt64/Kconfig rename to bsp/qemu-virt64-riscv/Kconfig diff --git a/bsp/qemu-riscv-virt64/README.md b/bsp/qemu-virt64-riscv/README.md similarity index 97% rename from bsp/qemu-riscv-virt64/README.md rename to bsp/qemu-virt64-riscv/README.md index d6655008467ae364be15e5bb7d3dd1d69e1355ec..42efd7d6961e6440b0f5f1625cd5f40c44bc5f22 100644 --- a/bsp/qemu-riscv-virt64/README.md +++ b/bsp/qemu-virt64-riscv/README.md @@ -20,7 +20,7 @@ Unzip the tool chain to the specified directory. export RTT_EXEC_PATH=~/gcc/bin ``` -Enter `rt-thread/bsp/qemu-riscv-virt64` directory and input +Enter `rt-thread/bsp/qemu-virt64-riscv` directory and input ``` scons @@ -139,4 +139,4 @@ msh /> | ------ | --------- | ------ | | UART | Support | UART0 | | PLIC | Support | - | -| CLIC | Support | - | \ No newline at end of file +| CLIC | Support | - | diff --git a/bsp/qemu-riscv-virt64/README_ZH.md b/bsp/qemu-virt64-riscv/README_ZH.md similarity index 98% rename from bsp/qemu-riscv-virt64/README_ZH.md rename to bsp/qemu-virt64-riscv/README_ZH.md index a3631048e7db6841da9c05237b2449d0899ef479..4c689be94daa2b4eecda0af8b6b6b1b84e80eba4 100644 --- a/bsp/qemu-riscv-virt64/README_ZH.md +++ b/bsp/qemu-virt64-riscv/README_ZH.md @@ -22,7 +22,7 @@ https://www.sifive.com/software export RTT_EXEC_PATH=~/gcc/bin ``` -进入到`rt-thread/bsp/qemu-riscv-virt64`目录进行输入 +进入到`rt-thread/bsp/qemu-virt64-riscv`目录进行输入 ``` scons ``` diff --git a/bsp/qemu-riscv-virt64/SConscript b/bsp/qemu-virt64-riscv/SConscript similarity index 100% rename from bsp/qemu-riscv-virt64/SConscript rename to bsp/qemu-virt64-riscv/SConscript diff --git a/bsp/qemu-riscv-virt64/SConstruct b/bsp/qemu-virt64-riscv/SConstruct similarity index 100% rename from bsp/qemu-riscv-virt64/SConstruct rename to bsp/qemu-virt64-riscv/SConstruct diff --git a/bsp/qemu-riscv-virt64/applications/SConscript b/bsp/qemu-virt64-riscv/applications/SConscript similarity index 100% rename from bsp/qemu-riscv-virt64/applications/SConscript rename to bsp/qemu-virt64-riscv/applications/SConscript diff --git a/bsp/qemu-riscv-virt64/applications/main.c b/bsp/qemu-virt64-riscv/applications/main.c similarity index 100% rename from bsp/qemu-riscv-virt64/applications/main.c rename to bsp/qemu-virt64-riscv/applications/main.c diff --git a/bsp/qemu-riscv-virt64/driver/Kconfig b/bsp/qemu-virt64-riscv/driver/Kconfig similarity index 100% rename from bsp/qemu-riscv-virt64/driver/Kconfig rename to bsp/qemu-virt64-riscv/driver/Kconfig diff --git a/bsp/qemu-riscv-virt64/driver/SConscript b/bsp/qemu-virt64-riscv/driver/SConscript similarity index 100% rename from bsp/qemu-riscv-virt64/driver/SConscript rename to bsp/qemu-virt64-riscv/driver/SConscript diff --git a/bsp/qemu-riscv-virt64/driver/asm/sbiasm.h b/bsp/qemu-virt64-riscv/driver/asm/sbiasm.h similarity index 100% rename from bsp/qemu-riscv-virt64/driver/asm/sbiasm.h rename to bsp/qemu-virt64-riscv/driver/asm/sbiasm.h diff --git a/bsp/qemu-riscv-virt64/driver/asm/sbidef.h b/bsp/qemu-virt64-riscv/driver/asm/sbidef.h similarity index 100% rename from bsp/qemu-riscv-virt64/driver/asm/sbidef.h rename to bsp/qemu-virt64-riscv/driver/asm/sbidef.h diff --git a/bsp/qemu-riscv-virt64/driver/board.c b/bsp/qemu-virt64-riscv/driver/board.c similarity index 100% rename from bsp/qemu-riscv-virt64/driver/board.c rename to bsp/qemu-virt64-riscv/driver/board.c diff --git a/bsp/qemu-riscv-virt64/driver/board.h b/bsp/qemu-virt64-riscv/driver/board.h similarity index 100% rename from bsp/qemu-riscv-virt64/driver/board.h rename to bsp/qemu-virt64-riscv/driver/board.h diff --git a/bsp/qemu-riscv-virt64/driver/drv_uart.c b/bsp/qemu-virt64-riscv/driver/drv_uart.c similarity index 100% rename from bsp/qemu-riscv-virt64/driver/drv_uart.c rename to bsp/qemu-virt64-riscv/driver/drv_uart.c diff --git a/bsp/qemu-riscv-virt64/driver/drv_uart.h b/bsp/qemu-virt64-riscv/driver/drv_uart.h similarity index 100% rename from bsp/qemu-riscv-virt64/driver/drv_uart.h rename to bsp/qemu-virt64-riscv/driver/drv_uart.h diff --git a/bsp/qemu-riscv-virt64/driver/encoding.h b/bsp/qemu-virt64-riscv/driver/encoding.h similarity index 100% rename from bsp/qemu-riscv-virt64/driver/encoding.h rename to bsp/qemu-virt64-riscv/driver/encoding.h diff --git a/bsp/qemu-riscv-virt64/driver/io.h b/bsp/qemu-virt64-riscv/driver/io.h similarity index 100% rename from bsp/qemu-riscv-virt64/driver/io.h rename to bsp/qemu-virt64-riscv/driver/io.h diff --git a/bsp/qemu-riscv-virt64/driver/plic.c b/bsp/qemu-virt64-riscv/driver/plic.c similarity index 100% rename from bsp/qemu-riscv-virt64/driver/plic.c rename to bsp/qemu-virt64-riscv/driver/plic.c diff --git a/bsp/qemu-riscv-virt64/driver/plic.h b/bsp/qemu-virt64-riscv/driver/plic.h similarity index 100% rename from bsp/qemu-riscv-virt64/driver/plic.h rename to bsp/qemu-virt64-riscv/driver/plic.h diff --git a/bsp/qemu-riscv-virt64/driver/sbi.c b/bsp/qemu-virt64-riscv/driver/sbi.c similarity index 100% rename from bsp/qemu-riscv-virt64/driver/sbi.c rename to bsp/qemu-virt64-riscv/driver/sbi.c diff --git a/bsp/qemu-riscv-virt64/driver/sbi.h b/bsp/qemu-virt64-riscv/driver/sbi.h similarity index 100% rename from bsp/qemu-riscv-virt64/driver/sbi.h rename to bsp/qemu-virt64-riscv/driver/sbi.h diff --git a/bsp/qemu-riscv-virt64/link.lds b/bsp/qemu-virt64-riscv/link.lds similarity index 100% rename from bsp/qemu-riscv-virt64/link.lds rename to bsp/qemu-virt64-riscv/link.lds diff --git a/bsp/qemu-riscv-virt64/link_stacksize.lds b/bsp/qemu-virt64-riscv/link_stacksize.lds similarity index 100% rename from bsp/qemu-riscv-virt64/link_stacksize.lds rename to bsp/qemu-virt64-riscv/link_stacksize.lds diff --git a/bsp/qemu-riscv-virt64/qemu-dbg.sh b/bsp/qemu-virt64-riscv/qemu-dbg.sh similarity index 100% rename from bsp/qemu-riscv-virt64/qemu-dbg.sh rename to bsp/qemu-virt64-riscv/qemu-dbg.sh diff --git a/bsp/qemu-riscv-virt64/qemu-dumpdtb.sh b/bsp/qemu-virt64-riscv/qemu-dumpdtb.sh similarity index 100% rename from bsp/qemu-riscv-virt64/qemu-dumpdtb.sh rename to bsp/qemu-virt64-riscv/qemu-dumpdtb.sh diff --git a/bsp/qemu-riscv-virt64/qemu-nographic-smode.sh b/bsp/qemu-virt64-riscv/qemu-nographic-smode.sh similarity index 100% rename from bsp/qemu-riscv-virt64/qemu-nographic-smode.sh rename to bsp/qemu-virt64-riscv/qemu-nographic-smode.sh diff --git a/bsp/qemu-riscv-virt64/qemu-nographic.sh b/bsp/qemu-virt64-riscv/qemu-nographic.sh similarity index 100% rename from bsp/qemu-riscv-virt64/qemu-nographic.sh rename to bsp/qemu-virt64-riscv/qemu-nographic.sh diff --git a/bsp/qemu-riscv-virt64/rtconfig.h b/bsp/qemu-virt64-riscv/rtconfig.h similarity index 100% rename from bsp/qemu-riscv-virt64/rtconfig.h rename to bsp/qemu-virt64-riscv/rtconfig.h diff --git a/bsp/qemu-riscv-virt64/rtconfig.py b/bsp/qemu-virt64-riscv/rtconfig.py similarity index 100% rename from bsp/qemu-riscv-virt64/rtconfig.py rename to bsp/qemu-virt64-riscv/rtconfig.py