refactor(core): move embedded bootloaders and their hashes to model folders

[no changelog]

core/SConscript.firmware

@@ -912,7 +912,7 @@ if TREZOR_MODEL not in ('DISC1', 'DISC2'):
             env,
             'bootloader',
             'embed/firmware/bootloaders/bootloader.o',
-            f'embed/firmware/bootloaders/bootloader_{BOOTLOADER_SUFFIX}.bin',
+            f'embed/models/{MODEL_IDENTIFIER}/bootloaders/bootloader_{BOOTLOADER_SUFFIX}.bin',
             )
 
 

core/embed/firmware/bl_check.c

@@ -34,79 +34,13 @@ extern const void
 extern const void
     _binary_embed_firmware_bootloaders_bootloader_bin_deflated_size;
 
-/*
-static secbool known_bootloader(const uint8_t *hash, int len) {
-    if (len != 32) return secfalse;
-    // bootloader-2.0.1.bin (padded with 0x00)
-    if (0 == memcmp(hash,
-"\x91\x37\x46\xd0\x2d\xa7\xc4\xbe\x1d\xae\xef\xb0\x9b\x4e\x31\x88\xed\x38\x23\x5e\x0e\x31\xa7\x8c\x01\xde\x4e\xcc\xc2\xd6\x36\xb3",
-32)) return sectrue;
-    // bootloader-2.0.1.bin (padded with 0xff)
-    if (0 == memcmp(hash,
-"\x2f\xdb\xde\x94\x0a\xd8\x91\x1c\xbd\x07\xb0\xba\x06\x2c\x90\x84\x02\xec\x95\x19\xde\x52\x8d\x4b\xe9\xb9\xed\x30\x71\x91\xb4\xd3",
-32)) return sectrue;
-    // bootloader-2.0.2.bin (padded with 0x00)
-    if (0 == memcmp(hash,
-"\x2e\xf7\x47\xf8\x49\x87\x1e\xc8\xc6\x01\x35\xd6\x32\xe5\x5a\xd1\x56\x18\xf8\x64\x87\xb7\xaa\x7c\x62\x0e\xc3\x0d\x25\x69\x4e\x18",
-32)) return sectrue;
-    // bootloader-2.0.2.bin (padded with 0xff)
-    if (0 == memcmp(hash,
-"\xcc\x6b\x35\xc3\x8f\x29\x5c\xbd\x7d\x31\x69\xaf\xae\xf1\x61\x01\xef\xbe\x9f\x3b\x0a\xfd\xc5\x91\x70\x9b\xf5\xa0\xd5\xa4\xc5\xe0",
-32)) return sectrue;
-    // bootloader-2.0.3.bin (padded with 0x00)
-    if (0 == memcmp(hash,
-"\xb1\x83\xd3\x31\xc7\xff\x3d\xcf\x54\x1e\x7e\x40\xf4\x9e\xc3\x53\x4c\xcc\xf3\x8c\x35\x39\x88\x81\x65\xc0\x5c\x25\xbd\xfc\xea\x14",
-32)) return sectrue;
-    // bootloader-2.0.3.bin (padded with 0xff)
-    if (0 == memcmp(hash,
-"\xab\xdb\x7d\xe2\xef\x44\x66\xa7\xb7\x1f\x2b\x02\xf3\xe1\x40\xe7\xcd\xf2\x8e\xc0\xbb\x33\x04\xce\x0d\xa5\xca\x02\x57\xb6\xd4\x30",
-32)) return sectrue; return secfalse;
-}
-*/
-
-// clang-format off
-// --- BEGIN GENERATED BOOTLOADER SECTION ---
-// bootloader_1.bin version <unknown>
-#define BOOTLOADER_1_00 {0xa5, 0x5a, 0x8b, 0x88, 0x94, 0x8a, 0x33, 0x2b, 0xed, 0x0d, 0xd9, 0x5c, 0x79, 0xd5, 0xbe, 0x0c, 0x73, 0x52, 0xaa, 0xac, 0xb3, 0x4f, 0xea, 0xd0, 0xaa, 0x88, 0x33, 0x23, 0x64, 0xab, 0x77, 0x5a}
-#define BOOTLOADER_1_FF {0x50, 0x6c, 0x5f, 0xd3, 0x73, 0x7b, 0x9b, 0xb7, 0xb9, 0xbf, 0xf9, 0xfa, 0xc6, 0xb9, 0x43, 0x27, 0x8b, 0x06, 0xad, 0x3a, 0xec, 0xce, 0x35, 0xa3, 0x52, 0xc3, 0x6e, 0x9e, 0x9a, 0xb3, 0x50, 0x98}
-// bootloader_T1B1.bin version <unknown>
-#define BOOTLOADER_T1B1_00 {0xc1, 0x01, 0xd3, 0x8a, 0x00, 0x5e, 0x4f, 0x5f, 0x87, 0x1f, 0x49, 0x78, 0x24, 0x9c, 0xf9, 0x82, 0xd1, 0x91, 0x4b, 0xa6, 0x90, 0x03, 0x9c, 0x50, 0x49, 0x61, 0x10, 0x4f, 0xee, 0xe7, 0x1d, 0x7b}
-#define BOOTLOADER_T1B1_FF {0xbd, 0xb2, 0xf7, 0x62, 0xfb, 0x10, 0xbb, 0x30, 0x1f, 0x95, 0xa3, 0x12, 0x6b, 0x41, 0x1f, 0x66, 0xfc, 0x57, 0x28, 0xce, 0x7f, 0x59, 0x42, 0x6c, 0x3e, 0xed, 0xf7, 0x69, 0xbb, 0x96, 0xbd, 0x4b}
-// bootloader_T2B1.bin version 2.1.4.0
-#define BOOTLOADER_T2B1_00 {0x12, 0xf5, 0x51, 0x01, 0x10, 0xb3, 0x59, 0x8e, 0x73, 0x95, 0xa9, 0xa8, 0xc5, 0xbc, 0x3a, 0x53, 0xa3, 0xa8, 0xed, 0x83, 0x32, 0xc2, 0xd2, 0x5b, 0x47, 0x99, 0x27, 0x9f, 0x93, 0x8b, 0xb3, 0xd6}
-#define BOOTLOADER_T2B1_FF {0x19, 0x7c, 0x2a, 0xd1, 0xba, 0x89, 0xeb, 0x2a, 0xfc, 0xe1, 0x7b, 0xf3, 0x62, 0x7d, 0xf8, 0xb2, 0x3c, 0x70, 0x16, 0x03, 0x53, 0xad, 0x8e, 0x90, 0x9b, 0x57, 0xeb, 0x4b, 0x83, 0x4d, 0xa0, 0x34}
-// bootloader_T2B1_qa.bin version 2.1.4.0
-#define BOOTLOADER_T2B1_QA_00 {0x96, 0xe7, 0xfa, 0x21, 0x66, 0x81, 0x6b, 0x27, 0xf6, 0x27, 0xc1, 0x50, 0xaa, 0xf8, 0xbf, 0xac, 0xf5, 0x0d, 0x37, 0xea, 0x10, 0xa9, 0xa2, 0x0c, 0x1a, 0x58, 0xa7, 0x42, 0x23, 0x80, 0xbe, 0x40}
-#define BOOTLOADER_T2B1_QA_FF {0x7c, 0xca, 0xde, 0xf6, 0x8f, 0xf8, 0x9a, 0x08, 0x35, 0x0a, 0x82, 0xe4, 0xb5, 0x76, 0x37, 0x36, 0x51, 0x33, 0x40, 0xd9, 0x66, 0x84, 0xfb, 0x1b, 0x4f, 0x89, 0x34, 0xcd, 0x6f, 0x4c, 0x03, 0x1a}
-// bootloader_T2T1.bin version 2.1.4.0
-#define BOOTLOADER_T2T1_00 {0x37, 0xaf, 0xad, 0xb6, 0x55, 0x7a, 0xd3, 0x82, 0x2c, 0x7b, 0xd3, 0x41, 0x65, 0xb7, 0x4d, 0xce, 0xbe, 0x23, 0x87, 0x90, 0x93, 0x3f, 0xbc, 0x4c, 0x5a, 0x1c, 0x60, 0x8c, 0xf9, 0xf6, 0xec, 0x0c}
-#define BOOTLOADER_T2T1_FF {0x5e, 0x84, 0xd3, 0xf7, 0xfd, 0x55, 0x51, 0xfd, 0x5f, 0x22, 0xc4, 0x83, 0xe2, 0x67, 0xc5, 0x1b, 0x77, 0xce, 0x49, 0xce, 0x42, 0x19, 0xe8, 0x23, 0x84, 0x4a, 0x58, 0x47, 0xaf, 0x80, 0x69, 0x86}
-// bootloader_T2T1_qa.bin version 2.1.4.0
-#define BOOTLOADER_T2T1_QA_00 {0xff, 0xda, 0xfd, 0x0f, 0xe1, 0x89, 0x56, 0xb6, 0x0b, 0x6e, 0x2d, 0x67, 0xf1, 0x63, 0x8c, 0x4c, 0x4d, 0x6f, 0x97, 0xe7, 0xe0, 0xa4, 0xce, 0x76, 0xc9, 0x49, 0x0a, 0x34, 0x3e, 0xd8, 0xcb, 0x1f}
-#define BOOTLOADER_T2T1_QA_FF {0xbe, 0x31, 0x71, 0x7b, 0x8b, 0x31, 0x12, 0xbd, 0x58, 0xc4, 0x81, 0x09, 0x8d, 0xd9, 0x07, 0x51, 0x5c, 0xb6, 0x3d, 0x07, 0x82, 0x00, 0x30, 0x4a, 0xeb, 0x26, 0xf0, 0xe4, 0x00, 0xd4, 0xf2, 0x9c}
-// bootloader_T3B1.bin version 2.1.7.0
-#define BOOTLOADER_T3B1_00 {0x6a, 0x29, 0x58, 0x1f, 0x4f, 0x0c, 0x64, 0xd0, 0x57, 0xb3, 0x36, 0xb7, 0xca, 0xc5, 0x00, 0xc6, 0xbe, 0x87, 0x46, 0x10, 0x48, 0xb0, 0x20, 0xc5, 0xc3, 0x55, 0xaa, 0xf8, 0xec, 0x48, 0xd6, 0xa3}
-#define BOOTLOADER_T3B1_FF {0x57, 0x1e, 0xa2, 0xb8, 0x09, 0xf0, 0xab, 0xb4, 0x35, 0xb9, 0x92, 0xcd, 0xde, 0x28, 0x8a, 0xe2, 0x73, 0x04, 0x92, 0x16, 0x01, 0xac, 0x70, 0x48, 0xad, 0x1d, 0x72, 0x9e, 0x31, 0x42, 0xbf, 0x37}
-// bootloader_T3B1_qa.bin version 2.1.7.0
-#define BOOTLOADER_T3B1_QA_00 {0x2e, 0x90, 0x8a, 0x99, 0x25, 0x93, 0xcd, 0x9c, 0xf1, 0x23, 0x1e, 0x4e, 0x41, 0xfc, 0xc9, 0xf1, 0x4b, 0x06, 0x69, 0x57, 0x6e, 0x64, 0x84, 0x1c, 0xb1, 0xd9, 0x89, 0x0c, 0xa5, 0xb4, 0x38, 0xeb}
-#define BOOTLOADER_T3B1_QA_FF {0x63, 0xd2, 0x2d, 0x7b, 0xe8, 0x17, 0x2b, 0x97, 0x64, 0x06, 0x9b, 0x60, 0xa0, 0x3d, 0xfc, 0xd6, 0xea, 0x8a, 0x8d, 0xaf, 0x12, 0x25, 0x58, 0x93, 0x9e, 0x40, 0x16, 0xf2, 0x25, 0x30, 0x30, 0x6f}
-// bootloader_T3T1.bin version 2.1.6.0
-#define BOOTLOADER_T3T1_00 {0x4a, 0x07, 0x5c, 0x74, 0x0f, 0x9a, 0x84, 0x61, 0xaf, 0x10, 0x34, 0x9c, 0x24, 0x3d, 0x79, 0x5b, 0xc6, 0x12, 0x5e, 0xec, 0x51, 0xb3, 0x91, 0x4b, 0x65, 0xf9, 0x79, 0x17, 0x98, 0xc2, 0x4f, 0xcb}
-#define BOOTLOADER_T3T1_FF {0xd8, 0xee, 0x0d, 0xd8, 0x87, 0x0b, 0xf4, 0x38, 0x73, 0x52, 0x83, 0x5e, 0xa9, 0xef, 0x3e, 0x5a, 0x3e, 0x59, 0xc2, 0x12, 0x5b, 0x24, 0xc9, 0x2d, 0xd4, 0xc5, 0xf5, 0x57, 0x15, 0x8a, 0x34, 0x78}
-// bootloader_T3T1_qa.bin version 2.1.6.0
-#define BOOTLOADER_T3T1_QA_00 {0x53, 0x5f, 0xf9, 0xa8, 0x21, 0x7d, 0xb5, 0x39, 0xe4, 0xfa, 0xf8, 0x3d, 0x0d, 0xe6, 0xf3, 0x65, 0x21, 0x30, 0x46, 0x9e, 0x40, 0x85, 0xd4, 0xd8, 0x49, 0x00, 0xb0, 0xb5, 0x58, 0x39, 0xe3, 0xd4}
-#define BOOTLOADER_T3T1_QA_FF {0x1e, 0x03, 0x50, 0x25, 0xa1, 0xc7, 0x20, 0xe2, 0x04, 0x62, 0x24, 0xa1, 0x31, 0xc2, 0xf5, 0x7b, 0x35, 0xe9, 0x22, 0x42, 0x36, 0x2d, 0xab, 0xcc, 0xb6, 0x3b, 0xfe, 0x88, 0x53, 0x2f, 0x49, 0xa7}
-// --- END GENERATED BOOTLOADER SECTION ---
-
-
 #define CONCAT_NAME_HELPER(prefix, name, suffix) prefix##name##suffix
 #define CONCAT_NAME(name, var) CONCAT_NAME_HELPER(BOOTLOADER_, name, var)
 
