Skip to content

Commit ff04d42

Browse files
authored
Add control-plane-agent and host-sp-comms to Grapefruit (#1898)
- 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`
1 parent f432ac5 commit ff04d42

File tree

48 files changed

+460
-261
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+460
-261
lines changed

Cargo.lock

+111-65
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ vcell = { version = "0.1.2", default-features = false }
118118
walkdir = { version = "2.0.0", default-features = false }
119119
zerocopy = { version = "0.6.1", default-features = false }
120120
zeroize = { version = "1.5.7", default-features = false, features = ["zeroize_derive"] }
121-
zip = { version = "0.6", default-features = false, features = ["bzip2"] }
121+
zip = { version = "0.6", default-features = false, features = ["bzip2", "deflate", "zstd"] }
122122

123123
# Oxide forks and repos
124124
attest-data = { git = "https://github.com/oxidecomputer/dice-util", default-features = false, version = "0.4.0" }

app/gimlet/base.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ priority = 7
234234
max-sizes = {flash = 65536, ram = 65536}
235235
stacksize = 5080
236236
start = true
237-
task-slots = ["sys", "gimlet_seq", "hf", "control_plane_agent", "net", "packrat", "i2c_driver", { spi_driver = "spi2_driver" }, "sprot"]
237+
task-slots = ["sys", { cpu_seq = "gimlet_seq" }, "hf", "control_plane_agent", "net", "packrat", "i2c_driver", { spi_driver = "spi2_driver" }, "sprot"]
238238
notifications = ["jefe-state-change", "usart-irq", "multitimer", "control-plane-agent"]
239239

240240
[tasks.udpecho]
@@ -271,7 +271,7 @@ task-slots = [
271271
"update_server",
272272
"sys",
273273
"hf",
274-
"gimlet_seq",
274+
{ cpu_seq = "gimlet_seq" },
275275
"validate",
276276
"sensor",
277277
"sprot",

0 commit comments

Comments
 (0)