Skip to content

Commit 6328766

Browse files
kurisaWkurisaW
committed
Merge remote-tracking branch 'origin/master' into testcase
2 parents dce7586 + 98340c1 commit 6328766

File tree

103 files changed

+10379
-570
lines changed

Some content is hidden

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

103 files changed

+10379
-570
lines changed

‎.clang-format‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ BraceWrapping:
7272
AfterNamespace: true
7373
AfterObjCDeclaration: true
7474
AfterStruct: true
75-
AfterUnion: false
75+
AfterUnion: true
7676
BeforeCatch: true
7777
BeforeElse: true
7878
BeforeLambdaBody: false
@@ -84,7 +84,7 @@ BraceWrapping:
8484
BreakAfterAttributes: Never
8585
BreakAfterJavaFieldAnnotations: false
8686
BreakArrays: false
87-
BreakBeforeBinaryOperators: NonAssignment
87+
BreakBeforeBinaryOperators: None
8888
BreakBeforeConceptDeclarations: Always
8989
BreakBeforeInlineASMColon: OnlyMultiline
9090
BreakBeforeTernaryOperators: true
@@ -96,7 +96,7 @@ CommentPragmas: "^ IWYU pragma:"
9696
CompactNamespaces: false
9797
ConstructorInitializerIndentWidth: 4
9898
ContinuationIndentWidth: 4
99-
Cpp11BracedListStyle: true
99+
Cpp11BracedListStyle: false
100100
DerivePointerAlignment: false
101101
DisableFormat: false
102102
EmptyLineAfterAccessModifier: Never

‎.github/utest/default.cfg‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.github/workflows/action_utest.yml‎

Lines changed: 0 additions & 151 deletions
This file was deleted.

‎.github/workflows/utest_auto_run.yml‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Automation utest run script for the QEMU platform
2-
# Generate the corresponding config configuration for CI based on the configuration file under .github/utest.
2+
# Generate the corresponding config configuration for CI based on the configuration file under examples/utest/configs.
33

44
name: utest_auto_run
55

