feat(core): add display feature to SConscript

[no changelog]

core/SConscript.boardloader

@@ -7,7 +7,7 @@ TREZOR_MODEL = ARGUMENTS.get('TREZOR_MODEL', 'T2T1')
 CMAKELISTS = int(ARGUMENTS.get('CMAKELISTS', 0))
 HW_REVISION = ARGUMENTS.get('HW_REVISION', None)
 
-FEATURES_WANTED = ["sd_card", "powerctl"]
+FEATURES_WANTED = ["sd_card", "powerctl", "display"]
 
 CCFLAGS_MOD = ''
 CPPPATH_MOD = []

core/SConscript.bootloader

@@ -11,7 +11,7 @@ PRODUCTION = 0 if BOOTLOADER_QA else ARGUMENTS.get('PRODUCTION', '0') == '1'
 HW_REVISION = ARGUMENTS.get('HW_REVISION', None)
 UI_DEBUG_OVERLAY = ARGUMENTS.get('UI_DEBUG_OVERLAY', '0') == '1'
 
-FEATURES_WANTED = ["input", "rgb_led", "consumption_mask", "usb", "optiga", "dma2d", "ble", "powerctl"]
+FEATURES_WANTED = ["input", "rgb_led", "consumption_mask", "usb", "optiga", "dma2d", "ble", "powerctl", "display"]
 
 CCFLAGS_MOD = ''
 CPPPATH_MOD = []

core/SConscript.bootloader_ci

@@ -7,7 +7,7 @@ TREZOR_MODEL = ARGUMENTS.get('TREZOR_MODEL', 'T2T1')
 CMAKELISTS = int(ARGUMENTS.get('CMAKELISTS', 0))
 HW_REVISION = ARGUMENTS.get('HW_REVISION', None)
 
-FEATURES_WANTED = ["input", "rgb_led", "consumption_mask", "usb", "optiga", "powerctl"]
+FEATURES_WANTED = ["input", "rgb_led", "consumption_mask", "usb", "optiga", "powerctl", "display"]
 
 CCFLAGS_MOD = ''
 CPPPATH_MOD = []

core/SConscript.bootloader_emu

@@ -20,7 +20,7 @@ if not models.has_emulator(TREZOR_MODEL):
              )
     Return()
 
-FEATURES_WANTED = ["input", "rgb_led", "dma2d", "optiga", "powerctl"]
+FEATURES_WANTED = ["input", "rgb_led", "dma2d", "optiga", "powerctl", "display"]
 
 CCFLAGS_MOD = ''
 CPPPATH_MOD = []

core/SConscript.firmware

@@ -45,7 +45,7 @@ FEATURE_FLAGS = {
     "AES_GCM": BENCHMARK or THP,
 }
 
-FEATURES_WANTED = ["input", "sd_card", "rgb_led", "dma2d", "consumption_mask", "usb" ,"optiga", "haptic", "ble", "tropic", "powerctl"]
+FEATURES_WANTED = ["input", "sd_card", "rgb_led", "dma2d", "consumption_mask", "usb" ,"optiga", "haptic", "ble", "tropic", "powerctl", "display"]
 if DISABLE_OPTIGA:
     if PYOPT != '0':
         raise RuntimeError("DISABLE_OPTIGA requires PYOPT=0")

core/SConscript.kernel

@@ -30,7 +30,7 @@ FEATURE_FLAGS = {
     "AES_GCM": True,
 }
 
-FEATURES_WANTED = ["input", "sd_card", "rgb_led", "dma2d", "consumption_mask", "usb" ,"optiga", "haptic", "ble", "tropic", "powerctl"]
+FEATURES_WANTED = ["input", "sd_card", "rgb_led", "dma2d", "consumption_mask", "usb" ,"optiga", "haptic", "ble", "tropic", "powerctl", "display"]
 if DISABLE_OPTIGA:
     # TODO use PYOPT instead of PRODUCTION, same as in firmware, blocked on #4253
     if PRODUCTION:

core/SConscript.prodtest

@@ -14,7 +14,7 @@ FEATURE_FLAGS = {
     "AES_GCM": True,
 }
 
-FEATURES_WANTED = ["input", "sbu", "nfc", "sd_card", "rgb_led", "usb", "consumption_mask", "optiga", "haptic", "tropic", "ble", "hw_revision", "powerctl"]
+FEATURES_WANTED = ["input", "sbu", "nfc", "sd_card", "rgb_led", "usb", "consumption_mask", "optiga", "haptic", "tropic", "ble", "hw_revision", "powerctl", "display"]
 
 CCFLAGS_MOD = ''
 CPPPATH_MOD = []

core/SConscript.reflash

@@ -18,7 +18,7 @@ if TREZOR_MODEL in ('D001', 'D002'):
                  action=build_reflash)
     Return()
 
