Skip to content

Commit 544c721

Browse files
ShermanShaoShermanShao
committed
Merge branch 'master' of github.com:RT-Thread/rt-thread
2 parents fc3c29d + 032ce63 commit 544c721

File tree

951 files changed

+41520
-198617
lines changed

Some content is hidden

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

951 files changed

+41520
-198617
lines changed

‎.github/workflows/action.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,15 @@ jobs:
3535
- {RTT_BSP: "asm9260t", RTT_TOOL_CHAIN: "sourcery-arm"}
3636
- {RTT_BSP: "at91sam9260", RTT_TOOL_CHAIN: "sourcery-arm"}
3737
- {RTT_BSP: "allwinner_tina", RTT_TOOL_CHAIN: "sourcery-arm"}
38+
- {RTT_BSP: "gd32/gd32103c-eval", RTT_TOOL_CHAIN: "sourcery-arm"}
39+
- {RTT_BSP: "gd32/gd32105c-eval", RTT_TOOL_CHAIN: "sourcery-arm"}
3840
- {RTT_BSP: "gd32/gd32105r-start", RTT_TOOL_CHAIN: "sourcery-arm"}
41+
- {RTT_BSP: "gd32/gd32107c-eval", RTT_TOOL_CHAIN: "sourcery-arm"}
3942
- {RTT_BSP: "gd32/gd32205r-start", RTT_TOOL_CHAIN: "sourcery-arm"}
43+
- {RTT_BSP: "gd32/gd32303e-eval", RTT_TOOL_CHAIN: "sourcery-arm"}
4044
- {RTT_BSP: "gd32/gd32305r-start", RTT_TOOL_CHAIN: "sourcery-arm"}
4145
- {RTT_BSP: "gd32/gd32407v-start", RTT_TOOL_CHAIN: "sourcery-arm"}
46+
- {RTT_BSP: "gd32/gd32450z-eval", RTT_TOOL_CHAIN: "sourcery-arm"}
4247
- {RTT_BSP: "gd32e230k-start", RTT_TOOL_CHAIN: "sourcery-arm"}
4348
- {RTT_BSP: "gd32vf103v-eval", RTT_TOOL_CHAIN: "sourcery-riscv-none-embed"}
4449
- {RTT_BSP: "gd32303e-eval", RTT_TOOL_CHAIN: "sourcery-arm"}

