arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-06-03 14:48:53 +00:00
Code Issues Releases Wiki Activity

feat(core): disable SECP256K1_ZKP feature flag

Browse Source
This commit is contained in:
Pavol Rusnak 2020-11-18 16:26:25 +01:00 committed by Tomas Susanka
parent f3d5de15ef
commit 43ed13b323
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/SConscript.firmware
View File

@ -8,7 +8,7 @@ TREZOR_MODEL = ARGUMENTS.get('TREZOR_MODEL', 'T')
FEATURE_FLAGS = { FEATURE_FLAGS = {
"RDI": True, "RDI": True,
"SECP256K1_ZKP": True, "SECP256K1_ZKP": False,
} }
CCFLAGS_MOD = '' CCFLAGS_MOD = ''
@ -376,10 +376,12 @@ if TREZOR_MODEL == 'T':
CPU_ASFLAGS = '-mthumb -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16' CPU_ASFLAGS = '-mthumb -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16'
CPU_CCFLAGS = '-mthumb -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mtune=cortex-m4 ' CPU_CCFLAGS = '-mthumb -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mtune=cortex-m4 '
CPU_MODEL = 'STM32F427xx' CPU_MODEL = 'STM32F427xx'
LD_VARIANT = '_zkp' if EVERYTHING and FEATURE_FLAGS["SECP256K1_ZKP"] else ''
elif TREZOR_MODEL == '1': elif TREZOR_MODEL == '1':
CPU_ASFLAGS = '-mthumb -mcpu=cortex-m3 -mfloat-abi=soft' CPU_ASFLAGS = '-mthumb -mcpu=cortex-m3 -mfloat-abi=soft'
CPU_CCFLAGS = '-mthumb -mtune=cortex-m3 -mcpu=cortex-m3 -mfloat-abi=soft ' CPU_CCFLAGS = '-mthumb -mtune=cortex-m3 -mcpu=cortex-m3 -mfloat-abi=soft '
CPU_MODEL = 'STM32F405xx' CPU_MODEL = 'STM32F405xx'
LD_VARIANT = '' if EVERYTHING else '_min'
else: else:
raise ValueError('Unknown Trezor model') raise ValueError('Unknown Trezor model')
@ -394,7 +396,7 @@ env.Replace(
'-fstack-protector-all ' '-fstack-protector-all '
+ CPU_CCFLAGS + CCFLAGS_MOD, + CPU_CCFLAGS + CCFLAGS_MOD,
CCFLAGS_QSTR='-DNO_QSTR -DN_X64 -DN_X86 -DN_THUMB', CCFLAGS_QSTR='-DNO_QSTR -DN_X64 -DN_X86 -DN_THUMB',
LINKFLAGS='-T embed/firmware/memory_${TREZOR_MODEL}%s.ld -Wl,--gc-sections -Wl,-Map=build/firmware/firmware.map -Wl,--warn-common' % ('' if EVERYTHING else '_min'), LINKFLAGS='-T embed/firmware/memory_${TREZOR_MODEL}%s.ld -Wl,--gc-sections -Wl,-Map=build/firmware/firmware.map -Wl,--warn-common' % LD_VARIANT,
CPPPATH=[ CPPPATH=[
'.', '.',
'embed/firmware', 'embed/firmware',

2
core/SConscript.unix
View File

@ -7,7 +7,7 @@ EVERYTHING = BITCOIN_ONLY != '1'
TREZOR_MODEL = ARGUMENTS.get('TREZOR_MODEL', 'T') TREZOR_MODEL = ARGUMENTS.get('TREZOR_MODEL', 'T')
FEATURE_FLAGS = { FEATURE_FLAGS = {
"SECP256K1_ZKP": True, "SECP256K1_ZKP": False,
} }
CCFLAGS_MOD = '' CCFLAGS_MOD = ''

1
core/embed/firmware/memory_T.ld
View File

@ -44,7 +44,6 @@ SECTIONS {
.flash2 : ALIGN(512) { .flash2 : ALIGN(512) {
build/firmware/frozen_mpy.o(.rodata*); build/firmware/frozen_mpy.o(.rodata*);
build/firmware/vendor/secp256k1-zkp/src/secp256k1.o(.rodata*);
. = ALIGN(512); . = ALIGN(512);
} >FLASH2 AT>FLASH2 } >FLASH2 AT>FLASH2

1
core/embed/firmware/memory_T_min.ld → core/embed/firmware/memory_T_zkp.ld
View File

@ -44,6 +44,7 @@ SECTIONS {
.flash2 : ALIGN(512) { .flash2 : ALIGN(512) {
build/firmware/frozen_mpy.o(.rodata*); build/firmware/frozen_mpy.o(.rodata*);
build/firmware/vendor/secp256k1-zkp/src/secp256k1.o(.rodata*);
. = ALIGN(512); . = ALIGN(512);
} >FLASH2 AT>FLASH2 } >FLASH2 AT>FLASH2