Skip to content

Commit 0777f72

Browse files
committed
Merge branch 'master' of https://github.com/unnamed2/rt-thread
2 parents 10a979f + 197ad25 commit 0777f72

File tree

1,807 files changed

+190067
-192391
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,807 files changed

+190067
-192391
lines changed

.github/ALL_BSP_COMPILE.json

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@
203203
"stm32/stm32h750-weact-ministm32h7xx",
204204
"stm32/stm32h750-fk750m1-vbt6",
205205
"stm32/stm32h7s7-st-disco",
206+
"stm32/stm32h7r7-artpi2",
206207
"stm32/stm32mp157a-st-discovery",
207208
"stm32/stm32mp157a-st-ev1",
208209
"stm32/stm32u575-st-nucleo",
@@ -467,7 +468,23 @@
467468
"RTT_BSP": "xuantie",
468469
"RTT_TOOL_CHAIN": "sourcery-Xuantie-900-gcc-elf-newlib",
469470
"SUB_RTT_BSP": [
470-
"xuantie/smartl/e906"
471+
"xuantie/smartl/e902",
472+
"xuantie/smartl/e906",
473+
"xuantie/smartl/e907",
474+
"xuantie/xiaohui/c906",
475+
"xuantie/xiaohui/c907",
476+
"xuantie/xiaohui/c908",
477+
"xuantie/xiaohui/c910",
478+
"xuantie/xiaohui/r908",
479+
"xuantie/xiaohui/r910",
480+
"xuantie/xiaohui/r920"
481+
]
482+
},
483+
{
484+
"RTT_BSP": "xuantie-smart",
485+
"RTT_TOOL_CHAIN": "sourcery-Xuantie-900-gcc-linux-musl",
486+
"SUB_RTT_BSP": [
487+
"xuantie/virt64/c906"
471488
]
472489
}
473490
]

.github/workflows/bsp_buildings.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,15 @@ jobs:
159159
/opt/Xuantie-900-gcc-elf-newlib-x86_64-V3.0.2/bin/riscv64-unknown-elf-gcc --version
160160
echo "RTT_EXEC_PATH=/opt/Xuantie-900-gcc-elf-newlib-x86_64-V3.0.2/bin" >> $GITHUB_ENV
161161
162+
- name: Install Xuantie-900-gcc-linux-musl Tools
163+
if: ${{ matrix.legs.RTT_TOOL_CHAIN == 'sourcery-Xuantie-900-gcc-linux-musl' && success() }}
164+
run: |
165+
wget -q https://github.com/RT-Thread/toolchains-ci/releases/download/v1.9/Xuantie-900-gcc-linux-6.6.0-musl64-x86_64-V3.0.2.tar.gz
166+
sudo tar -zxvf Xuantie-900-gcc-linux-6.6.0-musl64-x86_64-V3.0.2.tar.gz -C /opt
167+
/opt/Xuantie-900-gcc-linux-6.6.0-musl64-x86_64-V3.0.2/bin/riscv64-unknown-linux-musl-gcc --version
168+
echo "RTT_EXEC_PATH=/opt/Xuantie-900-gcc-linux-6.6.0-musl64-x86_64-V3.0.2/bin" >> $GITHUB_ENV
169+
echo "RTT_CC_PREFIX=riscv64-unknown-linux-musl-" >> $GITHUB_ENV
170+
162171
- name: Install k230 MUSL ToolChains
163172
if: ${{ matrix.legs.RTT_TOOL_CHAIN == 'riscv64-unknown-linux-musl-' && matrix.legs.RTT_BSP == 'K230' && success() }}
164173
run: |

