arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-19 05:58:09 +00:00
Code Issues Releases Wiki Activity

chore(core/build): reuse embed_raw_binary function to embeed vendorheaders

Browse Source 
[no changelog]
This commit is contained in:
tychovrahe 2024-09-25 11:34:10 +02:00 committed by TychoVrahe
parent d312944f1e
commit 10eaa15427
3 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/SConscript.firmware
View File

@ -865,15 +865,13 @@ else:
VENDORHEADER = f'embed/models/{MODEL_IDENTIFIER}/vendorheader/vendorheader_{vendor}.bin' VENDORHEADER = f'embed/models/{MODEL_IDENTIFIER}/vendorheader/vendorheader_{vendor}.bin'
tools.embed_raw_binary(
obj_program.extend( obj_program,
env.Command( env,
target='embed/firmware/vendorheader.o', 'vendorheader',
source=VENDORHEADER, 'embed/firmware/vendorheader.o',
action='$OBJCOPY -I binary -O elf32-littlearm -B arm' VENDORHEADER,
' --rename-section .data=.vendorheader,alloc,load,readonly,contents' )
' $SOURCE $TARGET', ))
tools.embed_raw_binary( tools.embed_raw_binary(
obj_program, obj_program,

15
core/SConscript.prodtest
View File

@ -246,14 +246,13 @@ else:
VENDORHEADER = f'embed/models/{MODEL_IDENTIFIER}/vendorheader/vendorheader_unsafe_signed_prod.bin' VENDORHEADER = f'embed/models/{MODEL_IDENTIFIER}/vendorheader/vendorheader_unsafe_signed_prod.bin'
tools.embed_raw_binary(
obj_program.extend( obj_program,
env.Command( env,
target='embed/prodtest/vendorheader.o', 'vendorheader',
source=VENDORHEADER, 'embed/firmware/vendorheader.o',
action='$OBJCOPY -I binary -O elf32-littlearm -B arm' VENDORHEADER,
' --rename-section .data=.vendorheader,alloc,load,readonly,contents' )
' $SOURCE $TARGET', ))
linkerscript_gen = env.Command( linkerscript_gen = env.Command(
target='memory.ld', target='memory.ld',

14
core/SConscript.reflash
View File

@ -206,13 +206,13 @@ MODEL_IDENTIFIER = models.get_model_identifier(TREZOR_MODEL)
VENDORHEADER = f'embed/models/{MODEL_IDENTIFIER}/vendorheader/vendorheader_' + ('unsafe_signed_dev.bin' if ARGUMENTS.get('PRODUCTION', '0') == '0' else 'satoshilabs_signed_prod.bin') VENDORHEADER = f'embed/models/{MODEL_IDENTIFIER}/vendorheader/vendorheader_' + ('unsafe_signed_dev.bin' if ARGUMENTS.get('PRODUCTION', '0') == '0' else 'satoshilabs_signed_prod.bin')
obj_program.extend( tools.embed_raw_binary(
env.Command( obj_program,
target='embed/reflash/vendorheader.o', env,
source=VENDORHEADER, 'vendorheader',
action='$OBJCOPY -I binary -O elf32-littlearm -B arm' 'embed/firmware/vendorheader.o',
' --rename-section .data=.vendorheader,alloc,load,readonly,contents' VENDORHEADER,
' $SOURCE $TARGET', )) )
linkerscript_gen = env.Command( linkerscript_gen = env.Command(
target='memory.ld', target='memory.ld',