1
0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-04 21:48:17 +00:00

build(core): correctly propagate DISABLE_OPTIGA to kernel

This commit is contained in:
matejcik 2024-11-21 16:08:53 +01:00 committed by matejcik
parent 331e07b1e0
commit 835f7087c6
3 changed files with 8 additions and 2 deletions

View File

@ -31,6 +31,7 @@ PYOPT ?= 1
BITCOIN_ONLY ?= 0 BITCOIN_ONLY ?= 0
BOOTLOADER_QA ?= 0 BOOTLOADER_QA ?= 0
BOOTLOADER_DEVEL ?= 0 BOOTLOADER_DEVEL ?= 0
DISABLE_OPTIGA ?= 0
TREZOR_MODEL ?= T TREZOR_MODEL ?= T
TREZOR_MEMPERF ?= 0 TREZOR_MEMPERF ?= 0
ADDRESS_SANITIZER ?= 0 ADDRESS_SANITIZER ?= 0

View File

@ -31,7 +31,9 @@ FEATURE_FLAGS = {
} }
FEATURES_WANTED = ["input", "sd_card", "rgb_led", "dma2d", "consumption_mask", "usb" ,"optiga", "haptic"] FEATURES_WANTED = ["input", "sd_card", "rgb_led", "dma2d", "consumption_mask", "usb" ,"optiga", "haptic"]
if DISABLE_OPTIGA and PYOPT == '0': if DISABLE_OPTIGA:
if PYOPT != '0':
raise RuntimeError("DISABLE_OPTIGA requires PYOPT=0")
FEATURES_WANTED.remove("optiga") FEATURES_WANTED.remove("optiga")
CCFLAGS_MOD = '' CCFLAGS_MOD = ''

View File

@ -24,7 +24,10 @@ FEATURE_FLAGS = {
} }
FEATURES_WANTED = ["input", "sd_card", "rgb_led", "dma2d", "consumption_mask", "usb" ,"optiga", "haptic"] FEATURES_WANTED = ["input", "sd_card", "rgb_led", "dma2d", "consumption_mask", "usb" ,"optiga", "haptic"]
if DISABLE_OPTIGA and PYOPT == '0': if DISABLE_OPTIGA:
# TODO use PYOPT instead of PRODUCTION, same as in firmware, blocked on #4253
if PRODUCTION:
raise RuntimeError("DISABLE_OPTIGA requires non-production build")
FEATURES_WANTED.remove("optiga") FEATURES_WANTED.remove("optiga")
CCFLAGS_MOD = '' CCFLAGS_MOD = ''