Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating ROM version to 1.2.0 #1818

Merged
merged 1 commit into from
Dec 2, 2024
Merged

Updating ROM version to 1.2.0 #1818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions FROZEN_IMAGES.sha384sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# WARNING: Do not update this file without the approval of the Caliptra TAC
129ee84ecdc1f80a9aab51883589b4eb80191bc726277fb31fab2bb2e99f54b3ad7dc80459914c9cd9749e5994614ccd caliptra-rom-no-log.bin
162eb324937462a1534406d43b9ba74b229d9347541f148eebc435f901e839e4c95af308f91b873f0bc67124cf35ecc1 caliptra-rom-with-log.bin
df4a72ee4a88d12d7216f8d23c6567b479694dec959e7332d69094098d312ea2dbf35de1117db156635ad41a78bf3c14 caliptra-rom-no-log.bin
02db1204eea812bee28904ce877ec7604746169fa7bfa82471cf10af239852466c1a16b2d5b3b9ad26b4ccfe2ca0a1b5 caliptra-rom-with-log.bin
2 changes: 1 addition & 1 deletion builder/src/version.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Licensed under the Apache-2.0 license

pub const ROM_VERSION_MAJOR: u16 = 1;
pub const ROM_VERSION_MINOR: u16 = 1;
pub const ROM_VERSION_MINOR: u16 = 2;
pub const ROM_VERSION_PATCH: u16 = 0;

pub const FMC_VERSION_MAJOR: u16 = 1;
Expand Down
7 changes: 6 additions & 1 deletion test/tests/fips_test_suite/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,12 @@ const ROM_EXP_1_1_0: RomExpVals = RomExpVals {
..ROM_EXP_1_0_3
};

const ROM_EXP_CURRENT: RomExpVals = RomExpVals { ..ROM_EXP_1_1_0 };
const ROM_EXP_1_2_0: RomExpVals = RomExpVals {
rom_version: 0x880, // 1.2.0
..ROM_EXP_1_1_0
};

const ROM_EXP_CURRENT: RomExpVals = RomExpVals { ..ROM_EXP_1_2_0 };

// === RUNTIME ===
pub struct RtExpVals {
Expand Down
Loading