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

Update to latest HALs, various fixes/cleanup #39

Merged
merged 6 commits into from
Dec 22, 2023
Merged
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
23 changes: 0 additions & 23 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,28 +1,5 @@
[alias]
xtask = "run --package xtask --"

[target.'cfg(target_arch = "riscv32")']
rustflags = ["-C", "link-args=-Map=target/stub.map"]

[target.'cfg(target_arch = "xtensa")']
rustflags = ["-C", "link-args=-Wl,-Map=target/stub.map"]


[target.xtensa-esp32s2-none-elf]
rustflags = [
# enable the atomic codegen option for Xtensa
"-C", "target-feature=+s32c1i",

# tell the core library have atomics even though it's not specified in the target definition
"--cfg", "target_has_atomic_load_store",
"--cfg", 'target_has_atomic_load_store="8"',
"--cfg", 'target_has_atomic_load_store="16"',
"--cfg", 'target_has_atomic_load_store="32"',
"--cfg", 'target_has_atomic_load_store="ptr"',
# enable cas
"--cfg", "target_has_atomic",
"--cfg", 'target_has_atomic="8"',
"--cfg", 'target_has_atomic="16"',
"--cfg", 'target_has_atomic="32"',
"--cfg", 'target_has_atomic="ptr"',
]
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,13 @@ target/
.DS_Store
*.swp

# No need to track the `xtask` package's lockfile
xtask/Cargo.lock

# Ignore generated JSON & toml stub files
*.json
*.toml

# Allow these toml files though
!Cargo.toml
!rustfmt.toml
Loading