arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-18 12:28:09 +00:00
Code Issues Releases Wiki Activity

refactor(core): change the way USE_OPTIGA is added to build

Browse Source 
[no changelog]
This commit is contained in:
tychovrahe 2023-09-14 22:40:38 +02:00 committed by TychoVrahe
parent f226c9599b
commit c937f21447
6 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/SConscript.bootloader_emu
View File

@ -131,9 +131,6 @@ SOURCE_TREZORHAL = [
] ]
if TREZOR_MODEL in ('R', ): if TREZOR_MODEL in ('R', ):
CPPDEFINES_MOD += [
('USE_OPTIGA', '1'),
]
SOURCE_TREZORHAL += [ SOURCE_TREZORHAL += [
'embed/trezorhal/unix/secret.c', 'embed/trezorhal/unix/secret.c',
'embed/trezorhal/unix/optiga_hal.c', 'embed/trezorhal/unix/optiga_hal.c',

3
core/SConscript.unix
View File

@ -390,9 +390,6 @@ if TREZOR_MODEL in ('T', 'R'):
] ]
if TREZOR_MODEL == 'R': if TREZOR_MODEL == 'R':
CPPDEFINES_MOD += [
('USE_OPTIGA', '1'),
]
SOURCE_UNIX += [ SOURCE_UNIX += [
'embed/trezorhal/unix/optiga.c', 'embed/trezorhal/unix/optiga.c',
] ]

1
core/embed/bootloader/emulator.c
View File

@ -1,6 +1,7 @@
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include TREZOR_BOARD
#include "bootui.h" #include "bootui.h"
#include "common.h" #include "common.h"
#include "display.h" #include "display.h"

1
core/embed/extmod/modtrezorconfig/norcow_config.h
View File

@ -20,6 +20,7 @@
#ifndef __NORCOW_CONFIG_H__ #ifndef __NORCOW_CONFIG_H__
#define __NORCOW_CONFIG_H__ #define __NORCOW_CONFIG_H__
#include TREZOR_BOARD
#include "flash.h" #include "flash.h"
#include "model.h" #include "model.h"

2
core/embed/extmod/modtrezorcrypto/modtrezorcrypto.c
View File

@ -25,6 +25,8 @@
#include "py/runtime.h" #include "py/runtime.h"
#include TREZOR_BOARD
#if MICROPY_PY_TREZORCRYPTO #if MICROPY_PY_TREZORCRYPTO
static mp_obj_t ui_wait_callback = mp_const_none; static mp_obj_t ui_wait_callback = mp_const_none;

1
core/embed/trezorhal/boards/board-unix.h
View File

@ -16,6 +16,7 @@
#ifdef TREZOR_MODEL_R #ifdef TREZOR_MODEL_R
#define USE_BUTTON 1 #define USE_BUTTON 1
#define USE_SBU 1 #define USE_SBU 1
#define USE_OPTIGA 1
#endif #endif
#include "display-unix.h" #include "display-unix.h"