arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-03-05 17:56:10 +00:00
Code Issues Releases Wiki Activity

chore(legacy): bundle bootloader 1.12.1 into firmware

Browse Source
This commit is contained in:
tychovrahe 2023-01-26 11:43:57 +01:00 committed by matejcik
parent 752bbebcee
commit 37c13ed75e
6 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
legacy/firmware/bl_check.c
View File

@ -96,6 +96,12 @@ static int known_bootloader(int r, const uint8_t *hash) {
"\xb4\x54\x18\x19\x65\x31\xb9\xf2\x97\x4a\x68\xed\xe8\xdb\x2e\xa1",
32))
return 1; // 1.12.0 shipped with fw 1.12.0
if (0 ==
memcmp(hash,
"\xb4\xe5\x92\x44\x18\x5c\xe1\xcd\x6c\x8f\x59\x03\x10\x37\x02\x18"
"\x50\x9c\x39\x32\x26\xf0\x07\x4b\x8c\xf6\xad\xed\xb3\xcd\x4d\x55",
32))
return 1; // 1.12.1 shipped with fw 1.12.1
// END AUTO-GENERATED QA BOOTLOADER ENTRIES (bl_check_qa.txt)
return 0;
}
@ -220,6 +226,12 @@ static int known_bootloader(int r, const uint8_t *hash) {
"\x61\xb3\xee\xfb\x8a\x0d\xda\xa3\x4d\x7e\x45\xb6\x3b\x3d\x56\x64",
32))
return 1; // 1.12.0 shipped with fw 1.12.0
if (0 ==
memcmp(hash,
"\x94\xf1\xc9\x0d\xb2\x8d\xb1\xf8\xce\x5d\xca\x96\x69\x76\x34\x36"
"\x58\xf5\xda\xde\xe8\x38\x34\x98\x7c\x8b\x04\x9c\x49\xd1\xed\xd0",
32))
return 1; // 1.12.1 shipped with fw 1.12.1
// END AUTO-GENERATED BOOTLOADER ENTRIES (bl_check.txt)
return 0;
}

1
legacy/firmware/bl_check.txt
View File

@ -1 +1,2 @@
e9ec8fa2fefad2b3b6b7c4ab76691a3361b3eefb8a0ddaa34d7e45b63b3d5664 1.12.0 shipped with fw 1.12.0
94f1c90db28db1f8ce5dca966976343658f5dadee83834987c8b049c49d1edd0 1.12.1 shipped with fw 1.12.1

1
legacy/firmware/bl_check_qa.txt
View File

@ -1 +1,2 @@
21b949f4f5fd9f3a7d6343d1076f960fb45418196531b9f2974a68ede8db2ea1 1.12.0 shipped with fw 1.12.0
b4e59244185ce1cd6c8f590310370218509c393226f0074b8cf6adedb3cd4d55 1.12.1 shipped with fw 1.12.1

BIN
legacy/firmware/bootloader.dat
View File

Binary file not shown.

BIN
legacy/firmware/bootloader_qa.dat
View File

Binary file not shown.

2
legacy/intermediate_fw/version.h
View File

@ -1,7 +1,7 @@
// Matches the bootloader version included in this firmware
#define VERSION_MAJOR 1
#define VERSION_MINOR 12
#define VERSION_PATCH 0
#define VERSION_PATCH 1
#define FIX_VERSION_MAJOR 1
#define FIX_VERSION_MINOR 12