Move cortex-m crate into cortex-m directory

.gitignore

@@ -1,8 +1,4 @@
 *.org
-*.rs.bk
 .#*
 Cargo.lock
-bin/*.after
-bin/*.before
-bin/*.o
 target

Cargo.toml

@@ -1,41 +1,7 @@
-[package]
-authors = [
-    "The Cortex-M Team <[email protected]>",
-    "Jorge Aparicio <[email protected]>",
-]
-categories = ["embedded", "hardware-support", "no-std"]
-description = "Low level access to Cortex-M processors"
-documentation = "https://docs.rs/cortex-m"
-keywords = ["arm", "cortex-m", "register", "peripheral"]
-license = "MIT OR Apache-2.0"
-name = "cortex-m"
-readme = "README.md"
-repository = "https://github.com/rust-embedded/cortex-m"
-version = "0.7.4"
-edition = "2021"
-rust-version = "1.59"
-links = "cortex-m"  # prevent multiple versions of this crate to be linked together
-
-[dependencies]
-critical-section = "1.0.0"
-volatile-register = "0.2.0"
-bitfield = "0.13.2"
-embedded-hal = "0.2.4"
-
-[dependencies.serde]
-version = "1"
-features = [ "derive" ]
-optional = true
-
-[features]
-cm7 = []
-cm7-r0p1 = ["cm7"]
-linker-plugin-lto = []
-std = []
-critical-section-single-core = ["critical-section/restore-state-bool"]
-
 [workspace]
+resolver = "2"
 members = [
+    "cortex-m",
     "cortex-m-rt",
     "cortex-m-semihosting",
     "panic-itm",
@@ -45,14 +11,3 @@ members = [
     "testsuite/minitest/macros",
     "xtask",
 ]
-
-[package.metadata.docs.rs]
-targets = [
-    "thumbv8m.main-none-eabihf",
-    "thumbv6m-none-eabi",
-    "thumbv7em-none-eabi",
-    "thumbv7em-none-eabihf",
-    "thumbv7m-none-eabi",
-    "thumbv8m.base-none-eabi",
-    "thumbv8m.main-none-eabi"
-]

README.md

@@ -1,27 +1,23 @@
-[![crates.io](https://img.shields.io/crates/d/cortex-m.svg)](https://crates.io/crates/cortex-m)
-[![crates.io](https://img.shields.io/crates/v/cortex-m.svg)](https://crates.io/crates/cortex-m)
+# Cortex-M crates
 
-# `cortex-m`
+This repository contains various crates useful for writing Rust programs
+on Cortex-M microcontrollers:
 
-> Low level access to Cortex-M processors
+* [`cortex-m`]: CPU peripheral access and intrinsics
+* [`cortex-m-rt`]: Startup code and interrupt handling
+* [`cortex-m-semihosting`]: Support for semihosting debugging
+* [`cortex-m-interrupt-number`]: Shared trait for interacting with peripheral access crates
+* [`panic-itm`]: Panic handler that sends messages over the ITM/SWO output
+* [`panic-semihosting`]: Panic handler that sends messages over semihosting
 
-This project is developed and maintained by the [Cortex-M team][team].
-
-## [Documentation](https://docs.rs/crate/cortex-m)
-
-## Minimum Supported Rust Version (MSRV)
-
-This crate is guaranteed to compile on stable Rust 1.59 and up. It might compile with older versions but that may change in any new patch release.
+[`cortex-m`]: https://crates.io/crates/cortex-m
+[`cortex-m-rt`]: https://crates.io/crates/cortex-m-rt
+[`cortex-m-semihosting`]: https://crates.io/crates/cortex-m-semihosting
+[`cortex-m-interrupt-number`]: https://crates.io/crates/cortex-m-interrupt-number
+[`panic-itm`]: https://crates.io/crates/panic-itm
+[`panic-semihosting`]: https://crates.io/crates/panic-semihosting
 
-## License
-
-Licensed under either of
-
-- Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or
-  http://www.apache.org/licenses/LICENSE-2.0)
-- MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
-
-at your option.
+This project is developed and maintained by the [Cortex-M team][team].
 
 ### Contribution
 
@@ -31,9 +27,9 @@ additional terms or conditions.
 
 ## Code of Conduct
 
-Contribution to this crate is organized under the terms of the [Rust Code of
-Conduct][CoC], the maintainer of this crate, the [Cortex-M team][team], promises
-to intervene to uphold that code of conduct.
+Contribution to this repository is organized under the terms of the [Rust Code
+of Conduct][CoC], the maintainer of this crate, the [Cortex-M team][team],
+promises to intervene to uphold that code of conduct.
 
 [CoC]: CODE_OF_CONDUCT.md
 [team]: https://github.com/rust-embedded/wg#the-cortex-m-team

cortex-m-rt/Cargo.toml

@@ -22,7 +22,7 @@ rust-version = "1.59"
 cortex-m-rt-macros = { path = "macros", version = "=0.7.0" }
 
 [dev-dependencies]
-cortex-m = { version = "0.7.4", path = ".." }
+cortex-m = { version = "0.7.4", path = "../cortex-m" }
 panic-halt = "0.2.0"
 cortex-m-semihosting = { path = "../cortex-m-semihosting" }
 

cortex-m-semihosting/Cargo.toml

@@ -20,5 +20,5 @@ jlink-quirks = []
 no-semihosting = []
 
 [dependencies]
-cortex-m = { path = "..", version = ">= 0.5.8, < 0.8" }
+cortex-m = { path = "../cortex-m", version = ">= 0.5.8, < 0.8" }
 critical-section = "1.0.0"