-
 #if BOOTLOADER_QA
 // QA bootloaders
-    #define BOOTLOADER_00 CONCAT_NAME(MODEL_INTERNAL_NAME_TOKEN, _QA_00)
+#define BOOTLOADER_00 CONCAT_NAME(MODEL_INTERNAL_NAME_TOKEN, _QA_00)
-    #define BOOTLOADER_FF CONCAT_NAME(MODEL_INTERNAL_NAME_TOKEN, _QA_FF)
+#define BOOTLOADER_FF CONCAT_NAME(MODEL_INTERNAL_NAME_TOKEN, _QA_FF)
 #else
 // normal bootloaders
 #define BOOTLOADER_00 CONCAT_NAME(MODEL_INTERNAL_NAME_TOKEN, _00)

core/embed/firmware/bootloader_hashes.py

@@ -7,7 +7,7 @@ from trezorlib.firmware.core import FirmwareImage
 ALIGNED_SIZE = 128 * 1024
 
 HERE = Path(__file__).parent
-BOOTLOADERS = HERE / "bootloaders"
+BOOTLOADERS = HERE / ".." / "models"
 
 BL_CHECK = HERE / "bl_check.c"
 
@@ -74,29 +74,38 @@ def bootloader_str(file: Path) -> str:
 
 
 def main():
