fixup! chore(core): use internal framebuffer on T3T1 (with ST7789V di…

…splay controller)
trezor · Jan 5, 2024 · 765696a · 765696a
1 parent 4848619
commit 765696a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/core/site_scons/boards/stm32f4_common.py b/core/site_scons/boards/stm32f4_common.py
@@ -70,8 +70,8 @@ def stm32f4_common_files(env, defines, sources, paths):
         "-I../../vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Inc;"
         "-I../../vendor/micropython/lib/stm32lib/CMSIS/STM32F4xx/Include;"
         "-I../../vendor/micropython/lib/cmsis/inc;"
-        "-DSTM32_HAL_H=<stm32f4xx.h>"
-        "-DSTM32F4"
+        "-DSTM32_HAL_H=<stm32f4xx.h>;"
+        "-DSTM32F4;"
     )
 
     env.get("ENV")["SUFFIX"] = "stm32f4"

diff --git a/core/site_scons/boards/stm32u5_common.py b/core/site_scons/boards/stm32u5_common.py
@@ -85,8 +85,8 @@ def stm32u5_common_files(env, defines, sources, paths):
         "-I../../vendor/stm32u5xx_hal_driver/Inc;"
         "-I../../vendor/cmsis_device_u5/Include;"
         "-I../../vendor/cmsis_5/CMSIS/Core/Include;"
-        "-DSTM32_HAL_H=<stm32u5xx.h>"
-        "-DSTM32U5"
+        "-DSTM32_HAL_H=<stm32u5xx.h>;"
+        "-DSTM32U5;"
     )
 
     env.get("ENV")["SUFFIX"] = "stm32u5"
diff --git a/core/site_scons/boards/trezor_t3t1_v4.py b/core/site_scons/boards/trezor_t3t1_v4.py
@@ -108,4 +108,8 @@ def configure(
     defs = env.get("CPPDEFINES_IMPLICIT")
     defs += ["__ARM_FEATURE_CMSE=3"]
 
+    rust_defs = env.get("ENV")["RUST_INCLUDES"]
+    rust_defs += "-DFRAMEBUFFER;"
+    env.get("ENV")["RUST_INCLUDES"] = rust_defs
+
     return features_available