‎.github/workflows/action_tools.yml‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
name: ToolsCI
2+
3+
# Controls when the action will run. Triggers the workflow on push or pull request
4+
# events but only for the master branch
5+
on:
6+
# Runs at 16:00 UTC (BeiJing 00:00) on the 1st of every month
7+
schedule:
8+
- cron: '0 16 1 * *'
9+
push:
10+
branches:
11+
- master
12+
paths-ignore:
13+
- documentation/**
14+
- '**/README.md'
15+
- '**/README_zh.md'
16+
- '**/*.c'
17+
- '**/*.h'
18+
- '**/*.cpp'
19+
pull_request:
20+
branches:
21+
- master
22+
paths-ignore:
23+
- documentation/**
24+
- '**/README.md'
25+
- '**/README_zh.md'
26+
- '**/*.c'
27+
- '**/*.h'
28+
- '**/*.cpp'
29+
30+
jobs:
31+
test:
32+
runs-on: ubuntu-latest
33+
name: Tools
34+
strategy:
35+
fail-fast: false
36+
env:
37+
TEST_BSP_ROOT: bsp/stm32/stm32f407-atk-explorer
38+
steps:
39+
- uses: actions/checkout@v1
40+
41+
- name: Install Tools
42+
shell: bash
43+
run: |
44+
sudo apt-get update
45+
sudo apt-get -yqq install scons
46+
47+
- name: Install Arm ToolChains
48+
if: ${{ success() }}
49+
shell: bash
50+
run: |
51+
wget -q https://github.com/RT-Thread/toolchains-ci/releases/download/v1.3/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
52+
sudo tar xjf gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2 -C /opt
53+
/opt/gcc-arm-none-eabi-10-2020-q4-major/bin/arm-none-eabi-gcc --version
54+
echo "RTT_EXEC_PATH=/opt/gcc-arm-none-eabi-10-2020-q4-major/bin" >> $GITHUB_ENV
55+
56+
- name: Build Tools
57+
run: |
58+
scons --pyconfig-silent -C $TEST_BSP_ROOT
59+
scons -j$(nproc) -C $TEST_BSP_ROOT
60+
61+
- name: Project generate Tools
62+
if: ${{ success() }}
63+
run: |
64+
echo "Test to generate mdk project"
65+
scons --target=mdk -s -C $TEST_BSP_ROOT
66+
scons --target=mdk4 -s -C $TEST_BSP_ROOT
67+
scons --target=mdk5 -s -C $TEST_BSP_ROOT
68+
echo "Test to generate iar project"
69+
scons --target=iar -s -C $TEST_BSP_ROOT
70+
echo "Test to generate eclipse project"
71+
scons --target=eclipse -s -C $TEST_BSP_ROOT
72+
echo "Test to generate cmake project"
73+
scons --target=cmake -s -C $TEST_BSP_ROOT
74+
echo "Test to generate makefile project"
75+
scons --target=makefile -s -C $TEST_BSP_ROOT
76+
77+
- name: Project dist Tools
78+
if: ${{ success() }}
79+
run: |
80+
echo "Test to dist project"
81+
scons --dist -C $TEST_BSP_ROOT
82+
scons --dist-ide -C $TEST_BSP_ROOT

‎.github/workflows/action_utest.yml‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,25 @@
11
name: AutoTestCI
22

33
# Controls when the action will run. Triggers the workflow on push or pull request
4-
on: [push, pull_request]
4+
# events but only for the master branch
5+
on:
6+
# Runs at 16:00 UTC (BeiJing 00:00) on the 1st of every month
7+
schedule:
8+
- cron: '0 16 1 * *'
9+
push:
10+
branches:
11+
- master
12+
paths-ignore:
13+
- documentation/**
14+
- '**/README.md'
15+
- '**/README_zh.md'
16+
pull_request:
17+
branches:
18+
- master
19+
paths-ignore:
20+
- documentation/**
21+
- '**/README.md'
22+
- '**/README_zh.md'
523

624
jobs:
725
test:

‎bsp/at91sam9260/platform/interrupt.c‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,28 @@ void rt_hw_interrupt_ack(rt_uint32_t fiq_irq, rt_uint32_t id)
396396
at91_sys_write(AT91_AIC_EOICR, 0x0);
397397
}
398398

399+
void rt_interrupt_dispatch(rt_uint32_t fiq_irq)
400+
{
401+
rt_isr_handler_t isr_func;
402+
rt_uint32_t irq;
403+
void *param;
404+
405+
/* get irq number */
406+
irq = rt_hw_interrupt_get_active(fiq_irq);
407+
408+
/* get interrupt service routine */
409+
isr_func = irq_desc[irq].handler;
410+
param = irq_desc[irq].param;
411+
412+
/* turn to interrupt service routine */
413+
isr_func(irq, param);
414+
415+
rt_hw_interrupt_ack(fiq_irq, irq);
416+
#ifdef RT_USING_INTERRUPT_INFO
417+
irq_desc[irq].counter ++;
418+
#endif
419+
}
420+
399421
#ifdef RT_USING_FINSH
400422
#ifdef RT_USING_INTERRUPT_INFO
401423
void list_irq(void)

‎bsp/at91sam9260/template.uvopt‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<tExt>*.txt; *.h; *.inc</tExt>
1414
<pExt>*.plm</pExt>
1515
<CppX>*.cpp</CppX>
16+
<nMigrate>0</nMigrate>
1617
</Extensions>
1718

