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

[no changelog]

core/SConscript.bootloader_emu

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

core/SConscript.unix

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

core/embed/bootloader/emulator.c

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

core/embed/extmod/modtrezorconfig/norcow_config.h

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

core/embed/extmod/modtrezorcrypto/modtrezorcrypto.c

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

core/embed/trezorhal/boards/board-unix.h

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