.github/workflows/utest_auto_run.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ jobs:
3838
- { UTEST: "RISCV", RTT_BSP: "bsp/qemu-virt64-riscv", QEMU_ARCH: "riscv64", QEMU_MACHINE: "virt", SD_FILE: "None", KERNEL: "standard", "SMP_RUN":"" }
3939
- { UTEST: "RISCV-rtsmart", RTT_BSP: "bsp/qemu-virt64-riscv", QEMU_ARCH: "riscv64", QEMU_MACHINE: "virt", SD_FILE: "None", KERNEL: "rtsmart", "SMP_RUN":"" }
4040
# - { UTEST: "RISCV-smp", RTT_BSP: "bsp/qemu-virt64-riscv", QEMU_ARCH: "riscv64", QEMU_MACHINE: "virt", SD_FILE: "None", KERNEL: "standard", "SMP_RUN":"smp" }
41+
- { UTEST: "XUANTIE-rtsmart", RTT_BSP: "bsp/xuantie/virt64/c906", QEMU_ARCH: "riscv64", QEMU_MACHINE: "virt", SD_FILE: "sd.bin", KERNEL: "rtsmart", "SMP_RUN":"" }
4142

4243
- { UTEST: "AARCH64", RTT_BSP: "bsp/qemu-virt64-aarch64", QEMU_ARCH: "aarch64", QEMU_MACHINE: "virt", SD_FILE: "sd.bin", KERNEL: "standard", "SMP_RUN":"" }
4344
- { UTEST: "AARCH64-rtsmart", RTT_BSP: "bsp/qemu-virt64-aarch64", QEMU_ARCH: "aarch64", QEMU_MACHINE: "virt", SD_FILE: "sd.bin", KERNEL: "rtsmart", "SMP_RUN":"" }
@@ -113,6 +114,17 @@ jobs:
113114
echo "TOOLCHAIN_INSTALLED=riscv-musl" >> $GITHUB_ENV
114115
fi
115116
117+
# Install RISC-V XUANTIE Musl ToolChains
118+
if [[ "${{ matrix.platform.UTEST }}" == "XUANTIE-rtsmart" && "${{ matrix.platform.QEMU_ARCH }}" == "riscv64" && "${{ matrix.platform.KERNEL }}" == "rtsmart" ]]; then
119+
echo "Starting install RISC-V XUANTIE Musl ToolChains"
120+
wget -q https://github.com/RT-Thread/toolchains-ci/releases/download/v1.9/Xuantie-900-gcc-linux-6.6.0-musl64-x86_64-V3.0.2.tar.gz
121+
sudo tar zxvf Xuantie-900-gcc-linux-6.6.0-musl64-x86_64-V3.0.2.tar.gz -C /opt
122+
/opt/Xuantie-900-gcc-linux-6.6.0-musl64-x86_64-V3.0.2/bin/riscv64-unknown-linux-musl-gcc --version
123+
echo "RTT_EXEC_PATH=/opt/Xuantie-900-gcc-linux-6.6.0-musl64-x86_64-V3.0.2/bin" >> $GITHUB_ENV
124+
echo "RTT_CC_PREFIX=riscv64-unknown-linux-musl-" >> $GITHUB_ENV
125+
echo "TOOLCHAIN_INSTALLED=riscv-musl" >> $GITHUB_ENV
126+
fi
127+
116128
# Install AARCH64 ToolChains
117129
if [[ "${{ matrix.platform.QEMU_ARCH }}" == "aarch64" && "${{ matrix.platform.KERNEL }}" == "standard" ]]; then
118130
echo "Starting install AARCH64 ToolChains"
@@ -181,6 +193,32 @@ jobs:
181193
-drive if=none,file=$TEST_BSP_ROOT/sd.bin,format=raw,id=blk0 -device virtio-blk-device,drive=blk0,bus=virtio-mmio-bus.0 \
182194
-netdev user,id=net0 -device virtio-net-device,netdev=net0,bus=virtio-mmio-bus.1 \
183195
> qemu_output_$TEST_QEMU_ARCH.log 2>&1 &
196+
elif [[ "${{ matrix.platform.UTEST }}" == "XUANTIE-rtsmart" ]]; then
197+
sudo apt-get install -y dos2unix libcapstone-dev libbrlapi-dev
198+
wget -q https://occ-oss-prod.oss-cn-hangzhou.aliyuncs.com/resource//1736318325160/Xuantie-qemu-x86_64-Ubuntu-20.04-V5.0.5-B20250108-0335.tar.gz
199+
tar zxvf Xuantie-qemu-x86_64-Ubuntu-20.04-V5.0.5-B20250108-0335.tar.gz
200+
dos2unix ./install/qemu_post_install_small.sh
201+
sudo chmod +x ./install/qemu_post_install_small.sh
202+
sudo ./install/qemu_post_install_small.sh
203+
204+
QEMU_BIN="./install/bin/qemu-system-$TEST_QEMU_ARCH"
205+
[ ! -f "$QEMU_BIN" ] && echo "ERROR: $QEMU_BIN not found." && exit 1
206+
207+
tmp_output=$(mktemp)
208+
ldd "$QEMU_BIN" > "$tmp_output" 2>&1
209+
missing_libs=$(grep "not found" "$tmp_output" | awk '{print $1}')
210+
211+
for lib in $missing_libs; do
212+
base_lib=$(echo "$lib" | sed -E 's/\.so.*/\.so/')
213+
214+
echo "🔍 修复基础库:$base_lib ..."
215+
sudo ln -s /usr/lib/x86_64-linux-gnu/$base_lib /usr/lib/x86_64-linux-gnu/$lib
216+
done
217+
echo "✅ 所有缺失库已处理。"
218+
219+
$QEMU_BIN -cpu c906fd -M $TEST_QEMU_MACHINE -kernel $TEST_BSP_ROOT/rtthread.bin -nographic \
220+
-drive if=none,file=$TEST_BSP_ROOT/sd.bin,format=raw,id=blk0 -device virtio-blk-device,drive=blk0,bus=virtio-mmio-bus.0 \
221+
> qemu_output_$TEST_QEMU_ARCH.log 2>&1 &
184222
elif [[ "${{ matrix.platform.QEMU_ARCH }}" == "arm" ]]; then
185223
qemu-system-$TEST_QEMU_ARCH \
186224
-nographic \