1819
<DaveTm>
@@ -31,6 +32,7 @@
3132
<BeepAtEnd>1</BeepAtEnd>
3233
<RunSim>1</RunSim>
3334
<RunTarget>0</RunTarget>
35+
<RunAbUc>0</RunAbUc>
3436
</OPTTT>
3537
<OPTHX>
3638
<HexSelection>1</HexSelection>
@@ -108,10 +110,10 @@
108110
<tRtrace>1</tRtrace>
109111
<sRSysVw>1</sRSysVw>
110112
<tRSysVw>1</tRSysVw>
111-
<tPdscDbg>1</tPdscDbg>
112113
<sRunDeb>0</sRunDeb>
113114
<sLrtime>0</sLrtime>
114-
<nTsel>5</nTsel>
115+
<bEvRecOn>1</bEvRecOn>
116+
<nTsel>18</nTsel>
115117
<sDll></sDll>
116118
<sDllPa></sDllPa>
117119
<sDlgDll></sDlgDll>
@@ -168,6 +170,13 @@
168170
</DebugFlag>
169171
<LintExecutable></LintExecutable>
170172
<LintConfigFile></LintConfigFile>
173+
<bLintAuto>0</bLintAuto>
174+
<bAutoGenD>0</bAutoGenD>
175+
<LntExFlags>0</LntExFlags>
176+
<pMisraName></pMisraName>
177+
<pszMrule></pszMrule>
178+
<pSingCmds></pSingCmds>
179+
<pMultCmds></pMultCmds>
171180
</TargetOption>
172181
</Target>
173182

‎bsp/at91sam9260/template.uvproj‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,18 @@
7272
<UserProg2Name></UserProg2Name>
7373
<UserProg1Dos16Mode>0</UserProg1Dos16Mode>
7474
<UserProg2Dos16Mode>0</UserProg2Dos16Mode>
75+
<nStopB1X>0</nStopB1X>
76+
<nStopB2X>0</nStopB2X>
7577
</BeforeMake>
7678
<AfterMake>
77-
<RunUserProg1>0</RunUserProg1>
79+
<RunUserProg1>1</RunUserProg1>
7880
<RunUserProg2>0</RunUserProg2>
79-
<UserProg1Name></UserProg1Name>
81+
<UserProg1Name>fromelf.exe --bin -o [email protected] #L</UserProg1Name>
8082
<UserProg2Name></UserProg2Name>
8183
<UserProg1Dos16Mode>0</UserProg1Dos16Mode>
8284
<UserProg2Dos16Mode>0</UserProg2Dos16Mode>
85+
<nStopA1X>0</nStopA1X>
86+
<nStopA2X>0</nStopA2X>
8387
</AfterMake>
8488
<SelectedForBatchBuild>0</SelectedForBatchBuild>
8589
<SVCSIdString></SVCSIdString>
@@ -141,10 +145,9 @@
141145
<RestoreToolbox>1</RestoreToolbox>
142146
<RestoreTracepoints>1</RestoreTracepoints>
143147
<RestoreSysVw>1</RestoreSysVw>
144-
<UsePdscDebugDescription>1</UsePdscDebugDescription>
145148
</Target>
146149
<RunDebugAfterBuild>0</RunDebugAfterBuild>
147-
<TargetSelection>5</TargetSelection>
150+
<TargetSelection>18</TargetSelection>
148151
<SimDlls>
149152
<CpuDll></CpuDll>
150153
<CpuDllArguments></CpuDllArguments>
@@ -224,6 +227,7 @@
224227
<useUlib>0</useUlib>
225228
<EndSel>0</EndSel>
226229
<uLtcg>0</uLtcg>
230+
<nSecure>0</nSecure>
227231
<RoSelD>3</RoSelD>
228232
<RwSelD>3</RwSelD>
229233
<CodeSel>0</CodeSel>
@@ -356,8 +360,15 @@
356360
<wLevel>2</wLevel>
357361
<uThumb>0</uThumb>
358362
<uSurpInc>0</uSurpInc>
359-
<uC99>0</uC99>
363+
<uC99>1</uC99>
360364
<useXO>0</useXO>
365+
<v6Lang>1</v6Lang>
366+
<v6LangP>1</v6LangP>
367+
<vShortEn>1</vShortEn>
368+
<vShortWch>1</vShortWch>
369+
<v6Lto>0</v6Lto>
370+
<v6WtE>0</v6WtE>
371+
<v6Rtti>0</v6Rtti>
361372
<VariousControls>
362373
<MiscControls></MiscControls>
363374
<Define>RT_USING_INTERRUPT_INFO</Define>
@@ -375,6 +386,7 @@
375386
<NoWarn>0</NoWarn>
376387
<uSurpInc>0</uSurpInc>
377388
<useXO>0</useXO>
389+
<uClangAs>0</uClangAs>
378390
<VariousControls>
379391
<MiscControls></MiscControls>
380392
<Define></Define>

