Skip to content

Commit b50c3c7

Browse files
authored
Enable measurement handoff on all production boards (#2192)
Follow-up to #2138 This PR enables the measurement token handoff on remaining Oxide boards: - Gimlet (except rev B) - Sidecar - PSC - Cosmo See the PR comments for an exhaustive testing log!
1 parent 8ac42b9 commit b50c3c7

File tree

9 files changed

+22
-4
lines changed

9 files changed

+22
-4
lines changed

app/cosmo/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ version = "0.1.0"
77
[features]
88
traptrace = ["ringbuf"]
99
dump = ["kern/dump"]
10+
measurement-handoff = ["drv-stm32h7-startup/measurement-handoff"]
1011

1112
[dependencies]
1213
cortex-m = { workspace = true }

app/cosmo/base.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ fwid = true
77
[kernel]
88
name = "cosmo"
99
requires = {flash = 32768, ram = 8192}
10-
features = ["dump"]
10+
features = ["dump", "measurement-handoff"]
11+
extern-regions = ["dtcm"]
1112

1213
[mmio]
1314
peripheral-region = "fmc_nor_psram_bank_1"

app/gimlet/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ version = "0.1.0"
77
[features]
88
traptrace = ["ringbuf"]
99
dump = ["kern/dump"]
10+
measurement-handoff = ["drv-stm32h7-startup/measurement-handoff"]
1011

1112
[dependencies]
1213
cortex-m = { workspace = true }

app/gimlet/rev-c.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,10 @@
22
name = "gimlet-c"
33
board = "gimlet-c"
44

5-
# Rev C is mostly identical to Rev B, but with a new name and board
5+
# Rev C is mostly identical to Rev B, but with a new name and board. It also
6+
# supports measurement token handoff between the RoT and SP.
67
inherit = "rev-b.toml"
8+
9+
[kernel]
10+
features = ["measurement-handoff"]
11+
extern-regions = ["dtcm"]

app/gimlet/rev-d.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ name = "gimlet-d"
66
board = "gimlet-d"
77
inherit = "base.toml"
88

9+
# Rev D supports measurement token handoff. Rev B does not, so we can't put
10+
# this into `base.toml`; subsequent revisions inherit from `rev-d.toml`
11+
[kernel]
12+
features = ["measurement-handoff"]
13+
extern-regions = ["dtcm"]
14+
915
################################################################################
1016
#
1117
# I2C2: Front/M.2 bus

app/psc/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ version = "0.1.0"
66

77
[features]
88
dump = ["kern/dump"]
9+
measurement-handoff = ["drv-stm32h7-startup/measurement-handoff"]
910

1011
[dependencies]
1112
cfg-if = { workspace = true }

app/psc/base.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ fwid = true
77
[kernel]
88
name = "psc"
99
requires = {flash = 32868, ram = 6000}
10-
features = ["dump"]
10+
features = ["dump", "measurement-handoff"]
11+
extern-regions = ["dtcm"]
1112

1213
[caboose]
1314
tasks = ["control_plane_agent"]

app/sidecar/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ version = "0.1.0"
66

77
[features]
88
dump = ["kern/dump"]
9+
measurement-handoff = ["drv-stm32h7-startup/measurement-handoff"]
910

1011
[dependencies]
1112
cortex-m = { workspace = true }

app/sidecar/base.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ fwid = true
77
[kernel]
88
name = "sidecar"
99
requires = {flash = 26656, ram = 6256}
10-
features = ["dump"]
10+
features = ["dump", "measurement-handoff"]
11+
extern-regions = ["dtcm"]
1112

1213
[caboose]
1314
tasks = ["control_plane_agent"]

0 commit comments

Comments
 (0)