Skip to content

Commit b0236b7

Browse files
committed
Merge branch 'better-build' into dt-base1
2 parents b765109 + 08077e6 commit b0236b7

File tree

4 files changed

+21
-2
lines changed

4 files changed

+21
-2
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ on:
99
push:
1010
branches:
1111
- main
12+
- v*-branch
1213
pull_request:
1314
branches:
1415
- main
16+
- v*-branch
1517
schedule:
1618
- cron: "0 0 * * *"
1719

Kconfig

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ menu "Rust Language Support"
77

88
config RUST_SUPPORTED
99
bool
10-
default y if (CPU_CORTEX_M || \
11-
(RISCV && !RISCV_ISA_RV32E && !RISCV_ISA_RV128I))
10+
default y if ((CPU_CORTEX_M || \
11+
(RISCV && !RISCV_ISA_RV32E && !RISCV_ISA_RV128I)) && \
12+
!TIMER_READS_ITS_FREQUENCY_AT_RUNTIME)
1213
help
1314
Selected for platforms that have support for Rust.
1415

samples/hello_world/sample.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@ common:
99
- "Hello world from Rust on (.*)"
1010
tags: rust
1111
filter: CONFIG_RUST_SUPPORTED
12+
platform_allow:
13+
- qemu_cortex_m0
14+
- qemu_cortex_m3
15+
- qemu_riscv32
16+
- qemu_riscv32/qemu_virt_riscv32/smp
17+
- qemu_riscv64
18+
- qemu_riscv64/qemu_virt_riscv64/smp
19+
- nrf52840dk/nrf52840
1220
tests:
1321
sample.rust.helloworld:
1422
tags: introduction

tests/time/testcase.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
common:
22
filter: CONFIG_RUST_SUPPORTED
3+
platform_allow:
4+
- qemu_cortex_m0
5+
- qemu_cortex_m3
6+
- qemu_riscv32
7+
- qemu_riscv32/qemu_virt_riscv32/smp
8+
- qemu_riscv64
9+
- qemu_riscv64/qemu_virt_riscv64/smp
10+
- nrf52840dk/nrf52840
311
tests:
412
test.rust.time:
513
harness: console

0 commit comments

Comments
 (0)