‎bsp/bluetrum/ab32vg1-ab-prougen/applications/mnt.c‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414

1515
#include <dfs_elm.h>
1616
#include <dfs_fs.h>
17-
#include <dfs_posix.h>
17+
#include <dfs_file.h>
18+
#include <unistd.h>
19+
#include <stdio.h>
20+
#include <sys/stat.h>
21+
#include <sys/statfs.h>
1822
#include "drv_gpio.h"
1923

2024
// #define DRV_DEBUG

‎bsp/bluetrum/libraries/hal_libraries/ab32vg1_hal/SConscript‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@ DEPENDS = [""]
1818
# SOURCES: Need to compile c and c++ source, auto search when SOURCES is empty
1919
#
2020
# LOCAL_CPPPATH: Local file path (.h/.c/.cpp)
21-
# LOCAL_CCFLAGS: Local compilation parameter
21+
# LOCAL_CFLAGS: Local c compilation parameter
22+
# LOCAL_CCFLAGS: Local c/c++ compilation parameter
23+
# LOCAL_CXXFLAGS: Local c++ compilation parameter
2224
# LOCAL_ASFLAGS: Local assembly parameters
2325
#
2426
# CPPPATH: Global file path (.h/.c/.cpp), auto search when LOCAL_CPPPATH/CPPPATH
2527
# is empty # no pass!!!
26-
# CCFLAGS: Global compilation parameter
28+
# CFLAGS : Global compilation parameter
2729
# ASFLAGS: Global assembly parameters
2830
#
2931
# CPPDEFINES: Global macro definition
@@ -37,12 +39,16 @@ DEPENDS = [""]
3739
CWD = GetCurrentDir()
3840
SOURCES = Glob("./source/*.c")
3941

40-
LOCAL_CPPPATH = []
41-
LOCAL_CCFLAGS = ""
42+
LOCAL_CPPPATH = []
43+
LOCAL_CFLAGS = ""
44+
LOCAL_CCFLAGS = ""
45+
LOCAL_CXXFLAGS = ""
4246
LOCAL_ASFLAGS = ""
4347

4448
CPPPATH = [GetCurrentDir(), os.path.join(GetCurrentDir(), 'include')]
45-
CCFLAGS = ""
49+
CFLAGS = ""
50+
CCFLAGS = ""
51+
CXXFLAGS = ""
4652
ASFLAGS = ""
4753

