Skip to content

Commit

Permalink
Add control-plane-agent and host-sp-comms to Grapefruit (#1898)
Browse files Browse the repository at this point in the history
- Rename `gimlet_seq` to `cpu_seq` in Idol and API crates, and use it
  for both Gimlet and Grapefruit
  - Remove fan power control APIs, which are seemingly unused
- Update `grapefruit-seq-server` to do mock power control, like
  `mock-gimlet-seq-server`
- Rename the `gimlet` BSP in `control-plane-agent` to `cpu-sled`, and
  use it for both Gimlet and Cosmo
- Add `usart6` support to `host-sp-comms`, since that's what Grapefruit
  uses
- Add `host-sp-comms`, `control-plane-agent`, and
  `stm32h7-update-server` to `grapefruit/app.toml`
- Initial Grapefruit / Cosmo inventory support in `control-plane-agent`
  and `host-sp-comms`
  • Loading branch information
mkeeter authored Oct 11, 2024
1 parent f432ac5 commit ff04d42
Show file tree
Hide file tree
Showing 48 changed files with 460 additions and 261 deletions.
176 changes: 111 additions & 65 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ vcell = { version = "0.1.2", default-features = false }
walkdir = { version = "2.0.0", default-features = false }
zerocopy = { version = "0.6.1", default-features = false }
zeroize = { version = "1.5.7", default-features = false, features = ["zeroize_derive"] }
zip = { version = "0.6", default-features = false, features = ["bzip2"] }
zip = { version = "0.6", default-features = false, features = ["bzip2", "deflate", "zstd"] }

# Oxide forks and repos
attest-data = { git = "https://github.com/oxidecomputer/dice-util", default-features = false, version = "0.4.0" }
Expand Down
4 changes: 2 additions & 2 deletions app/gimlet/base.toml
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ priority = 7
max-sizes = {flash = 65536, ram = 65536}
stacksize = 5080
start = true
task-slots = ["sys", "gimlet_seq", "hf", "control_plane_agent", "net", "packrat", "i2c_driver", { spi_driver = "spi2_driver" }, "sprot"]
task-slots = ["sys", { cpu_seq = "gimlet_seq" }, "hf", "control_plane_agent", "net", "packrat", "i2c_driver", { spi_driver = "spi2_driver" }, "sprot"]
notifications = ["jefe-state-change", "usart-irq", "multitimer", "control-plane-agent"]

[tasks.udpecho]
Expand Down Expand Up @@ -271,7 +271,7 @@ task-slots = [
"update_server",
"sys",
"hf",
"gimlet_seq",
{ cpu_seq = "gimlet_seq" },
"validate",
"sensor",
"sprot",
Expand Down
Loading

0 comments on commit ff04d42

Please sign in to comment.