Skip to content
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.

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

force-amo: allowing AMOxxx instructions for riscv32imc #57

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
continue-on-error: ${{ matrix.experimental || false }}
strategy:
matrix:
# All generated code should be running on stable now, MRSV is 1.60.0
rust: [nightly, stable, 1.60.0]
# All generated code should be running on stable now, MRSV is 1.72.0
rust: [nightly, stable, 1.72.0]

include:
# Nightly is only for reference and allowed to fail
Expand Down
4 changes: 0 additions & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
{
"[rust]": {
"editor.defaultFormatter": "rust-lang.rust-analyzer",
"editor.formatOnSave": true
},
"rust-analyzer.cargo.features": [
"g002",
"virq",
Expand Down
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

- Use `portable-atomic` to allow builds on `riscv32imc-unknown-none-elf`` targets when needed.
### Changed
- Use `portable-atomic` to allow builds on `riscv32imc-unknown-none-elf` targets when needed.
- Use `force-amo` on `portable-atomic` to use AMO instructions even when compiling for `riscv32imc-unknown-none-elf`.
- Bump MSRV to 1.72 due to `force-amo` on `portable-atomic`.

## [v0.10.0] - 2023-03-28

Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ categories = ["embedded", "hardware-support", "no-std"]
description = "HAL for the E310x family of microcontrollers."
keywords = ["riscv", "e310", "hal"]
license = "ISC"
edition = "2018"
rust-version = "1.59"
edition = "2021"
rust-version = "1.72"

[dependencies]
embedded-hal = { version = "0.2.6", features = ["unproven"] }
Expand All @@ -17,7 +17,7 @@ riscv = { version = "0.10.1", features = ["critical-section-single-hart"] }
e310x = { version = "0.11.0", features = ["rt", "critical-section"] }

[target.'cfg(not(target_has_atomic = "32"))'.dependencies]
portable-atomic = { version = "1.4", default-features = false, features = ["unsafe-assume-single-core"] }
portable-atomic = { version = "1.5", default-features = false, features = ["unsafe-assume-single-core", "force-amo"] }

[features]
g002 = ["e310x/g002"]
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This project is developed and maintained by the [RISC-V team][team].

## Minimum Supported Rust Version (MSRV)

This crate is guaranteed to compile on stable Rust 1.60.0 and up. It *might*
This crate is guaranteed to compile on stable Rust 1.72.0 and up. It *might*
compile with older versions but that may change in any new patch release.

## License
Expand Down
Loading