.vscode/workspace.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"bsps": {
3+
"folder": "bsp",
4+
"stars": [
5+
"qemu-vexpress-a9"
6+
]
7+
}
8+
}

MAINTAINERS

Lines changed: 78 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,93 @@ tag: bsp_cvitek
4949
path: bsp/cvitek
5050
owners: Chen Wang(unicornx)<[email protected]>
5151

52+
tag: bsp_gd32470z-lckfb
53+
path: bsp/gd32/arm/gd32470z-lckfb
54+
owners: Wu Ying Xiang(godmial)<[email protected]>
55+
5256
tag: bsp_k230
5357
path: bsp/k230
5458
owners: Chen Wang(unicornx)<[email protected]>
5559

60+
tag: bsp_mcxa
61+
path: bsp/nxp/mcx/mcxa
62+
owners: 下里巴人(hywing)<[email protected]>
63+
64+
tag: bsp_mcxn
65+
path: bsp/nxp/mcx/mcxn
66+
owners: 下里巴人(hywing)<[email protected]>
67+
68+
tag: bsp_rt-spark
69+
path: bsp/stm32/stm32f407-rt-spark
70+
owners: Bingru Zhang(Rbb666)<[email protected]>, Yuqiang Wang(kurisaW)<[email protected]>
71+
72+
tag: bsp_ultrarisc
73+
path: bsp/ultrarisc/ur_dp1000_evb
74+
owners: Zhang Jing(zhangjing0303)<[email protected]>
75+
76+
tag: bsp_renesas
77+
path: bsp/renesas
78+
owners: Yuqiang Wang(kurisaW)<[email protected]>
79+
80+
tag: bsp_stm32
81+
path: bsp/stm32
82+
owners: Liya Huang(wdfk-prog)<[email protected]>
83+
84+
tag: bsp_stm32h723-st-nucleo
85+
path: bsp/stm32/stm32h723-st-nucleo
86+
owners: 下里巴人(hywing)<[email protected]>
87+
88+
tag: bsp_stm32g030-tiny-board
89+
path: bsp/stm32/stm32g030-tiny-board
90+
owners: 下里巴人(hywing)<[email protected]>
91+
92+
tag: bsp_stm32h743-st-nucleo
93+
path: bsp/stm32/stm32h743-st-nucleo
94+
owners: PengXu(LittleGreyG)<[email protected]>
95+
96+
tag: bsp_stm32h750-artpi
97+
path: bsp/stm32/stm32h750-artpi
98+
owners: PengXu(LittleGreyG)<[email protected]>
99+
56100
tag: documentation
57101
path: documentation
58-
owners: Chen Wang(unicornx)<[email protected]>
102+
owners: Chen Wang(unicornx)<[email protected]>, Guorui Li(GorrayLi)<[email protected]>, Lian Wang(lianux-mm)<[email protected]>
103+
104+
tag: driver_can
105+
path: components/drivers/can
106+
owners: Liya Huang(wdfk-prog)<[email protected]>
107+
108+
tag: driver_i2c
109+
path: components/drivers/i2c
110+
owners: Liya Huang(wdfk-prog)<[email protected]>
111+
112+
tag: driver_pm
113+
path: components/drivers/pm
114+
owners: Liya Huang(wdfk-prog)<[email protected]>
115+
116+
tag: driver_spi
117+
path: components/drivers/spi
118+
owners: Liya Huang(wdfk-prog)<[email protected]>
119+
120+
tag: driver_ymodem
121+
path: components/utilities/ymodem
122+
owners: Liya Huang(wdfk-prog)<[email protected]>
123+
124+
tag: fal
125+
path: components/fal
126+
owners: Yucai Liu(illustriousness)<[email protected]>
127+
128+
tag: kernel
129+
path: src
130+
owners: Guorui Li(GorrayLi)<[email protected]>, Lian Wang(lianux-mm)<[email protected]>, Liya Huang(wdfk-prog)<[email protected]>
59131

