fixup! feat(core): refactor display drivers

core/embed/trezorhal/stm32u5/display/st-7789

@@ -1 +0,0 @@
-../../stm32f4/display/st-7789

core/embed/trezorhal/stm32u5/display/vg-2864

@@ -1 +0,0 @@
-../../stm32f4/display/vg-2864

core/embed/trezorhal/stm32u5/xdisplay/st-7789

@@ -0,0 +1 @@
+../../stm32f4/xdisplay/st-7789

core/embed/trezorhal/stm32u5/xdisplay/vg-2864

@@ -0,0 +1 @@
+../../stm32f4/xdisplay/vg-2864

core/site_scons/boards/discovery.py

@@ -40,9 +40,9 @@ def configure(
     if "new_rendering" in features_wanted:
         sources += [
             "embed/trezorhal/xdisplay_legacy.c",
-            "embed/trezorhal/stm32f4/display/stm32f429i-disc1/display_driver.c",
-            "embed/trezorhal/stm32f4/display/stm32f429i-disc1/display_ltdc.c",
-            "embed/trezorhal/stm32f4/display/stm32f429i-disc1/ili9341_spi.c",
+            "embed/trezorhal/stm32f4/xdisplay/stm32f429i-disc1/display_driver.c",
+            "embed/trezorhal/stm32f4/xdisplay/stm32f429i-disc1/display_ltdc.c",
+            "embed/trezorhal/stm32f4/xdisplay/stm32f429i-disc1/ili9341_spi.c",
         ]
     else:
         sources += [f"embed/trezorhal/stm32f4/displays/{display}"]

core/site_scons/boards/discovery2.py

@@ -47,9 +47,9 @@ def configure(
     if "new_rendering" in features_wanted:
         sources += [
             "embed/trezorhal/xdisplay_legacy.c",
-            "embed/trezorhal/stm32u5/display/stm32u5a9j-dk/display_driver.c",
-            "embed/trezorhal/stm32u5/display/stm32u5a9j-dk/display_fb.c",
-            "embed/trezorhal/stm32u5/display/stm32u5a9j-dk/display_ltdc_dsi.c",
+            "embed/trezorhal/stm32u5/xdisplay/stm32u5a9j-dk/display_driver.c",
+            "embed/trezorhal/stm32u5/xdisplay/stm32u5a9j-dk/display_fb.c",
+            "embed/trezorhal/stm32u5/xdisplay/stm32u5a9j-dk/display_ltdc_dsi.c",
         ]
     else:
         sources += [

core/site_scons/boards/trezor_r_v10.py

@@ -44,7 +44,7 @@ def configure(
 
     if "new_rendering" in features_wanted:
         sources += ["embed/trezorhal/xdisplay_legacy.c"]
-        sources += ["embed/trezorhal/stm32f4/display/vg-2864/display_driver.c"]
+        sources += ["embed/trezorhal/stm32f4/xdisplay/vg-2864/display_driver.c"]
     else:
         sources += [f"embed/trezorhal/stm32f4/displays/{display}"]
 

core/site_scons/boards/trezor_r_v3.py

@@ -44,7 +44,7 @@ def configure(
 
     if "new_rendering" in features_wanted:
         sources += ["embed/trezorhal/xdisplay_legacy.c"]
-        sources += ["embed/trezorhal/stm32f4/display/ug-2828/display_driver.c"]
+        sources += ["embed/trezorhal/stm32f4/xdisplay/ug-2828/display_driver.c"]
     else:
         sources += [f"embed/trezorhal/stm32f4/displays/{display}"]
 

core/site_scons/boards/trezor_r_v4.py

@@ -44,7 +44,7 @@ def configure(
 
     if "new_rendering" in features_wanted:
         sources += ["embed/trezorhal/xdisplay_legacy.c"]
-        sources += ["embed/trezorhal/stm32f4/display/vg-2864/display_driver.c"]
+        sources += ["embed/trezorhal/stm32f4/xdisplay/vg-2864/display_driver.c"]
     else:
         sources += [f"embed/trezorhal/stm32f4/displays/{display}"]
 

core/site_scons/boards/trezor_r_v6.py

@@ -44,7 +44,7 @@ def configure(
 
     if "new_rendering" in features_wanted:
         sources += ["embed/trezorhal/xdisplay_legacy.c"]
-        sources += ["embed/trezorhal/stm32f4/display/vg-2864/display_driver.c"]
+        sources += ["embed/trezorhal/stm32f4/xdisplay/vg-2864/display_driver.c"]
     else:
         sources += [f"embed/trezorhal/stm32f4/displays/{display}"]
 

core/site_scons/boards/trezor_t.py

@@ -42,21 +42,21 @@ def configure(
     ]
     if "new_rendering" in features_wanted:
         sources += ["embed/trezorhal/xdisplay_legacy.c"]
-        sources += ["embed/trezorhal/stm32f4/display/st-7789/display_nofb.c"]
-        sources += ["embed/trezorhal/stm32f4/display/st-7789/display_driver.c"]
-        sources += ["embed/trezorhal/stm32f4/display/st-7789/display_io.c"]
-        sources += ["embed/trezorhal/stm32f4/display/st-7789/display_panel.c"]
+        sources += ["embed/trezorhal/stm32f4/xdisplay/st-7789/display_nofb.c"]
+        sources += ["embed/trezorhal/stm32f4/xdisplay/st-7789/display_driver.c"]
+        sources += ["embed/trezorhal/stm32f4/xdisplay/st-7789/display_io.c"]
+        sources += ["embed/trezorhal/stm32f4/xdisplay/st-7789/display_panel.c"]
         sources += [
-            "embed/trezorhal/stm32f4/display/st-7789/panels/tf15411a.c",
+            "embed/trezorhal/stm32f4/xdisplay/st-7789/panels/tf15411a.c",
         ]
         sources += [
-            "embed/trezorhal/stm32f4/display/st-7789/panels/154a.c",
+            "embed/trezorhal/stm32f4/xdisplay/st-7789/panels/154a.c",
         ]
         sources += [
-            "embed/trezorhal/stm32f4/display/st-7789/panels/lx154a2411.c",
+            "embed/trezorhal/stm32f4/xdisplay/st-7789/panels/lx154a2411.c",
         ]
         sources += [
-            "embed/trezorhal/stm32f4/display/st-7789/panels/lx154a2422.c",
+            "embed/trezorhal/stm32f4/xdisplay/st-7789/panels/lx154a2422.c",
         ]
 
     else:

core/site_scons/boards/trezor_t3t1_revE.py

@@ -48,12 +48,12 @@ def configure(
 
     if "new_rendering" in features_wanted:
         sources += ["embed/trezorhal/xdisplay_legacy.c"]
-        sources += ["embed/trezorhal/stm32u5/display/st-7789/display_fb.c"]
-        sources += ["embed/trezorhal/stm32u5/display/st-7789/display_driver.c"]
-        sources += ["embed/trezorhal/stm32u5/display/st-7789/display_io.c"]
-        sources += ["embed/trezorhal/stm32u5/display/st-7789/display_panel.c"]
+        sources += ["embed/trezorhal/stm32u5/xdisplay/st-7789/display_fb.c"]
+        sources += ["embed/trezorhal/stm32u5/xdisplay/st-7789/display_driver.c"]
+        sources += ["embed/trezorhal/stm32u5/xdisplay/st-7789/display_io.c"]
+        sources += ["embed/trezorhal/stm32u5/xdisplay/st-7789/display_panel.c"]
         sources += [
-            "embed/trezorhal/stm32u5/display/st-7789/panels/lx154a2422.c",
+            "embed/trezorhal/stm32u5/xdisplay/st-7789/panels/lx154a2422.c",
         ]
     else:
         sources += [f"embed/trezorhal/stm32u5/displays/{display}"]

core/site_scons/boards/trezor_t3t1_v4.py

@@ -49,12 +49,12 @@ def configure(
 
     if "new_rendering" in features_wanted:
         sources += ["embed/trezorhal/xdisplay_legacy.c"]
-        sources += ["embed/trezorhal/stm32u5/display/st-7789/display_fb.c"]
-        sources += ["embed/trezorhal/stm32u5/display/st-7789/display_driver.c"]
-        sources += ["embed/trezorhal/stm32u5/display/st-7789/display_io.c"]
-        sources += ["embed/trezorhal/stm32u5/display/st-7789/display_panel.c"]
+        sources += ["embed/trezorhal/stm32u5/xdisplay/st-7789/display_fb.c"]
+        sources += ["embed/trezorhal/stm32u5/xdisplay/st-7789/display_driver.c"]
+        sources += ["embed/trezorhal/stm32u5/xdisplay/st-7789/display_io.c"]
+        sources += ["embed/trezorhal/stm32u5/xdisplay/st-7789/display_panel.c"]
         sources += [
-            "embed/trezorhal/stm32u5/display/st-7789/panels/lx154a2422.c",
+            "embed/trezorhal/stm32u5/xdisplay/st-7789/panels/lx154a2422.c",
         ]
 
     else: