fixup! feat(core): refactor display drivers

core/embed/lib/gl_draw.h

@@ -133,7 +133,7 @@ void gl_draw_bar(gl_rect_t rect, gl_color_t color);
 // Draws a bitmap into the specified rectangle.
 //
 // The destination rectangle may not be fully filled if the source bitmap
-// is smaller then destination rectangle or if the bitmap is translated by
+// is smaller than destination rectangle or if the bitmap is translated by
 // an offset partially or completely outside the destination rectangle.
 //
 // Currently, we use `gl_draw_bitmap` exclusively for text rendering.

core/embed/trezorhal/stm32f4/display/st-7789/display_fb.c

@@ -37,8 +37,6 @@
 #include "bg_copy.h"
 #endif
 
-#ifdef XFRAMEBUFFER
-
 #ifndef STM32U5
 #error Framebuffer only supported on STM32U5 for now
 #endif
@@ -218,5 +216,3 @@ void display_copy_mono4(const gl_bitblt_t *bb) {
 
   gl_rgb565_copy_mono4(&bb_new);
 }
-
-#endif  // XFRAMEBUFFER

core/embed/trezorhal/stm32f4/display/st-7789/display_nofb.c

@@ -19,8 +19,6 @@
 
 #include TREZOR_BOARD
 
-#ifdef XFRAMEBUFFER
-
 #include <xdisplay.h>
 
 #include "display_io.h"
@@ -103,5 +101,3 @@ void display_copy_mono4(const gl_bitblt_t* bb) {
     src_row += bb->src_stride / sizeof(*src_row);
   }
 }
-
-#endif  // XFRAMEBUFFER

core/site_scons/boards/trezor_t.py

@@ -42,7 +42,6 @@ def configure(
     ]
     if "new_rendering" in features_wanted:
         sources += ["embed/trezorhal/xdisplay_legacy.c"]
-        sources += ["embed/trezorhal/stm32f4/display/st-7789/display_fb.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"]

core/site_scons/boards/trezor_t3t1_revE.py

@@ -49,7 +49,6 @@ def configure(
     if "new_rendering" in features_wanted:
         sources += ["embed/trezorhal/xdisplay_legacy.c"]
         sources += ["embed/trezorhal/stm32f4/display/st-7789/display_fb.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"]

core/site_scons/boards/trezor_t3t1_v4.py

@@ -50,7 +50,6 @@ def configure(
     if "new_rendering" in features_wanted:
         sources += ["embed/trezorhal/xdisplay_legacy.c"]
         sources += ["embed/trezorhal/stm32f4/display/st-7789/display_fb.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"]