60132
tag: libc
61133
path: components/libc
62-
owners: Meco Jianting Man(mysterywolf)<[email protected]>
134+
owners: Meco Jianting Man(mysterywolf)<[email protected]>, Guorui Li(GorrayLi)<[email protected]>
135+
136+
tag: maintainers
137+
path: MAINTAINERS
138+
owners: Bingru Zhang(Rbb666)<[email protected]>, Yuqiang Wang(kurisaW)<[email protected]>
63139

64140
tag: rvlibcpu
65141
path: libcpu/risc-v
@@ -71,18 +147,6 @@ path: components/drivers/include/drivers/dev_serial_v2.h
71147
path: examples/utest/testcases/drivers/serial_v2
72148
owners: Chen Bei Dou(Ryan-CW-Code)<[email protected]>
73149

74-
tag: stm32f407-rt-spark
75-
path: bsp/stm32/stm32f407-rt-spark
76-
owners: Bingru Zhang(Rbb666)<[email protected]>, Yuqiang Wang(kurisaW)<[email protected]>
77-
78150
tag: workflow
79151
path: .github
80152
owners: supper thomas(supperthomas)<[email protected]>, Bingru Zhang(Rbb666)<[email protected]>, Yuqiang Wang(kurisaW)<[email protected]>
81-
82-
tag: gd32470z-lckfb-lcd
83-
path: bsp/gd32/arm/gd32470z-lckfb/board/ports
84-
owners: Wu Ying Xiang(godmial)<[email protected]>
85-
86-
tag: bsp_ultrarisc
87-
path: bsp/ultrarisc/ur_dp1000_evb
88-
owners: Zhang Jing(zhangjing0303)<[email protected]>

0 commit comments

Comments
 (0)