Skip to content

Commit 965d63d

Browse files
authored
Merge branch 'master' into james/debug-disk
2 parents a60462d + 6e93059 commit 965d63d

19 files changed

Lines changed: 361 additions & 299 deletions

File tree

Cargo.lock

Lines changed: 23 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/cosmo/base.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ notifications = ["i2c1-irq", "i2c2-irq", "i2c3-irq", "i2c4-irq"]
132132
[tasks.packrat]
133133
name = "task-packrat"
134134
priority = 1
135-
stacksize = 1400
135+
stacksize = 1496
136136
start = true
137137
task-slots = ["jefe"]
138138
features = ["cosmo", "ereport"]
@@ -259,7 +259,7 @@ uses = ["usart6", "dbgmcu"]
259259
interrupts = {"usart6.irq" = "usart-irq"}
260260
priority = 9
261261
max-sizes = {flash = 74000, ram = 65536}
262-
stacksize = 5400
262+
stacksize = 7632
263263
start = true
264264
task-slots = ["sys", { cpu_seq = "cosmo_seq" }, "hf", "control_plane_agent", "net", "packrat", "i2c_driver", { spi_driver = "spi2_driver" }, "sprot", "auxflash"]
265265
notifications = ["jefe-state-change", "usart-irq", "multitimer", "control-plane-agent"]
@@ -385,6 +385,7 @@ start = true
385385
notifications = ["jefe-state-change", "timer"]
386386
task-slots = ["jefe", "spartan7_loader", "packrat", "sensor"]
387387
uses = ["mmio_dimms"]
388+
stacksize = 904
388389

389390
[tasks.auxflash]
390391
name = "drv-auxflash-server"

app/gimlet/base.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ notifications = ["i2c1-irq", "jefe-state-change"]
125125
[tasks.packrat]
126126
name = "task-packrat"
127127
priority = 1
128-
stacksize = 1400
128+
stacksize = 1496
129129
start = true
130130
task-slots = ["jefe"]
131131
features = ["gimlet", "ereport"]
@@ -166,7 +166,7 @@ name = "drv-gimlet-seq-server"
166166
features = ["h753"]
167167
priority = 4
168168
max-sizes = {flash = 131072, ram = 16384 }
169-
stacksize = 2600
169+
stacksize = 2792
170170
start = true
171171
task-slots = ["sys", "i2c_driver", {spi_driver = "spi2_driver"}, "hf", "jefe", "packrat"]
172172
notifications = ["timer", "vcore"]
@@ -244,7 +244,7 @@ uses = ["uart7", "dbgmcu"]
244244
interrupts = {"uart7.irq" = "usart-irq"}
245245
priority = 8
246246
max-sizes = {flash = 72000, ram = 65536}
247-
stacksize = 5376
247+
stacksize = 7280
248248
start = true
249249
task-slots = ["sys", { cpu_seq = "gimlet_seq" }, "hf", "control_plane_agent", "net", "packrat", "i2c_driver", { spi_driver = "spi2_driver" }, "sprot"]
250250
notifications = ["jefe-state-change", "usart-irq", "multitimer", "control-plane-agent"]

app/gimletlet/app.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ name = "task-packrat"
5252
priority = 1
5353
start = true
5454
task-slots = ["jefe"]
55-
stacksize = 1400
55+
stacksize = 1480
5656
features = ["ereport"]
5757
notifications = ["task-faulted"]
5858

app/grapefruit/base.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ start = true
111111
# task-slots is explicitly empty: packrat should not send IPCs!
112112
task-slots = []
113113
features = ["grapefruit", "boot-kmdb"]
114+
stacksize = 1496
114115

115116
[tasks.hiffy]
116117
name = "task-hiffy"

app/grapefruit/standalone.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ interrupts = {"uart8.irq" = "usart-irq"}
1111

1212
# Ereport stuff
1313
[tasks.packrat]
14-
stacksize = 1400
14+
stacksize = 1496
1515
task-slots = ["jefe"]
1616
features = ["ereport"]
1717
notifications = ["task-faulted"]

app/observer/base.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ notifications = ["i2c2-irq", "i2c3-irq", "i2c4-irq"]
120120
[tasks.packrat]
121121
name = "task-packrat"
122122
priority = 1
123-
stacksize = 1400
123+
stacksize = 1480
124124
start = true
125125
task-slots = ["jefe"]
126126
features = ["ereport"]

app/psc/base.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ notifications = ["i2c2-irq", "i2c3-irq"]
121121
[tasks.packrat]
122122
name = "task-packrat"
123123
priority = 1
124-
stacksize = 1400
124+
stacksize = 1480
125125
start = true
126126
task-slots = ["jefe"]
127127
features = ["ereport"]

app/sidecar/base.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ notifications = ["timer"]
272272
[tasks.packrat]
273273
name = "task-packrat"
274274
priority = 1
275-
stacksize = 1400
275+
stacksize = 1480
276276
start = true
277277
task-slots = ["jefe"]
278278
features = ["ereport"]

build/elf/Cargo.toml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[package]
2+
name = "build-elf"
3+
version = "0.1.0"
4+
edition = "2024"
5+
6+
[dependencies]
7+
anyhow = { workspace = true }
8+
goblin = { workspace = true }
9+
scroll = { workspace = true }
10+
11+
[lints]
12+
workspace = true

0 commit comments

Comments
 (0)