Merge branch 'master' into chore/userlib-namespace-imports

Author: aapoalas

Cargo.lock

@@ -118,7 +118,7 @@ zeroize = { version = "1.5.7", default-features = false, features = ["zeroize_de
 zip = { version = "0.6", default-features = false, features = ["bzip2"] }
 
 # Oxide forks and repos
-attest-data = { git = "https://github.com/oxidecomputer/dice-util", default-features = false, version = "0.2.0" }
+attest-data = { git = "https://github.com/oxidecomputer/dice-util", default-features = false, version = "0.3.0" }
 dice-mfg-msgs = { git = "https://github.com/oxidecomputer/dice-util", default-features = false, version = "0.2.1" }
 gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", default-features = false, features = ["smoltcp"] }
 gimlet-inspector-protocol = { git = "https://github.com/oxidecomputer/gimlet-inspector-protocol", version = "0.1.0" }

Cargo.toml

@@ -1,3 +1,4 @@
+# This is the production image. We expect `name` to match `board`
 name = "gimlet-b"
 board = "gimlet-b"
 inherit = "base.toml"

app/gimlet/rev-b.toml

@@ -1,3 +1,4 @@
+# This is the production image. We expect `name` to match `board`
 name = "gimlet-c"
 board = "gimlet-c"
 

app/gimlet/rev-c.toml

@@ -1,5 +1,7 @@
 # The rev D hardware includes `nreset` lines on all I2C muxes and changes the
 # M.2 device type from `m2_hp_only` to `nvme_bmc` (after a hardware fix).
+#
+# This is the production image. We expect `name` to match `board`
 name = "gimlet-d"
 board = "gimlet-d"
 inherit = "base.toml"

app/gimlet/rev-d.toml

@@ -1,3 +1,4 @@
+# This is the production image. We expect `name` to match `board`
 name = "gimlet-e"
 board = "gimlet-e"
 

app/gimlet/rev-e.toml

@@ -1,3 +1,4 @@
+# This is the production image. We expect `name` to match `board`
 name = "gimlet-f"
 board = "gimlet-f"
 

app/gimlet/rev-f.toml

@@ -141,7 +141,7 @@ extern-regions = ["sram2"]
 [tasks.attest]
 name = "task-attest"
 priority = 5
-max-sizes = {flash = 33904, ram = 16384}
+max-sizes = {flash = 35072, ram = 16384}
 stacksize = 12304
 start = true
 extern-regions = ["dice_alias", "dice_certs"]

app/lpc55xpresso/app.toml

@@ -160,7 +160,7 @@ binary_path = "../../target/gimlet-c/dist/default/final.bin"
 [tasks.attest]
 name = "task-attest"
 priority = 5
-max-sizes = {flash = 33904, ram = 16384}
+max-sizes = {flash = 35072, ram = 16384}
 stacksize = 12304
 start = true
 extern-regions = ["dice_alias", "dice_certs"]

app/oxide-rot-1/app-dev.toml

@@ -1,3 +1,4 @@
+# This is the production image. We expect `name` to match `board`
 name = "oxide-rot-1"
 target = "thumbv8m.main-none-eabihf"
 board = "oxide-rot-1"
@@ -136,7 +137,7 @@ task-slots = ["swd"]
 [tasks.attest]
 name = "task-attest"
 priority = 5
-max-sizes = {flash = 33904, ram = 16384}
+max-sizes = {flash = 35400, ram = 16384}
 stacksize = 12304
 start = true
 extern-regions = ["dice_alias", "dice_certs"]