Skip to content

Commit 3e65789

Browse files
authored
Merge branch 'master' into security
2 parents 37a9231 + 196f340 commit 3e65789

File tree

5,777 files changed

+1192115
-1314505
lines changed

Some content is hidden

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

5,777 files changed

+1192115
-1314505
lines changed

.gitee/PULL_REQUEST_TEMPLATE.en.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ As part of this pull request, I've considered the following:
2727
- [ ] All modifications to BSP are justified and do not affect other components or BSPs.
2828
- [ ] I've commented appropriately where code is tricky.
2929
- [ ] Code in this PR is of high quality.
30+
- [ ] This PR complies with [RT-Thread code specification](../documentation/coding_style_en.txt)

.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@
2727
- [ ] 所有变更均有原因及合理的,并且不会影响到其他软件组件代码或
2828
- [ ] 对难懂代码均提供对应的注释
2929
- [ ] 本拉取/合并请求代码是高质量的
30+
- [ ] 本拉取/合并符合[RT-Thread代码规范](../documentation/coding_style_cn.md)

.gitee/PULL_REQUEST_TEMPLATE.zh-TW.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@
2727
- [ ] 所有變更均有原因及合理的,並且不會影響到其他軟件組件代碼或
2828
- [ ] 對難懂代碼均提供對應的註釋
2929
- [ ] 本拉取/合並請求代碼是高質量的
30+
- [ ] 本拉取/合並符合[RT-Thread代碼規範](../documentation/coding_style_cn.md)

.github/ISSUE_TEMPLATE.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<!--- 请清晰详细地描述你遇到的问题,描述问题时请给出芯片/BSP/工具链,RT-Thread版本,复现步骤及现象或者有条理地描述你的问题。在问题得到解决后,请及时关闭issue。欢迎到论坛提问:https://club.rt-thread.org/ -->
2+
3+
<!--- Please describe your problem clearly and in detail. When describing the problem, please use numbers or bullet points to describe your problem coherently. After the problem is resolved, please close the issue in time. Welcome to the forum to ask questions: https://club.rt-thread.io/ -->

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,4 @@ The following content must not be changed in the submitted PR message. Otherwise
3131
- [ ] 所有变更均有原因及合理的,并且不会影响到其他软件组件代码或BSP All modifications are justified and not affect other components or BSP
3232
- [ ] 对难懂代码均提供对应的注释 I've commented appropriately where code is tricky
3333
- [ ] 本拉取/合并请求代码是高质量的 Code in this PR is of high quality
34+
- [ ] 本拉取/合并符合[RT-Thread代码规范](../documentation/coding_style_cn.md) This PR complies with [RT-Thread code specification](../documentation/coding_style_en.txt)

