Skip to content

samples/tests: Disable the smp targets #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 25, 2025
Merged

samples/tests: Disable the smp targets #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac164c3
samples/tests: Disable the smp targets
d3zd3z Feb 25, 2025
d755651
zephyr: printk: Use proper type for `c_char`
d3zd3z Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions etc/platforms.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
-p qemu_cortex_m0
-p qemu_cortex_m3
-p qemu_riscv32
-p qemu_riscv32/qemu_virt_riscv32/smp
-p qemu_riscv64
-p qemu_riscv64/qemu_virt_riscv64/smp
-p m2gl025_miv
2 changes: 0 additions & 2 deletions samples/bench/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ common:
- qemu_cortex_m0
- qemu_cortex_m3
- qemu_riscv32
- qemu_riscv32/qemu_virt_riscv32/smp
- qemu_riscv64
- qemu_riscv64/qemu_virt_riscv64/smp
- nrf52840dk/nrf52840
tests:
sample.rust/bench.plain:
Expand Down
2 changes: 0 additions & 2 deletions samples/blinky/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ common:
- qemu_cortex_m0
- qemu_cortex_m3
- qemu_riscv32
- qemu_riscv32/qemu_virt_riscv32/smp
- qemu_riscv64
- qemu_riscv64/qemu_virt_riscv64/smp
- nrf52840dk/nrf52840
tests:
sample.basic.blinky:
Expand Down
2 changes: 0 additions & 2 deletions samples/hello_world/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@ common:
- qemu_cortex_m0
- qemu_cortex_m3
- qemu_riscv32
- qemu_riscv32/qemu_virt_riscv32/smp
- qemu_riscv64
- qemu_riscv64/qemu_virt_riscv64/smp
- nrf52840dk/nrf52840
tests:
sample.rust.helloworld:
Expand Down
2 changes: 0 additions & 2 deletions samples/philosophers/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ common:
- qemu_cortex_m0
- qemu_cortex_m3
- qemu_riscv32
- qemu_riscv32/qemu_virt_riscv32/smp
- qemu_riscv64
- qemu_riscv64/qemu_virt_riscv64/smp
- nrf52840dk/nrf52840
tests:
sample.rust.philosopher.semaphore:
Expand Down
2 changes: 0 additions & 2 deletions samples/work-philosophers/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@ common:
- qemu_cortex_m0
- qemu_cortex_m3
- qemu_riscv32
- qemu_riscv32/qemu_virt_riscv32/smp
- qemu_riscv64
- qemu_riscv64/qemu_virt_riscv64/smp
- nrf52840dk/nrf52840
tests:
sample.rust.work-philosopher:
Expand Down
2 changes: 0 additions & 2 deletions tests/time/testcase.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ common:
- qemu_cortex_m0
- qemu_cortex_m3
- qemu_riscv32
- qemu_riscv32/qemu_virt_riscv32/smp
- qemu_riscv64
- qemu_riscv64/qemu_virt_riscv64/smp
- nrf52840dk/nrf52840
tests:
test.rust.time:
Expand Down
2 changes: 0 additions & 2 deletions tests/timer/testcase.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ common:
- qemu_cortex_m0
- qemu_cortex_m3
- qemu_riscv32
- qemu_riscv32/qemu_virt_riscv32/smp
- qemu_riscv64
- qemu_riscv64/qemu_virt_riscv64/smp
- nrf52840dk/nrf52840
tests:
test.rust.timer:
Expand Down
7 changes: 5 additions & 2 deletions zephyr/src/printk.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
//!
//! This uses the `k_str_out` syscall, which is part of printk to output to the console.

use core::fmt::{write, Arguments, Result, Write};
use core::{
ffi::c_char,
fmt::{write, Arguments, Result, Write},
};

/// Print to Zephyr's console, without a newline.
///
Expand Down Expand Up @@ -92,7 +95,7 @@ impl Context {
fn flush(&mut self) {
if self.count > 0 {
unsafe {
zephyr_sys::k_str_out(self.buf.as_mut_ptr() as *mut i8, self.count);
zephyr_sys::k_str_out(self.buf.as_mut_ptr() as *mut c_char, self.count);
}
self.count = 0;
}
Expand Down