-    bl_check_new = []
-    with open(BL_CHECK) as f:
-        # read up to auto-begin
-        for line in f:
-            bl_check_new.append(line)
-            if line == BL_CHECK_AUTO_BEGIN:
-                break
 
-        # write bootloader definitions
+    models = list(BOOTLOADERS.iterdir())
-        for file in sorted(BOOTLOADERS.glob("bootloader*.bin")):
-            bl_check_new.append(bootloader_str(file))
 
-        # consume up to auto-end
+    models = [model for model in models if model.is_dir()]
-        for line in f:
-            if line == BL_CHECK_AUTO_END:
-                bl_check_new.append(line)
-                break
 
-        # read the rest
+    for model in models:
-        bl_check_new.extend(f)
 
-    # write the file
+        path = model / "bootloaders"
-    BL_CHECK.write_text("".join(bl_check_new))
+
+        if path.is_dir():
+
+            header_file = path / "bootloader_hashes.h"
+
+            content = []
+            content.append("#ifndef BOOTLOADER_HASHES_H\n")
+            content.append("#define BOOTLOADER_HASHES_H\n")
+            content.append("\n")
+            content.append("// Auto-generated file, do not edit.\n")
+            content.append("\n")
+            content.append("// clang-format off\n")
+
+            bootloaders = sorted(path.glob("bootloader*.bin"))
+            for bootloader in bootloaders:
+                if bootloader.is_file():
+                    print(f"Processing {bootloader}")
+                    content.append(bootloader_str(bootloader))
+
+            content.append("// clang-format on\n")
+            content.append("\n")
+            content.append("#endif\n")
+
+            header_file.write_text("".join(content))
 
 
 if __name__ == "__main__":

