arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-27 07:40:59 +00:00
Code Issues Releases Wiki Activity

core: better formatting for common parts of T1 and TT header

Browse Source
This commit is contained in:
Ondrej Mikle 2020-05-14 16:10:42 +02:00
parent c4c341b3f9
commit 7eddafe487
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
core/embed/firmware/header.S
View File

@ -7,9 +7,9 @@
.type g_header, %object .type g_header, %object
.size g_header, .-g_header .size g_header, .-g_header
#if TREZOR_MODEL != 1 // Firmware header for both Trezor One and Trezor T.
// Trezor One must have bootloader version >= 1.8.0 (before that version the hdrlen used to be reset vector)
// model T header
g_header: g_header:
.byte 'T','R','Z','F' // magic .byte 'T','R','Z','F' // magic
.word g_header_end - g_header // hdrlen .word g_header_end - g_header // hdrlen
@ -25,29 +25,14 @@ g_header:
.byte FIX_VERSION_BUILD // fix_vbuild .byte FIX_VERSION_BUILD // fix_vbuild
. = . + 8 // reserved . = . + 8 // reserved
. = . + 512 // hash1 ... hash16 . = . + 512 // hash1 ... hash16
#if TREZOR_MODEL != 1
// model T header specifics
. = . + 415 // reserved . = . + 415 // reserved
.byte 0 // sigmask .byte 0 // sigmask
. = . + 64 // sig . = . + 64 // sig
g_header_end:
#else #else
// model 1 header specifics
// model 1 header
g_header:
.byte 'T','R','Z','F' // magic
.word reset_handler // reset handler, replace later with : .word g_header_end - g_header // hdrlen
.word 0 // expiry
.word _codelen // codelen
.byte VERSION_MAJOR // vmajor
.byte VERSION_MINOR // vminor
.byte VERSION_PATCH // vpatch
.byte 0 // vbuild
.byte FIX_VERSION_MAJOR // fix_vmajor
.byte FIX_VERSION_MINOR // fix_vminor
.byte FIX_VERSION_PATCH // fix_vpatch
.byte 0 // fix_vbuild
. = . + 8 // reserved
. = . + 512 // hash1 ... hash16
. = . + 64 // sig1 . = . + 64 // sig1
. = . + 64 // sig2 . = . + 64 // sig2
. = . + 64 // sig3 . = . + 64 // sig3
@ -56,6 +41,7 @@ g_header:
.byte 0 // sigindex3 .byte 0 // sigindex3
. = . + 220 // reserved . = . + 220 // reserved
. = . + 65 // reserved . = . + 65 // reserved
#endif
g_header_end: g_header_end:
#endif