diff options
Diffstat (limited to '.github')
| -rw-r--r-- | .github/ALL_BSP_COMPILE.json | 12 | ||||
| -rw-r--r-- | .github/membrowse-targets.json | 3 | ||||
| -rw-r--r-- | .github/workflows/utest_auto_run.yml | 8 |
3 files changed, 9 insertions, 14 deletions
diff --git a/.github/ALL_BSP_COMPILE.json b/.github/ALL_BSP_COMPILE.json index a96e207194..c7ab65a00b 100644 --- a/.github/ALL_BSP_COMPILE.json +++ b/.github/ALL_BSP_COMPILE.json @@ -407,6 +407,7 @@ "RTT_BSP": "aarch64", "RTT_TOOL_CHAIN": "sourcery-aarch64", "SUB_RTT_BSP": [ + "qemu-virt64-aarch64", "raspberry-pi/raspi3-64", "raspberry-pi/raspi4-64", "nxp/imx/imx91", @@ -418,8 +419,7 @@ "RTT_TOOL_CHAIN": "sourcery-aarch64", "RTT_SMART_TOOL_CHAIN": "aarch64-linux-musleabi", "SUB_RTT_BSP": [ - "rockchip/rk3500", - "qemu-virt64-aarch64" + "rockchip/rk3500" ] }, { @@ -439,17 +439,11 @@ "RTT_TOOL_CHAIN": "sourcery-riscv64-unknown-elf", "SUB_RTT_BSP": [ "bluetrum/ab32vg1-ab-prougen", + "qemu-virt64-riscv", "ultrarisc/ur_dp1000_evb" ] }, { - "RTT_BSP": "qemu-smart", - "RTT_TOOL_CHAIN": "sourcery-riscv64-general-toolchain", - "SUB_RTT_BSP": [ - "qemu-virt64-riscv" - ] - }, - { "RTT_BSP": "K230", "RTT_TOOL_CHAIN": "riscv64-unknown-linux-musl-", "SUB_RTT_BSP": [ diff --git a/.github/membrowse-targets.json b/.github/membrowse-targets.json index b71fb9e654..a08a702836 100644 --- a/.github/membrowse-targets.json +++ b/.github/membrowse-targets.json @@ -155,8 +155,7 @@ }, { "target_name": "qemu-virt64-aarch64", - "toolchain": "aarch64-linux-musleabi", - "rtt_cc_prefix": "aarch64-linux-musleabi-", + "toolchain": "aarch64-none-elf", "bsp_path": "bsp/qemu-virt64-aarch64", "elf": "bsp/qemu-virt64-aarch64/rtthread.elf", "ld": "libcpu/aarch64/link.lds", diff --git a/.github/workflows/utest_auto_run.yml b/.github/workflows/utest_auto_run.yml index 2692ab29b1..e05a26f1a9 100644 --- a/.github/workflows/utest_auto_run.yml +++ b/.github/workflows/utest_auto_run.yml @@ -278,19 +278,21 @@ jobs: # Whether plan to run SMP? if [[ "${{ matrix.platform.SMP_RUN }}" == "smp" ]]; then cat $UTEST_CONFIG_ROOT/smp/smp.cfg >> $TEST_BSP_ROOT/.config + echo >> $TEST_BSP_ROOT/.config fi # Is the kernel rtsmart? if [[ "${{ matrix.platform.KERNEL }}" == "rtsmart" ]]; then cat $UTEST_CONFIG_ROOT/rtsmart/rtsmart.cfg >> $TEST_BSP_ROOT/.config + echo >> $TEST_BSP_ROOT/.config elif [[ "$TEST_BSP_ROOT" == "bsp/qemu-virt64-riscv" || "$TEST_BSP_ROOT" == "bsp/qemu-virt64-aarch64" ]]; then - # Standard kernel tests use the upstream non-SMART BSP configuration. - git fetch -q origin master - git checkout -q origin/master -- $TEST_BSP_ROOT/.config $TEST_BSP_ROOT/rtconfig.h + # Select the standard kernel without overwriting the SMP configuration. + echo "# CONFIG_RT_USING_SMART is not set" >> $TEST_BSP_ROOT/.config fi echo CONFIG_RT_USING_UTESTCASES=y >> $TEST_BSP_ROOT/.config cat $UTEST_CONFIG_ROOT/$TEST_CONFIG_FILE >> $TEST_BSP_ROOT/.config + echo >> $TEST_BSP_ROOT/.config # Keep standard qemu tests free of PM/tickless side effects. if [[ "${{ matrix.platform.KERNEL }}" == "standard" && ( "$TEST_BSP_ROOT" == "bsp/qemu-virt64-riscv" || "$TEST_BSP_ROOT" == "bsp/qemu-virt64-aarch64" ) ]]; then |