From 590382bd537a856045da9c32b6307772428a02d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ioan=20Biz=C4=83u?= <i@ibz.me>
Date: Wed, 8 Jan 2025 09:11:34 +0100
Subject: [PATCH] fixup! feat(core): add libtropic to unix build

---
 core/site_scons/models/T3T1/emulator.py | 24 ------------------------
 core/site_scons/models/T3W1/emulator.py | 24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/core/site_scons/models/T3T1/emulator.py b/core/site_scons/models/T3T1/emulator.py
index 22fdfd18d6..ad6af823e0 100644
--- a/core/site_scons/models/T3T1/emulator.py
+++ b/core/site_scons/models/T3T1/emulator.py
@@ -60,30 +60,6 @@ def configure(
         features_available.append("optiga")
         defines += [("USE_OPTIGA", "1")]
 
-    if "tropic" in features_wanted:
-        sources += [
-            "embed/sec/secret/unix/secret.c",
-            "embed/sec/tropic/tropic_transport.c",
-            "vendor/libtropic/src/libtropic.c",
-            "vendor/libtropic/src/lt_crc16.c",
-            "vendor/libtropic/src/lt_hkdf.c",
-            "vendor/libtropic/src/lt_l1.c",
-            "vendor/libtropic/src/lt_l1_port_wrap.c",
-            "vendor/libtropic/src/lt_l2.c",
-            "vendor/libtropic/src/lt_l2_frame_check.c",
-            "vendor/libtropic/src/lt_l3.c",
-            "vendor/libtropic/src/lt_random.c",
-            "vendor/libtropic/hal/port/unix/lt_port_unix.c",
-            "vendor/libtropic/hal/crypto/trezor_crypto/lt_crypto_trezor_aesgcm.c",
-            "vendor/libtropic/hal/crypto/trezor_crypto/lt_crypto_trezor_ed25519.c",
-            "vendor/libtropic/hal/crypto/trezor_crypto/lt_crypto_trezor_sha256.c",
-            "vendor/libtropic/hal/crypto/trezor_crypto/lt_crypto_trezor_x25519.c",
-        ]
-        paths += ["embed/sec/tropic/inc"]
-        defines += ["USE_TREZOR_CRYPTO"]
-        features_available.append("tropic")
-        defines += ["USE_TROPIC=1"]
-
     if "input" in features_wanted:
         sources += ["embed/io/touch/unix/touch.c"]
         paths += ["embed/io/touch/inc"]
diff --git a/core/site_scons/models/T3W1/emulator.py b/core/site_scons/models/T3W1/emulator.py
index 56483240ad..0aa1eb5beb 100644
--- a/core/site_scons/models/T3W1/emulator.py
+++ b/core/site_scons/models/T3W1/emulator.py
@@ -52,6 +52,30 @@ def configure(
         features_available.append("optiga")
         defines += [("USE_OPTIGA", "1")]
 
+    if "tropic" in features_wanted:
+        sources += [
+            "embed/sec/secret/unix/secret.c",
+            "embed/sec/tropic/tropic_transport.c",
+            "vendor/libtropic/src/libtropic.c",
+            "vendor/libtropic/src/lt_crc16.c",
+            "vendor/libtropic/src/lt_hkdf.c",
+            "vendor/libtropic/src/lt_l1.c",
+            "vendor/libtropic/src/lt_l1_port_wrap.c",
+            "vendor/libtropic/src/lt_l2.c",
+            "vendor/libtropic/src/lt_l2_frame_check.c",
+            "vendor/libtropic/src/lt_l3.c",
+            "vendor/libtropic/src/lt_random.c",
+            "vendor/libtropic/hal/port/unix/lt_port_unix.c",
+            "vendor/libtropic/hal/crypto/trezor_crypto/lt_crypto_trezor_aesgcm.c",
+            "vendor/libtropic/hal/crypto/trezor_crypto/lt_crypto_trezor_ed25519.c",
+            "vendor/libtropic/hal/crypto/trezor_crypto/lt_crypto_trezor_sha256.c",
+            "vendor/libtropic/hal/crypto/trezor_crypto/lt_crypto_trezor_x25519.c",
+        ]
+        paths += ["embed/sec/tropic/inc"]
+        defines += ["USE_TREZOR_CRYPTO"]
+        features_available.append("tropic")
+        defines += ["USE_TROPIC=1"]
+
     if "input" in features_wanted:
         sources += ["embed/io/touch/unix/touch.c"]
         paths += ["embed/io/touch/inc"]