core/embed/firmware/bootloaders/bootloader_1.bin

@@ -1 +0,0 @@
-../../../../legacy/firmware/bootloader.dat

core/embed/models/T2B1/bootloaders/bootloader_hashes.h

@@ -0,0 +1,17 @@
+#ifndef BOOTLOADER_HASHES_H
+#define BOOTLOADER_HASHES_H
+
+// Auto-generated file, do not edit.
+
+// clang-format off
+// bootloader_T2B1.bin version 2.1.4.0
+#define BOOTLOADER_T2B1_00 {0x12, 0xf5, 0x51, 0x01, 0x10, 0xb3, 0x59, 0x8e, 0x73, 0x95, 0xa9, 0xa8, 0xc5, 0xbc, 0x3a, 0x53, 0xa3, 0xa8, 0xed, 0x83, 0x32, 0xc2, 0xd2, 0x5b, 0x47, 0x99, 0x27, 0x9f, 0x93, 0x8b, 0xb3, 0xd6}
+#define BOOTLOADER_T2B1_FF {0x19, 0x7c, 0x2a, 0xd1, 0xba, 0x89, 0xeb, 0x2a, 0xfc, 0xe1, 0x7b, 0xf3, 0x62, 0x7d, 0xf8, 0xb2, 0x3c, 0x70, 0x16, 0x03, 0x53, 0xad, 0x8e, 0x90, 0x9b, 0x57, 0xeb, 0x4b, 0x83, 0x4d, 0xa0, 0x34}
+
+// bootloader_T2B1_qa.bin version 2.1.4.0
+#define BOOTLOADER_T2B1_QA_00 {0x96, 0xe7, 0xfa, 0x21, 0x66, 0x81, 0x6b, 0x27, 0xf6, 0x27, 0xc1, 0x50, 0xaa, 0xf8, 0xbf, 0xac, 0xf5, 0x0d, 0x37, 0xea, 0x10, 0xa9, 0xa2, 0x0c, 0x1a, 0x58, 0xa7, 0x42, 0x23, 0x80, 0xbe, 0x40}
+#define BOOTLOADER_T2B1_QA_FF {0x7c, 0xca, 0xde, 0xf6, 0x8f, 0xf8, 0x9a, 0x08, 0x35, 0x0a, 0x82, 0xe4, 0xb5, 0x76, 0x37, 0x36, 0x51, 0x33, 0x40, 0xd9, 0x66, 0x84, 0xfb, 0x1b, 0x4f, 0x89, 0x34, 0xcd, 0x6f, 0x4c, 0x03, 0x1a}
+
+// clang-format on
+
+#endif