@@ -50,22 +50,26 @@ jobs:
5050
include:
5151
# only run on qemu-vexpress-a9
5252
- 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"
53+
config_file: "kernel/kernel_basic.cfg"
54+
- platform: { UTEST: "A9", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", SD_FILE: "sd.bin", KERNEL: "standard", "SMP_RUN":"" }
55+
config_file: "kernel/ipc.cfg"
56+
- platform: { UTEST: "A9", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", SD_FILE: "sd.bin", KERNEL: "standard", "SMP_RUN":"" }
57+
config_file: "kernel/mem.cfg"
5458

5559
- 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"
60+
config_file: "kernel/atomic_c11.cfg"
61+
- platform: { UTEST: "RISCV", RTT_BSP: "bsp/qemu-virt64-riscv", QEMU_ARCH: "riscv64", QEMU_MACHINE: "virt", SD_FILE: "None", KERNEL: "standard", "SMP_RUN":"" }
62+
config_file: "kernel/atomic_c11.cfg"
5763

5864
- platform: { UTEST: "A9", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", SD_FILE: "sd.bin", KERNEL: "standard", "SMP_RUN":"" }
5965
config_file: "cpp11/cpp11.cfg"
6066

6167
- 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: "net/lwip.cfg"
63-
68+
config_file: "components/lwip.cfg"
6469
- platform: { UTEST: "A9", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", SD_FILE: "sd.bin", KERNEL: "standard", "SMP_RUN":"" }
65-
config_file: "net/netdev.cfg"
66-
70+
config_file: "components/netdev.cfg"
6771
- platform: { UTEST: "A9", RTT_BSP: "bsp/qemu-vexpress-a9", QEMU_ARCH: "arm", QEMU_MACHINE: "vexpress-a9", SD_FILE: "sd.bin", KERNEL: "standard", "SMP_RUN":"" }
68-
config_file: "net/sal_lwip.cfg"
72+
config_file: "components/dfs.cfg"
6973

7074
env:
7175
TEST_QEMU_ARCH: ${{ matrix.platform.QEMU_ARCH }}
@@ -184,16 +188,16 @@ jobs:
184188
run: |
185189
# Whether plan to run SMP?
186190
if [[ "${{ matrix.platform.SMP_RUN }}" == "smp" ]]; then
187-
cat .github/utest/smp/smp.cfg >> $TEST_BSP_ROOT/.config
191+
cat examples/utest/configs/smp/smp.cfg >> $TEST_BSP_ROOT/.config
188192
fi
189193
190194
# Is the kernel rtsmart?
191195
if [[ "${{ matrix.platform.KERNEL }}" == "rtsmart" ]]; then
192-
cat .github/utest/rtsmart/rtsmart.cfg >> $TEST_BSP_ROOT/.config
196+
cat examples/utest/configs/rtsmart/rtsmart.cfg >> $TEST_BSP_ROOT/.config
193197
fi
194198
195199
echo CONFIG_RT_USING_UTESTCASES=y >> $TEST_BSP_ROOT/.config
196-
cat .github/utest/$TEST_CONFIG_FILE >> $TEST_BSP_ROOT/.config
200+
cat examples/utest/configs/$TEST_CONFIG_FILE >> $TEST_BSP_ROOT/.config
197201
scons --pyconfig-silent -C $TEST_BSP_ROOT
198202
scons -j$(nproc) --strict -C $TEST_BSP_ROOT
199203

‎Kconfig.utestcases‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ rsource "examples/utest/testcases/perf/Kconfig"
2121

2222
rsource "src/klibc/utest/Kconfig"
2323

24+
rsource "components/drivers/core/utest/Kconfig"
2425
rsource "components/drivers/audio/utest/Kconfig"
2526
rsource "components/dfs/utest/Kconfig"
2627
rsource "components/net/utest/Kconfig"

‎bsp/gd32/arm/gd32h759i-eval/board/board.c‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ void Error_Handler(void)
3232
void SystemClock_Config(void)
3333
{
3434
SysTick_Config(SystemCoreClock / RT_TICK_PER_SECOND);
35-
NVIC_SetPriority(SysTick_IRQn, 0);
3635
}
3736

3837
/**
@@ -65,6 +64,12 @@ void rt_hw_board_init()
6564
SCB->VTOR = (0x08000000 & NVIC_VTOR_MASK);
6665
#endif
6766

67+
/* Enable IChace */
68+
rt_hw_cpu_icache_enable();
69+
70+
/* Enable DChace */
71+
rt_hw_cpu_dcache_enable();
72+
6873
SystemClock_Config();
6974

7075
#ifdef RT_USING_SERIAL

‎bsp/gd32/arm/gd32h759i-start/board/board.c‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ void Error_Handler(void)
3232
void SystemClock_Config(void)
3333
{
3434
SysTick_Config(SystemCoreClock / RT_TICK_PER_SECOND);
35-
NVIC_SetPriority(SysTick_IRQn, 0);
3635
}
3736

3837
/**
@@ -65,6 +64,12 @@ void rt_hw_board_init()
6564
SCB->VTOR = (0x08000000 & NVIC_VTOR_MASK);
6665
#endif
6766

67+
/* Enable IChace */
68+
rt_hw_cpu_icache_enable();
69+
70+
/* Enable DChace */
71+
rt_hw_cpu_dcache_enable();
72+
6873
SystemClock_Config();
6974

7075
#ifdef RT_USING_SERIAL

‎bsp/gd32/arm/libraries/gd32_drivers/drv_usart.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,6 @@ static const struct gd32_uart uart_obj[] = {
554554
GPIOC, GPIO_AF_8, GPIO_PIN_6, /* tx port, tx alternate, tx pin */
555555
GPIOC, GPIO_AF_8, GPIO_PIN_7, /* rx port, rx alternate, rx pin */
556556
#elif defined (SOC_SERIES_GD32H7xx)
557-
GPIOC, GPIO_AF_7, GPIO_PIN_6, // tx port, tx alternate, tx pin
558557
GPIOC, GPIO_AF_7, GPIO_PIN_6, /* tx port, tx alternate, tx pin */
559558
GPIOC, GPIO_AF_7, GPIO_PIN_7, /* rx port, rx alternate, rx pin */
560559
#elif defined SOC_SERIES_GD32E50x
@@ -602,8 +601,8 @@ static const struct gd32_uart uart_obj[] = {
602601
UART7_IRQn, /* uart iqrn */
603602
RCU_UART7, RCU_GPIOE, RCU_GPIOE, /* periph clock, tx gpio clock, rt gpio clock */
604603
#if defined SOC_SERIES_GD32F4xx || defined SOC_SERIES_GD32F5xx || defined SOC_SERIES_GD32H7xx
605-
GPIOE, GPIO_AF_8, GPIO_PIN_0, /* tx port, tx alternate, tx pin */
606-
GPIOE, GPIO_AF_8, GPIO_PIN_1, /* rx port, rx alternate, rx pin */
604+
GPIOE, GPIO_AF_8, GPIO_PIN_1, /* tx port, tx alternate, tx pin */
605+
GPIOE, GPIO_AF_8, GPIO_PIN_0, /* rx port, rx alternate, rx pin */
607606
#else
608607
GPIOE, GPIO_PIN_0, /* tx port, tx pin */
609608
GPIOE, GPIO_PIN_1, /* rx port, rx pin */

0 commit comments

Comments
 (0)