Skip to content

Commit

Permalink
Rpi baremetal pause menu
Browse files Browse the repository at this point in the history
* Add pause menu for baremetal rpi
* Add BCM power peripheral
* Use cross main image - cross-rs/cross#1320
* Replace the rpi features flags with compile env var
  • Loading branch information
alloncm committed Sep 2, 2023
1 parent d8e1e25 commit 116abff
Show file tree
Hide file tree
Showing 25 changed files with 504 additions and 258 deletions.
136 changes: 91 additions & 45 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ members = [
]

[workspace.package]
version = "3.0.2"
version = "4.0.0"
authors = ["alloncm <[email protected]>"]
rust-version = "1.65" # cause of let else feature
rust-version = "1.70" # cause of once cell
4 changes: 3 additions & 1 deletion Cross.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@

[target.armv7-unknown-linux-gnueabihf]
# Using the main image cause I had problems with the image if version 0.2.5, when 0.3.0 will be released this should sort out
# see - https://github.com/cross-rs/cross/issues/1320
image = "ghcr.io/cross-rs/armv7-unknown-linux-gnueabihf:main"
pre-build = [
"echo deb http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi >> /etc/apt/sources.list",
"touch /etc/apt/sources.list.d/raspi.list",
Expand Down
2 changes: 1 addition & 1 deletion Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ dependencies = ["build_rpi_baremetal","install_llvm_tools"]
toolchain = "nightly"
cwd = "./rpi/"
command = "cargo"
args = ["build", "--release", "--target", "armv7a-none-eabihf","--package", "magenboy_rpi", "--bin", "baremetal", "-Z", "build-std=core", "--no-default-features", "--features", "rpi4"]
args = ["build", "--release", "--target", "armv7a-none-eabihf","--package", "magenboy_rpi", "--bin", "baremetal", "-Z", "build-std=core"]
dependencies = ["install_rust_src"]

[tasks.install_llvm_tools]
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ cargo build --release --package magenboy_sdl --features [optional_features]
Edit the relevant settings in `configuration.rs` install [`arm-none-eabi-gcc`](https://developer.arm.com/downloads/-/gnu-rm) and then run:

```sh
cargo make rpibm
cargo make -e [rpi_revision] rpibm
```

This command will do the folowing:
Expand Down
98 changes: 0 additions & 98 deletions common/src/emulation_menu.rs

This file was deleted.

Loading

0 comments on commit 116abff

Please sign in to comment.