Skip to content

Commit

Permalink
Bring build instructions up to date- remove references to Xargo.
Browse files Browse the repository at this point in the history
  • Loading branch information
cr1901 committed Sep 20, 2020
1 parent e27d0b5 commit cee9e9a
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .cargo/config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[target.msp430-none-elf]
# Upload firmware and start a GDB session with "xargo run".
# Upload firmware and start a GDB session with "cargo run".
runner = "msp430-elf-gdb -q -x mspdebug.gdb"

rustflags = [
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ features = ["rt"]
# version = "1.2.0"
# default_features = false

# Required for `xargo fix` to work!
# Required for `cargo fix` to work!
[[bin]]
name = "{{project-name}}"
test = false
Expand Down
18 changes: 4 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,6 @@ This project is developed and maintained by the [MSP430 team][team].

- The `cargo generate` subcommand ([Installation instructions](https://github.com/ashleygwilliams/cargo-generate#installation)).

- The [`xargo`](https://github.com/japaric/xargo) sysroot manager.
`xargo` is required until MSP430's `libcore` is part of Rust CI). To
install, run:
``` console
$ cargo install xargo
$ rustup component add rust-src
```

- TI's [MSP430 GCC Compiler](http://www.ti.com/tool/MSP430-GCC-OPENSOURCE),
version 8.3.0 or greater. `msp430-elf-gcc` should be visible on the path.

Expand Down Expand Up @@ -124,16 +116,14 @@ This project is developed and maintained by the [MSP430 team][team].

5. Build the template application or one of the examples. If building
`timer-oncecell`, don't forget to uncomment the `once_cell` dependency in
`Cargo.toml`!
`Cargo.toml`! Some examples (such as `timer`) may not compile due to size
constraints when building using the `dev` profile (the default).

``` console
$ xargo build
$ xargo build --examples
$ cargo build -Zbuild-std=core
$ cargo build -Zbuild-std=core --examples
```

`Xargo.toml` is set up properly for nearly all use cases and need not be
modified.

# License

Licensed under either of
Expand Down
9 changes: 0 additions & 9 deletions Xargo.toml

This file was deleted.

0 comments on commit cee9e9a

Please sign in to comment.