.github/workflows/action.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,12 @@ jobs:
7878
- {RTT_BSP: "stm32/stm32f103-onenet-nbiot", RTT_TOOL_CHAIN: "sourcery-arm"}
7979
- {RTT_BSP: "stm32/stm32f103-yf-ufun", RTT_TOOL_CHAIN: "sourcery-arm"}
8080
- {RTT_BSP: "stm32/stm32f107-uc-eval", RTT_TOOL_CHAIN: "sourcery-arm"}
81+
- {RTT_BSP: "stm32/stm32f207-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
82+
- {RTT_BSP: "stm32/stm32f302-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
8183
- {RTT_BSP: "stm32/stm32f401-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
8284
- {RTT_BSP: "stm32/stm32f405-smdz-breadfruit", RTT_TOOL_CHAIN: "sourcery-arm"}
8385
- {RTT_BSP: "stm32/stm32f407-atk-explorer", RTT_TOOL_CHAIN: "sourcery-arm"}
86+
- {RTT_BSP: "stm32/stm32f407-robomaster-c", RTT_TOOL_CHAIN: "sourcery-arm"}
8487
- {RTT_BSP: "stm32/stm32f407-st-discovery", RTT_TOOL_CHAIN: "sourcery-arm"}
8588
- {RTT_BSP: "stm32/stm32f410-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
8689
- {RTT_BSP: "stm32/stm32f411-atk-nano", RTT_TOOL_CHAIN: "sourcery-arm"}
@@ -96,15 +99,17 @@ jobs:
9699
- {RTT_BSP: "stm32/stm32f469-st-disco", RTT_TOOL_CHAIN: "sourcery-arm"}
97100
- {RTT_BSP: "stm32/stm32f746-st-disco", RTT_TOOL_CHAIN: "sourcery-arm"}
98101
- {RTT_BSP: "stm32/stm32f767-atk-apollo", RTT_TOOL_CHAIN: "sourcery-arm"}
99-
- {RTT_BSP: "stm32/stm32f767-fire-challenger", RTT_TOOL_CHAIN: "sourcery-arm"}
102+
- {RTT_BSP: "stm32/stm32f767-fire-challenger-v1", RTT_TOOL_CHAIN: "sourcery-arm"}
100103
- {RTT_BSP: "stm32/stm32f767-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
101104
- {RTT_BSP: "stm32/stm32g070-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
102105
- {RTT_BSP: "stm32/stm32g071-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
103106
- {RTT_BSP: "stm32/stm32g431-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
104107
- {RTT_BSP: "stm32/stm32h743-atk-apollo", RTT_TOOL_CHAIN: "sourcery-arm"}
105108
- {RTT_BSP: "stm32/stm32h743-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
106109
- {RTT_BSP: "stm32/stm32h747-st-discovery", RTT_TOOL_CHAIN: "sourcery-arm"}
110+
- {RTT_BSP: "stm32/stm32h750-artpi-h750", RTT_TOOL_CHAIN: "sourcery-arm"}
107111
- {RTT_BSP: "stm32/stm32l4r9-st-eval", RTT_TOOL_CHAIN: "sourcery-arm"}
112+
- {RTT_BSP: "stm32/stm32l4r9-st-sensortile-box", RTT_TOOL_CHAIN: "sourcery-arm"}
108113
- {RTT_BSP: "stm32/stm32l010-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
109114
- {RTT_BSP: "stm32/stm32l053-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
110115
- {RTT_BSP: "stm32/stm32l412-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
@@ -118,19 +123,17 @@ jobs:
118123
- {RTT_BSP: "stm32/stm32mp157a-st-discovery", RTT_TOOL_CHAIN: "sourcery-arm"}
119124
- {RTT_BSP: "stm32/stm32mp157a-st-ev1", RTT_TOOL_CHAIN: "sourcery-arm"}
120125
- {RTT_BSP: "stm32/stm32wb55-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
121-
- {RTT_BSP: "stm32f20x", RTT_TOOL_CHAIN: "sourcery-arm"}
122126
- {RTT_BSP: "swm320", RTT_TOOL_CHAIN: "sourcery-arm"}
123127
- {RTT_BSP: "swm320-lq100", RTT_TOOL_CHAIN: "sourcery-arm"}
124128
- {RTT_BSP: "beaglebone", RTT_TOOL_CHAIN: "sourcery-arm"}
125-
- {RTT_BSP: "zynq7000", RTT_TOOL_CHAIN: "sourcery-arm"}
126129
- {RTT_BSP: "zynqmp-r5-axu4ev", RTT_TOOL_CHAIN: "sourcery-arm"}
127130
- {RTT_BSP: "frdm-k64f", RTT_TOOL_CHAIN: "sourcery-arm"}
128-
- {RTT_BSP: "fh8620", RTT_TOOL_CHAIN: "sourcery-arm"}
129131
- {RTT_BSP: "xplorer4330/M4", RTT_TOOL_CHAIN: "sourcery-arm"}
130132
- {RTT_BSP: "at32/at32f403a-start", RTT_TOOL_CHAIN: "sourcery-arm"}
131133
- {RTT_BSP: "at32/at32f407-start", RTT_TOOL_CHAIN: "sourcery-arm"}
132134
- {RTT_BSP: "smartfusion2", RTT_TOOL_CHAIN: "sourcery-arm"}
133135
- {RTT_BSP: "raspberry-pico", RTT_TOOL_CHAIN: "sourcery-arm"}
136+
- {RTT_BSP: "raspberry-pi/raspi4-32", RTT_TOOL_CHAIN: "sourcery-arm"}
134137
steps:
135138
- uses: actions/checkout@v2
136139
- name: Set up Python
@@ -150,10 +153,10 @@ jobs:
150153
if: ${{ matrix.legs.RTT_TOOL_CHAIN == 'sourcery-arm' && success() }}
151154
shell: bash
152155
run: |
153-
wget -q https://github.com/RT-Thread/toolchains-ci/releases/download/arm-2017q2-v6/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2
154-
sudo tar xjf gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 -C /opt
155-
/opt/gcc-arm-none-eabi-6-2017-q2-update/bin/arm-none-eabi-gcc --version
156-
echo "RTT_EXEC_PATH=/opt/gcc-arm-none-eabi-6-2017-q2-update/bin" >> $GITHUB_ENV
156+
wget -q https://developer.arm.com/-/media/Files/downloads/gnu-rm/10-2020q4/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
157+
sudo tar xjf gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2 -C /opt
158+
/opt/gcc-arm-none-eabi-10-2020-q4-major/bin/arm-none-eabi-gcc --version
159+
echo "RTT_EXEC_PATH=/opt/gcc-arm-none-eabi-10-2020-q4-major/bin" >> $GITHUB_ENV
157160
158161
- name: Install Mips ToolChains
159162
if: ${{ matrix.legs.RTT_TOOL_CHAIN == 'sourcery-mips' && success() }}

.github/workflows/action_utest.yml

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
name: AutoTestCI
2+
3+
# Controls when the action will run. Triggers the workflow on push or pull request
4+
on: [push, pull_request]
5+
6+
jobs:
7+
test:
8+
runs-on: ubuntu-latest
9+
name: ${{ matrix.legs.UTEST }}
10+
strategy:
11+
fail-fast: false
12+
matrix:
13+
legs:
14+
- {UTEST: "kernel/mem", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "kernel/mem.conf", SD_FILE: "sd.bin"}
15+
- {UTEST: "kernel/ipc", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", CONFIG_FILE: "kernel/ipc.conf", SD_FILE: "sd.bin"}
16+
- {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"}
17+
- {UTEST: "kernel/mem/riscv64", RTT_BSP: "bsp/qemu-riscv-virt64", QEMU_ARCH: "riscv64", QEMU_MACHINE: "virt", CONFIG_FILE: "kernel/mem.conf", SD_FILE: "None"}
18+
env:
19+
TEST_QEMU_ARCH: ${{ matrix.legs.QEMU_ARCH }}
20+
TEST_QEMU_MACHINE: ${{ matrix.legs.QEMU_MACHINE }}
21+
TEST_BSP_ROOT: ${{ matrix.legs.RTT_BSP }}
22+
TEST_CONFIG_FILE: ${{ matrix.legs.CONFIG_FILE }}
23+
TEST_SD_FILE: ${{ matrix.legs.SD_FILE }}
24+
steps:
25+
- uses: actions/checkout@v1
26+
27+
- name: Install Tools
28+
shell: bash
29+
run: |
30+
sudo apt-get update
31+
sudo apt-get -yqq install scons qemu-system git
32+
33+
- name: Install Arm ToolChains
34+
if: ${{ matrix.legs.QEMU_ARCH == 'arm' && success() }}
35+
shell: bash
36+
run: |
37+
wget -q https://developer.arm.com/-/media/Files/downloads/gnu-rm/10-2020q4/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
38+
sudo tar xjf gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2 -C /opt
39+
/opt/gcc-arm-none-eabi-10-2020-q4-major/bin/arm-none-eabi-gcc --version
40+
echo "RTT_EXEC_PATH=/opt/gcc-arm-none-eabi-10-2020-q4-major/bin" >> $GITHUB_ENV
41+
42+
- name: Install RISC-V ToolChains
43+
if: ${{ matrix.legs.QEMU_ARCH == 'riscv64' && success() }}
44+
run: |
45+
wget -q https://static.dev.sifive.com/dev-tools/freedom-tools/v2020.12/riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14.tar.gz
46+
sudo tar zxvf riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14.tar.gz -C /opt
47+
/opt/riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14/bin/riscv64-unknown-elf-gcc --version
48+
echo "RTT_EXEC_PATH=/opt/riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14/bin" >> $GITHUB_ENV
49+
50+
- name: Build BSP
51+
run: |
52+
echo CONFIG_RT_USING_UTESTCASES=y >> $TEST_BSP_ROOT/.config
53+
cat examples/utest/configs/$TEST_CONFIG_FILE >> $TEST_BSP_ROOT/.config
54+
scons --pyconfig-silent -C $TEST_BSP_ROOT
55+
scons -j$(nproc) -C $TEST_BSP_ROOT
56+
57+
- name: Start Test
58+
if: ${{ success() }}
59+
run: |
60+
git clone https://github.com/armink/UtestRunner.git
61+
pushd $TEST_BSP_ROOT
62+
dd if=/dev/zero of=sd.bin bs=1024 count=65536
63+
popd
64+
pushd UtestRunner
65+
if [ $TEST_SD_FILE != "None" ]; then
66+
python3 qemu_runner.py --system $TEST_QEMU_ARCH --machine $TEST_QEMU_MACHINE --elf ../$TEST_BSP_ROOT/rtthread.elf --sd ../$TEST_BSP_ROOT/$TEST_SD_FILE
67+
else
68+
python3 qemu_runner.py --system $TEST_QEMU_ARCH --machine $TEST_QEMU_MACHINE --elf ../$TEST_BSP_ROOT/rtthread.elf
69+
fi
70+
cat rtt_console.log
71+
popd

.github/workflows/file_check.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Check File Format and License
2+
3+
on: [pull_request]
4+
5+
jobs:
6+
scancode_job:
7+
runs-on: ubuntu-latest
8+
name: Scan code format and license
9+
steps:
10+
- uses: actions/checkout@v2
11+
- name: Set up Python
12+
uses: actions/setup-python@master
13+
with:
14+
python-version: 3.8
15+
16+
- name: Check Format and License
17+
shell: bash
18+
run: |
19+
pip install click chardet PyYaml
20+
python tools/file_check.py check 'https://github.com/RT-Thread/rt-thread' 'master'

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,6 @@ ncscope.*
3535
#ctag files
3636
tags
3737

38+
.idea
39+
CMakeLists.txt
40+
cmake-build-debug

.ignore_format.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# files format check exclude path, please follow the instructions below to modify;
2+
# If you need to exclude an entire folder, add the folder path in dir_path;
3+
# If you need to exclude a file, add the path to the file in file_path.
4+
5+
file_path:
6+
- bsp/allwinner_tina/libcpu/cpu.c
7+
8+
dir_path:
9+
- tools
10+
- components/net/lwip-1.4.1
11+
- components/net/lwip-2.0.2
12+
- components/net/lwip-2.0.3
13+
- components/net/lwip-2.1.2
14+
- bsp/mm32f327x/Libraries

0 commit comments

Comments
 (0)