core/embed/models/T2B1/model_T2B1.h

@@ -1,6 +1,8 @@
 #ifndef MODELS_MODEL_T2B1_H_
 #define MODELS_MODEL_T2B1_H_
 
+#include "bootloaders/bootloader_hashes.h"
+
 #define MODEL_NAME "Safe 3"
 #define MODEL_FULL_NAME "Trezor Safe 3"
 #define MODEL_INTERNAL_NAME "T2B1"

core/embed/models/T2T1/bootloaders/bootloader_hashes.h

@@ -0,0 +1,17 @@
+#ifndef BOOTLOADER_HASHES_H
+#define BOOTLOADER_HASHES_H
+
+// Auto-generated file, do not edit.
+
+// clang-format off
+// bootloader_T2T1.bin version 2.1.4.0
+#define BOOTLOADER_T2T1_00 {0x37, 0xaf, 0xad, 0xb6, 0x55, 0x7a, 0xd3, 0x82, 0x2c, 0x7b, 0xd3, 0x41, 0x65, 0xb7, 0x4d, 0xce, 0xbe, 0x23, 0x87, 0x90, 0x93, 0x3f, 0xbc, 0x4c, 0x5a, 0x1c, 0x60, 0x8c, 0xf9, 0xf6, 0xec, 0x0c}
+#define BOOTLOADER_T2T1_FF {0x5e, 0x84, 0xd3, 0xf7, 0xfd, 0x55, 0x51, 0xfd, 0x5f, 0x22, 0xc4, 0x83, 0xe2, 0x67, 0xc5, 0x1b, 0x77, 0xce, 0x49, 0xce, 0x42, 0x19, 0xe8, 0x23, 0x84, 0x4a, 0x58, 0x47, 0xaf, 0x80, 0x69, 0x86}
+
+// bootloader_T2T1_qa.bin version 2.1.4.0
+#define BOOTLOADER_T2T1_QA_00 {0xff, 0xda, 0xfd, 0x0f, 0xe1, 0x89, 0x56, 0xb6, 0x0b, 0x6e, 0x2d, 0x67, 0xf1, 0x63, 0x8c, 0x4c, 0x4d, 0x6f, 0x97, 0xe7, 0xe0, 0xa4, 0xce, 0x76, 0xc9, 0x49, 0x0a, 0x34, 0x3e, 0xd8, 0xcb, 0x1f}
+#define BOOTLOADER_T2T1_QA_FF {0xbe, 0x31, 0x71, 0x7b, 0x8b, 0x31, 0x12, 0xbd, 0x58, 0xc4, 0x81, 0x09, 0x8d, 0xd9, 0x07, 0x51, 0x5c, 0xb6, 0x3d, 0x07, 0x82, 0x00, 0x30, 0x4a, 0xeb, 0x26, 0xf0, 0xe4, 0x00, 0xd4, 0xf2, 0x9c}
+
+// clang-format on
+
+#endif