4854
CPPDEFINES = []
@@ -61,10 +67,14 @@ CPPPATH_IGNORE = []
6167
#---------------------------------------------------------------------------------
6268
objs = DefineGroup(name = PKGNAME, src = SOURCES, depend = DEPENDS,
6369
CPPPATH = CPPPATH,
70+
CFLAGS = CFLAGS,
6471
CCFLAGS = CCFLAGS,
72+
CXXFLAGS = CXXFLAGS,
6573
ASFLAGS = ASFLAGS,
6674
LOCAL_CPPPATH = LOCAL_CPPPATH,
75+
LOCAL_CFLAGS = LOCAL_CFLAGS,
6776
LOCAL_CCFLAGS = LOCAL_CCFLAGS,
77+
LOCAL_CXXFLAGS = LOCAL_CXXFLAGS,
6878
LOCAL_ASFLAGS = LOCAL_ASFLAGS,
6979
CPPDEFINES = CPPDEFINES,
7080
LOCAL_CPPDEFINES = LOCAL_CPPDEFINES,

‎bsp/bluetrum/libraries/hal_libraries/bmsis/SConscript‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,14 @@ DEPENDS = [""]
1919
# SOURCES: Need to compile c and c++ source, auto search when SOURCES is empty
2020
#
2121
# LOCAL_CPPPATH: Local file path (.h/.c/.cpp)
22-
# LOCAL_CCFLAGS: Local compilation parameter
22+
# LOCAL_CFLAGS: Local c compilation parameter
23+
# LOCAL_CCFLAGS: Local c/c++ compilation parameter
24+
# LOCAL_CXXFLAGS: Local c++ compilation parameter
2325
# LOCAL_ASFLAGS: Local assembly parameters
2426
#
2527
# CPPPATH: Global file path (.h/.c/.cpp), auto search when LOCAL_CPPPATH/CPPPATH
2628
# is empty # no pass!!!
27-
# CCFLAGS: Global compilation parameter
29+
# CFLAGS : Global compilation parameter
2830
# ASFLAGS: Global assembly parameters
2931
#
3032
# CPPDEFINES: Global macro definition
@@ -35,22 +37,26 @@ DEPENDS = [""]
3537
#
3638
# LINKFLAGS: Link options
3739
#---------------------------------------------------------------------------------
40+
CWD = GetCurrentDir()
3841
SOURCES = Glob("./source/*.c")
39-
SOURCES += Glob("./source/*.S")
4042

41-
LOCAL_CPPPATH = []
42-
LOCAL_CCFLAGS = ""
43+
LOCAL_CPPPATH = []
44+
LOCAL_CFLAGS = ""
45+
LOCAL_CCFLAGS = ""
46+
LOCAL_CXXFLAGS = ""
4347
LOCAL_ASFLAGS = ""
4448

4549
CPPPATH = [GetCurrentDir(), os.path.join(GetCurrentDir(), 'include')]
46-
CCFLAGS = ""
50+
CFLAGS = ""
51+
CCFLAGS = ""
52+
CXXFLAGS = ""
4753
ASFLAGS = ""
4854

4955
CPPDEFINES = []
5056
LOCAL_CPPDEFINES = []
5157

5258
LIBS = []
53-
LIBPATH = []
59+
LIBPATH = []
5460

5561
LINKFLAGS = ""
5662

@@ -62,10 +68,14 @@ CPPPATH_IGNORE = []
6268
#---------------------------------------------------------------------------------
6369
objs = DefineGroup(name = PKGNAME, src = SOURCES, depend = DEPENDS,
6470
CPPPATH = CPPPATH,
71+
CFLAGS = CFLAGS,
6572
CCFLAGS = CCFLAGS,
73+
CXXFLAGS = CXXFLAGS,
6674
ASFLAGS = ASFLAGS,
6775
LOCAL_CPPPATH = LOCAL_CPPPATH,
76+
LOCAL_CFLAGS = LOCAL_CFLAGS,
6877
LOCAL_CCFLAGS = LOCAL_CCFLAGS,
78+
LOCAL_CXXFLAGS = LOCAL_CXXFLAGS,
6979
LOCAL_ASFLAGS = LOCAL_ASFLAGS,
7080
CPPDEFINES = CPPDEFINES,
7181
LOCAL_CPPDEFINES = LOCAL_CPPDEFINES,

0 commit comments

Comments
 (0)