Skip to content

v0.6.3 backports #248

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

Merged
merged 20 commits into from
Jul 19, 2020
Merged

v0.6.3 backports #248

merged 20 commits into from
Jul 19, 2020

Conversation

jonas-schievink
Copy link
Contributor

Doesn't include everything we could, but I ran out of steam. The important stuff should be there.

Next steps:

  • changelog
  • bump version and release

hug-dev and others added 19 commits July 19, 2020 16:05
Otherwise Cargo complains!

Signed-off-by: Hugues de Valon <[email protected]>
Armv8-M and Armv8.1-M architecture profiles have an optional Security
Extension which provides a set of Security features.
This patch adds initial support of the Cortex-M Security Extensions but
providing support for the TT intrinsics and helper functions on top of
it in the newly added cmse module of this crate.
The code is a Rust idiomatic implementation of the C
requirements described in this document:
https://developer.arm.com/docs/ecm0359818/latest

Signed-off-by: Hugues de Valon <[email protected]>
Some exceptions might be disabled by default which means that the
HardFault handler will be called instead of the exception handler. This
commit adds methods on the SCB peripheral that use the SHCSR register to
enable/disable exceptions.

Signed-off-by: Hugues de Valon <[email protected]>
\ fixes #204

the `asm!` macro will soon be deprecated.
This changes all of the `asm!` calls to `llvm_asm!`
To my knowledge doing a direct replacement should be fine.
This fixes the previous commit where the #![feature()]
flag was used by mistake.
@rust-highfive
Copy link

r? @thalesfragoso

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against v0.6.x. Please double check that you specified the right target!

@rust-highfive rust-highfive added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-cortex-m labels Jul 19, 2020
Copy link
Member

@adamgreig adamgreig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Were there any other PRs in particular that were non-breaking changes which you didn't get to including? Otherwise yep, changelog and version bump and we should be set, thanks very much for sorting this out.

@jonas-schievink
Copy link
Contributor Author

From v0.6.2...master, it doesn't include any commits after 0c764f8 except d3dc2a2

@adamgreig
Copy link
Member

@jonas-schievink Do you want to merge this into 0.6.x now and do changelog/etc later, or were you planning to make them part of this PR? I wouldn't mind having a few more PRs in the next 0.6 release since I think many of them are non-breaking, so I'm happy to cherry-pick a few more commits before we release.

@jonas-schievink
Copy link
Contributor Author

Okay, go ahead! Then I guess we should merge this first?

Copy link
Member

@adamgreig adamgreig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bors merge

@bors
Copy link
Contributor

bors bot commented Jul 19, 2020

Build succeeded:

@bors bors bot merged commit 00d16c3 into v0.6.x Jul 19, 2020
@bors bors bot deleted the backports branch July 19, 2020 21:44
@adamgreig adamgreig mentioned this pull request Jul 20, 2020
bors bot added a commit that referenced this pull request Jul 20, 2020
249: More v0.6.3 backports r=jonas-schievink a=adamgreig

I think this includes the remainder of the non-breaking changes since v0.6.2, with a couple of exceptions:

* #240 seemed low-impact but had loads of separate commits to cherry-pick
* #220 is I think non-breaking but was quite a substantial change, perhaps I could still include it

~~I did include #226 which adds a new field to `Peripherals`, but as I understand it that should be a non-breaking change since it's non-exhaustive.~~

I've updated the CHANGELOG with all the changes from this PR and the previous #248.

Co-authored-by: Cliff L. Biffle <[email protected]>
Co-authored-by: Peter Taylor <[email protected]>
Co-authored-by: Hugues de Valon <[email protected]>
Co-authored-by: Jonas Schievink <[email protected]>
Co-authored-by: Adam Greig <[email protected]>
adamgreig pushed a commit that referenced this pull request Jan 12, 2022
248: Expand #[pre_init] safety docs, discourage its use r=adamgreig a=jonas-schievink



Co-authored-by: Jonas Schievink <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-cortex-m
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants