Skip to content

Commit 8e820c1

Browse files
committed
temporarily set rot-carrier epoch to 1
1 parent 08e0ae8 commit 8e820c1

File tree

9 files changed

+19
-44
lines changed

9 files changed

+19
-44
lines changed

Cargo.lock

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

app/lpc55xpresso/app-sprot.toml

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ chip = "../../chips/lpc55"
1313
stacksize = 1024
1414
image-names = ["a", "b"]
1515
fwid = true
16+
epoch = 0
1617

1718
[kernel]
1819
name = "lpc55xpresso"

app/lpc55xpresso/app.toml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ chip = "../../chips/lpc55"
55
stacksize = 1024
66
image-names = ["a", "b"]
77
fwid = true
8+
epoch = 0
89

910
[kernel]
1011
name = "lpc55xpresso"

app/medusa/base.toml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ chip = "../../chips/stm32h7"
33
memory = "memory-large.toml"
44
stacksize = 896
55
fwid = true
6+
epoch = 0
67

78
[kernel]
89
name = "medusa"

app/oxide-rot-1/app.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ board = "oxide-rot-1"
44
chip = "../../chips/lpc55"
55
stacksize = 1024
66
image-names = ["a", "b"]
7-
epoch = 1
7+
epoch = 0
88
version = 0
99
fwid = true
1010

app/psc/base.toml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ chip = "../../chips/stm32h7"
33
memory = "memory-large.toml"
44
stacksize = 896
55
fwid = true
6+
epoch = 0
67

78
[kernel]
89
name = "psc"

app/rot-carrier/app.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ board = "rot-carrier-2"
44
chip = "../../chips/lpc55"
55
stacksize = 1024
66
image-names = ["a", "b"]
7-
epoch = 3
7+
# TODO: reset epoch to zero before merge
8+
epoch = 1
89
version = 0
910
fwid = true
1011

app/sidecar/base.toml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ chip = "../../chips/stm32h7"
33
stacksize = 896
44
memory = "memory-large.toml"
55
fwid = true
6+
epoch = 0
67

78
[kernel]
89
name = "sidecar"

build/xtask/src/dist.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,10 @@ pub fn package(
611611
// The Git hash is included in the default caboose under the key
612612
// `GITC`, so we don't include it in the pseudo-version.
613613
archive
614-
.write_default_caboose(None, Some(&cfg.toml.epoch.to_string()))
614+
.write_default_caboose(
615+
None,
616+
Some(&cfg.toml.epoch.to_string()),
617+
)
615618
.context("writing caboose into archive")?;
616619
archive.overwrite().context("overwriting archive")?;
617620
}

0 commit comments

Comments
 (0)