Updating version numbers for 1.1.0 release (#1616)

chipsalliance · Jul 19, 2024 · 089266b · 089266b
1 parent ce77388
commit 089266b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/FROZEN_IMAGES.sha384sum b/FROZEN_IMAGES.sha384sum
@@ -1,3 +1,3 @@
 # WARNING: Do not update this file without the approval of the Caliptra TAC
-ca4d2be5df52a49d82977137f71c78f2f6bf6c729a598318facd8f79a50afae04c891f069eda09d876104e0245eded6a  caliptra-rom-no-log.bin
-3ff98efa06830875c2762ec5292839144c7425afced32951eae537b0b5dea69c288051ecbc93649c1972e571f98c5d46  caliptra-rom-with-log.bin
+c34775cd25fa7d601b6eba2d53a22ac880acfb619db0249f9aa540b8d015422b126b5bdf24af71bee0c0a838cdbcdd87  caliptra-rom-no-log.bin
+43b02b420fcd8c0f220dd3f1dc32ca47034afbea08ac27ac66582b5ddf984af7b17f98d239fa367ad3910f8ad37a0a58  caliptra-rom-with-log.bin
diff --git a/builder/src/version.rs b/builder/src/version.rs
@@ -1,11 +1,11 @@
 // Licensed under the Apache-2.0 license
 
 pub const ROM_VERSION_MAJOR: u16 = 1;
-pub const ROM_VERSION_MINOR: u16 = 0;
-pub const ROM_VERSION_PATCH: u16 = 1;
+pub const ROM_VERSION_MINOR: u16 = 1;
+pub const ROM_VERSION_PATCH: u16 = 0;
 
 pub const FMC_VERSION_MAJOR: u16 = 1;
-pub const FMC_VERSION_MINOR: u16 = 0;
+pub const FMC_VERSION_MINOR: u16 = 1;
 pub const FMC_VERSION_PATCH: u16 = 0;
 
 pub const RUNTIME_VERSION_MAJOR: u32 = 1;

diff --git a/test/tests/fips_test_suite/common.rs b/test/tests/fips_test_suite/common.rs
@@ -49,7 +49,13 @@ const ROM_EXP_1_0_1: RomExpVals = RomExpVals {
         0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1,
     ],
 };
-const ROM_EXP_CURRENT: RomExpVals = RomExpVals { ..ROM_EXP_1_0_1 };
+
+const ROM_EXP_1_1_0: RomExpVals = RomExpVals {
+    rom_version: 0x840, // 1.1.0
+    ..ROM_EXP_1_0_1
+};
+
+const ROM_EXP_CURRENT: RomExpVals = RomExpVals { ..ROM_EXP_1_1_0 };
 
 // ===  RUNTIME  ===
 pub struct RtExpVals {
@@ -62,11 +68,13 @@ const RT_EXP_1_0_0: RtExpVals = RtExpVals {
     fw_version: 0x0100_0000, // 1.0.0
 };
 
-const RT_EXP_CURRENT: RtExpVals = RtExpVals {
+const RT_EXP_1_1_0: RtExpVals = RtExpVals {
+    fmc_version: 0x840,      // 1.1.0
     fw_version: 0x0101_0000, // 1.1.0
-    ..RT_EXP_1_0_0
 };
 
+const RT_EXP_CURRENT: RtExpVals = RtExpVals { ..RT_EXP_1_1_0 };
+
 // === Getter implementations ===
 // TODO: These could be improved
 //       Can we generate a var name from a str in rust and check if it exists?