core/embed/models/T2T1/model_T2T1.h

@@ -1,6 +1,8 @@
 #ifndef MODELS_MODEL_T2T1_H_
 #define MODELS_MODEL_T2T1_H_
 
+#include "bootloaders/bootloader_hashes.h"
+
 #define MODEL_NAME "T"
 #define MODEL_FULL_NAME "Trezor Model T"
 #define MODEL_INTERNAL_NAME "T2T1"

core/embed/models/T3B1/bootloaders/bootloader_hashes.h

@@ -0,0 +1,17 @@
+#ifndef BOOTLOADER_HASHES_H
+#define BOOTLOADER_HASHES_H
+
+// Auto-generated file, do not edit.
+
+// clang-format off
+// bootloader_T3B1.bin version 2.1.7.0
+#define BOOTLOADER_T3B1_00 {0x6a, 0x29, 0x58, 0x1f, 0x4f, 0x0c, 0x64, 0xd0, 0x57, 0xb3, 0x36, 0xb7, 0xca, 0xc5, 0x00, 0xc6, 0xbe, 0x87, 0x46, 0x10, 0x48, 0xb0, 0x20, 0xc5, 0xc3, 0x55, 0xaa, 0xf8, 0xec, 0x48, 0xd6, 0xa3}
+#define BOOTLOADER_T3B1_FF {0x57, 0x1e, 0xa2, 0xb8, 0x09, 0xf0, 0xab, 0xb4, 0x35, 0xb9, 0x92, 0xcd, 0xde, 0x28, 0x8a, 0xe2, 0x73, 0x04, 0x92, 0x16, 0x01, 0xac, 0x70, 0x48, 0xad, 0x1d, 0x72, 0x9e, 0x31, 0x42, 0xbf, 0x37}
+
+// bootloader_T3B1_qa.bin version 2.1.7.0
+#define BOOTLOADER_T3B1_QA_00 {0x2e, 0x90, 0x8a, 0x99, 0x25, 0x93, 0xcd, 0x9c, 0xf1, 0x23, 0x1e, 0x4e, 0x41, 0xfc, 0xc9, 0xf1, 0x4b, 0x06, 0x69, 0x57, 0x6e, 0x64, 0x84, 0x1c, 0xb1, 0xd9, 0x89, 0x0c, 0xa5, 0xb4, 0x38, 0xeb}
+#define BOOTLOADER_T3B1_QA_FF {0x63, 0xd2, 0x2d, 0x7b, 0xe8, 0x17, 0x2b, 0x97, 0x64, 0x06, 0x9b, 0x60, 0xa0, 0x3d, 0xfc, 0xd6, 0xea, 0x8a, 0x8d, 0xaf, 0x12, 0x25, 0x58, 0x93, 0x9e, 0x40, 0x16, 0xf2, 0x25, 0x30, 0x30, 0x6f}
+
+// clang-format on
+
+#endif

