Skip to content

Commit 1d9bd7e

Browse files
OuxiaolongOuxiaolong
authored
Merge branch 'RT-Thread:master' into master
2 parents b655ecf + 603ccde commit 1d9bd7e

File tree

786 files changed

+256467
-2940
lines changed

Some content is hidden

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

786 files changed

+256467
-2940
lines changed

‎.github/ALL_BSP_COMPILE.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@
247247
"nxp/mcx/mcxa/frdm-mcxa153",
248248
"nxp/mcx/mcxa/frdm-mcxa156",
249249
"nxp/mcx/mcxa/frdm-mcxa346",
250+
"nxp/mcx/mcxe/frdm-mcxe247",
250251
"renesas/ebf_qi_min_6m5",
251252
"renesas/ra6m4-cpk",
252253
"renesas/ra6m4-iot",
@@ -263,6 +264,8 @@
263264
"renesas/rzt2m_rsk",
264265
"renesas/rzn2l_rsk",
265266
"renesas/rzn2l_etherkit",
267+
"renesas/ra2a1-ek",
268+
"renesas/ra2e2-ek",
266269
"frdm-k64f",
267270
"xplorer4330/M4"
268271
]
@@ -304,6 +307,7 @@
304307
"gd32/arm/gd32450z-eval",
305308
"gd32/arm/gd32470z-lckfb",
306309
"gd32/arm/gd32h759i-start",
310+
"gd32/arm/gd32h759i-eval",
307311
"gd32/arm/gd32e503v-eval",
308312
"gd32/arm/gd32527I-eval",
309313
"gd32/arm/gd32e230-lckfb",

‎.github/utest/default.cfg‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
CONFIG_RT_USING_CI_ACTION=y
2-
CONFIG_RT_CONSOLEBUF_SIZE=1024
1+
# dependencies
2+
CONFIG_RT_CONSOLEBUF_SIZE=1024
3+
CONFIG_RT_USING_CI_ACTION=y

‎.github/utest/dfs/dfs.cfg‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# dependencies
2+
CONFIG_RT_CONSOLEBUF_SIZE=1024
3+
CONFIG_RT_NAME_MAX=24
4+
CONFIG_RT_USING_CI_ACTION=y
5+
6+
CONFIG_RT_UTEST_DFS_API_TC=y
7+
CONFIG_RT_UTEST_POSIX_API_TC=y
8+
CONFIG_RT_UTEST_DFS_MNT_PATH=""
9+
CONFIG_RT_UTEST_DFS_FS_TYPE="elm"
10+
CONFIG_RT_UTEST_DFS_BLOCK_DEV="sd0"

‎.github/utest/kernel/object.cfg‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
CONFIG_UTEST_OBJECT_TC=y
2-
31
# dependencies
2+
CONFIG_RT_CONSOLEBUF_SIZE=1024
43
CONFIG_RT_USING_CI_ACTION=y
5-
CONFIG_RT_USING_DEVICE=y
6-
CONFIG_RT_USING_SEMAPHORE=y
4+
CONFIG_UTEST_OBJECT_TC=y
5+
CONFIG_UTEST_THR_STACK_SIZE=8192

‎.github/utest/lwip/lwip.cfg‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# dependencies
2+
CONFIG_RT_CONSOLEBUF_SIZE=1024
3+
CONFIG_RT_NAME_MAX=24
4+
CONFIG_RT_USING_CI_ACTION=y
5+
6+
CONFIG_RT_LWIP_NETIF_LOOPBACK=y
7+
CONFIG_LWIP_NETIF_LOOPBACK=1
8+
CONFIG_RT_UTEST_TC_USING_LWIP=y
9+
CONFIG_RT_UTEST_LWIP_DNS_TEST=y
10+
CONFIG_RT_UTEST_LWIP_TCP_TEST=y
11+
CONFIG_RT_UTEST_LWIP_UDP_TEST=y
12+
CONFIG_RT_UTEST_LWIP_ICMP_TEST=y
13+
CONFIG_RT_UTEST_LWIP_SOCKET_OPT_TEST=y
14+
CONFIG_RT_UTEST_LWIP_ADDR_CONV_TEST=y
15+
CONFIG_RT_UTEST_LWIP_NETIF_TEST=y
16+
CONFIG_RT_UTEST_LWIP_TCP_PORT=1234
17+
CONFIG_RT_UTEST_LWIP_UDP_PORT=1235
18+
CONFIG_RT_UTEST_LWIP_TEST_URL="www.rt-thread.org"
19+
CONFIG_RT_UTEST_LWIP_TEST_ADDR="180.163.146.111"
20+
CONFIG_BSP_DRV_EMAC=y