-FEATURES_WANTED = ["input", "sd_card"]
+FEATURES_WANTED = ["input", "sd_card", "display"]
 
 CCFLAGS_MOD = ''
 CPPPATH_MOD = []

core/SConscript.unix

@@ -21,7 +21,7 @@ if BENCHMARK and PYOPT != '0':
   print("BENCHMARK=1 works only with PYOPT=0.")
   exit(1)
 
-FEATURES_WANTED = ["input", "sd_card", "dma2d", "optiga", "ble", "rgb_led", "powerctl"]
+FEATURES_WANTED = ["input", "sd_card", "dma2d", "optiga", "ble", "rgb_led", "powerctl", "display"]
 
 if not DISABLE_TROPIC:
     FEATURES_WANTED.append('tropic')

core/embed/sys/startup/stm32/bootutils.c

@@ -21,7 +21,6 @@
 #include <trezor_model.h>
 #include <trezor_rtl.h>
 
-#include <io/display.h>
 #include <sys/bootargs.h>
 #include <sys/bootutils.h>
 #include <sys/irq.h>
@@ -32,6 +31,10 @@
 #include <sys/sysutils.h>
 #include <util/image.h>
 
+#ifdef STM32F4
+#include <io/display.h>
+#endif
+
 #ifdef KERNEL_MODE
 
 // Battery powered devices (USE_POWERCTL) should not stall

core/site_scons/models/D001/discovery.py

@@ -37,6 +37,7 @@ def configure(
         ("USE_HSE", "1"),
     ]
 
+    if "display" in features_wanted:
         sources += [
             "embed/io/display/stm32f429i-disc1/display_driver.c",
             "embed/io/display/stm32f429i-disc1/display_ltdc.c",

core/site_scons/models/D002/discovery2.py

@@ -38,6 +38,7 @@ def configure(
         ("USE_HSE", "1"),
     ]
 
+    if "display" in features_wanted:
         sources += [
             "embed/io/display/ltdc_dsi/display_driver.c",
             "embed/io/display/ltdc_dsi/panels/stm32u5a9j-dk/stm32u5a9j-dk.c",

core/site_scons/models/T2B1/trezor_r_v10.py

@@ -45,6 +45,7 @@ def configure(
         ("USE_HSE", "1"),
     ]
 
+    if "display" in features_wanted:
         sources += ["embed/io/display/vg-2864/display_driver.c"]
         paths += ["embed/io/display/inc"]
 

core/site_scons/models/T2T1/trezor_t.py

@@ -45,6 +45,7 @@ def configure(
         ("USE_HSE", "1"),
     ]
 
+    if "display" in features_wanted:
         sources += ["embed/io/display/st-7789/display_nofb.c"]
         sources += ["embed/io/display/st-7789/display_driver.c"]
         sources += ["embed/io/display/st-7789/display_io.c"]

core/site_scons/models/T3B1/trezor_t3b1_revB.py

@@ -44,6 +44,7 @@ def configure(
         ("HW_REVISION", str(hw_revision)),
     ]
 
+    if "display" in features_wanted:
         sources += ["embed/io/display/vg-2864/display_driver.c"]
         paths += ["embed/io/display/inc"]
 

core/site_scons/models/T3T1/trezor_t3t1_revE.py

@@ -46,6 +46,7 @@ def configure(
         ("HW_REVISION", str(hw_revision)),
     ]
 
+    if "display" in features_wanted:
         sources += ["embed/io/display/st-7789/display_fb.c"]
         sources += ["embed/io/display/st-7789/display_driver.c"]
         sources += ["embed/io/display/st-7789/display_io.c"]

core/site_scons/models/T3W1/trezor_t3w1_revA.py

@@ -43,6 +43,7 @@ def configure(
         ("TERMINAL_Y_PADDING", "12"),
     ]
 
+    if "display" in features_wanted:
         sources += [
             "embed/io/display/ltdc_dsi/display_driver.c",
             "embed/io/display/ltdc_dsi/panels/lx250a2401a/lx250a2401a.c",

core/site_scons/models/T3W1/trezor_t3w1_revB.py

@@ -43,6 +43,7 @@ def configure(
         ("TERMINAL_Y_PADDING", "12"),
     ]
 
+    if "display" in features_wanted:
         sources += [
             "embed/io/display/ltdc_dsi/display_driver.c",
             "embed/io/display/ltdc_dsi/panels/lx250a2401a/lx250a2401a.c",

core/site_scons/models/T3W1/trezor_t3w1_revC.py

@@ -43,6 +43,7 @@ def configure(
         ("TERMINAL_Y_PADDING", "12"),
     ]
 
+    if "display" in features_wanted:
         sources += [
             "embed/io/display/ltdc_dsi/display_driver.c",
             "embed/io/display/ltdc_dsi/panels/lx250a2401a/lx250a2401a.c",