core/embed/models/T3B1/model_T3B1.h

@@ -1,6 +1,8 @@
 #ifndef MODELS_MODEL_T3B1_H_
 #define MODELS_MODEL_T3B1_H_
 
+#include "bootloaders/bootloader_hashes.h"
+
 #include "sizedefs.h"
 
 #define MODEL_NAME "Safe 3"

core/embed/models/T3T1/bootloaders/bootloader_hashes.h

@@ -0,0 +1,17 @@
+#ifndef BOOTLOADER_HASHES_H
+#define BOOTLOADER_HASHES_H
+
+// Auto-generated file, do not edit.
+
+// clang-format off
+// bootloader_T3T1.bin version 2.1.6.0
+#define BOOTLOADER_T3T1_00 {0x4a, 0x07, 0x5c, 0x74, 0x0f, 0x9a, 0x84, 0x61, 0xaf, 0x10, 0x34, 0x9c, 0x24, 0x3d, 0x79, 0x5b, 0xc6, 0x12, 0x5e, 0xec, 0x51, 0xb3, 0x91, 0x4b, 0x65, 0xf9, 0x79, 0x17, 0x98, 0xc2, 0x4f, 0xcb}
+#define BOOTLOADER_T3T1_FF {0xd8, 0xee, 0x0d, 0xd8, 0x87, 0x0b, 0xf4, 0x38, 0x73, 0x52, 0x83, 0x5e, 0xa9, 0xef, 0x3e, 0x5a, 0x3e, 0x59, 0xc2, 0x12, 0x5b, 0x24, 0xc9, 0x2d, 0xd4, 0xc5, 0xf5, 0x57, 0x15, 0x8a, 0x34, 0x78}
+
+// bootloader_T3T1_qa.bin version 2.1.6.0
+#define BOOTLOADER_T3T1_QA_00 {0x53, 0x5f, 0xf9, 0xa8, 0x21, 0x7d, 0xb5, 0x39, 0xe4, 0xfa, 0xf8, 0x3d, 0x0d, 0xe6, 0xf3, 0x65, 0x21, 0x30, 0x46, 0x9e, 0x40, 0x85, 0xd4, 0xd8, 0x49, 0x00, 0xb0, 0xb5, 0x58, 0x39, 0xe3, 0xd4}
+#define BOOTLOADER_T3T1_QA_FF {0x1e, 0x03, 0x50, 0x25, 0xa1, 0xc7, 0x20, 0xe2, 0x04, 0x62, 0x24, 0xa1, 0x31, 0xc2, 0xf5, 0x7b, 0x35, 0xe9, 0x22, 0x42, 0x36, 0x2d, 0xab, 0xcc, 0xb6, 0x3b, 0xfe, 0x88, 0x53, 0x2f, 0x49, 0xa7}
+
+// clang-format on
+
+#endif

core/embed/models/T3T1/model_T3T1.h

@@ -1,6 +1,8 @@
 #ifndef MODELS_MODEL_T3T1_H_
 #define MODELS_MODEL_T3T1_H_
 
+#include "bootloaders/bootloader_hashes.h"
+
 #include "sizedefs.h"
 
 #define MODEL_NAME "Safe 5"