‎.github/workflows/utest_auto_run.yml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,19 @@ jobs:
4747
config_file:
4848
- "default.cfg"
4949

50-
# kernel
51-
# - "kernel/object.cfg"
50+
include:
51+
# only run on qemu-vexpress-a9
52+
- platform: { UTEST: "A9", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", SD_FILE: "sd.bin", KERNEL: "standard", "SMP_RUN":"" }
53+
config_file: "kernel/object.cfg"
5254

53-
# cpp11
54-
# - "cpp11/cpp11.cfg"
55+
- platform: { UTEST: "A9", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", SD_FILE: "sd.bin", KERNEL: "standard", "SMP_RUN":"" }
56+
config_file: "dfs/dfs.cfg"
57+
58+
- platform: { UTEST: "A9", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", SD_FILE: "sd.bin", KERNEL: "standard", "SMP_RUN":"" }
59+
config_file: "cpp11/cpp11.cfg"
60+
61+
- platform: { UTEST: "A9", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", SD_FILE: "sd.bin", KERNEL: "standard", "SMP_RUN":"" }
62+
config_file: "lwip/lwip.cfg"
5563

5664
env:
5765
TEST_QEMU_ARCH: ${{ matrix.platform.QEMU_ARCH }}

‎Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
rsource "src/Kconfig"
22
rsource "libcpu/Kconfig"
33
rsource "components/Kconfig"
4-
rsource "examples/utest/testcases/Kconfig"
4+
rsource "Kconfig.utestcases"

‎Kconfig.utestcases‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
menu "RT-Thread Utestcases"
2+
3+
config RT_USING_UTESTCASES
4+
bool "RT-Thread Utestcases"
5+
default n
6+
select RT_USING_UTEST
7+
8+
if RT_USING_UTESTCASES
9+
10+
rsource "components/utilities/utest/utest/Kconfig"
11+
rsource "examples/utest/testcases/kernel/Kconfig"
12+
rsource "examples/utest/testcases/cpp11/Kconfig"
13+
rsource "examples/utest/testcases/drivers/serial_v2/Kconfig"
14+
rsource "examples/utest/testcases/drivers/serial_bypass/Kconfig"
15+
rsource "examples/utest/testcases/drivers/ipc/Kconfig"
16+
rsource "examples/utest/testcases/posix/Kconfig"
17+
rsource "examples/utest/testcases/mm/Kconfig"
18+
rsource "examples/utest/testcases/tmpfs/Kconfig"
19+
rsource "examples/utest/testcases/smp_call/Kconfig"
20+
rsource "examples/utest/testcases/perf/Kconfig"
21+
22+
rsource "src/klibc/utest/Kconfig"
23+
24+
rsource "components/drivers/audio/utest/Kconfig"
25+
rsource "components/dfs/utest/Kconfig"
26+
rsource "components/net/utest/Kconfig"
27+
28+
endif
29+
30+
endmenu

‎bsp/gd32/arm/docs/GD32_ARM系列BSP制作教程.md‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -569,22 +569,6 @@ menu "On-chip Peripheral Drivers"
569569
default n
570570
endif
571571
572-
menuconfig BSP_USING_I2C1
573-
bool "Enable I2C1 BUS (software simulation)"
574-
default n
575-
select RT_USING_I2C
576-
select RT_USING_I2C_BITOPS
577-
select RT_USING_PIN
578-
if BSP_USING_I2C1
579-
config BSP_I2C1_SCL_PIN
580-
int "i2c1 scl pin number"
581-
range 1 216
582-
default 24
583-
config BSP_I2C1_SDA_PIN
584-
int "I2C1 sda pin number"
585-
range 1 216
586-
default 25
587-
endif
588572
source "../libraries/gd32_drivers/Kconfig"
589573
590574
endmenu

‎bsp/gd32/arm/gd32103c-eval/board/Kconfig‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -99,23 +99,6 @@ menu "On-chip Peripheral Drivers"
9999
default n
100100
endif
101101

102-
menuconfig BSP_USING_I2C1
103-
bool "Enable I2C1 BUS (software simulation)"
104-
default n
105-
select RT_USING_I2C
106-
select RT_USING_I2C_BITOPS
107-
select RT_USING_PIN
108-
if BSP_USING_I2C1
109-
config BSP_I2C1_SCL_PIN
110-
int "i2c1 scl pin number"
111-
range 1 216
112-
default 24
113-
config BSP_I2C1_SDA_PIN
114-
int "I2C1 sda pin number"
115-
range 1 216
116-
default 25
117-
endif
118-
119102
menuconfig BSP_USING_ADC
120103
bool "Enable ADC"
121104
default n

0 commit comments

Comments
 (0)