diff --git a/core/SConscript.bootloader_emu b/core/SConscript.bootloader_emu
index d71fbc8811..fe152042c5 100644
--- a/core/SConscript.bootloader_emu
+++ b/core/SConscript.bootloader_emu
@@ -8,7 +8,7 @@ CMAKELISTS = int(ARGUMENTS.get('CMAKELISTS', 0))
 HW_REVISION = 'emulator'
 NEW_RENDERING = ARGUMENTS.get('NEW_RENDERING', '1') == '1'
 
-if TREZOR_MODEL in ('1', 'DISC1'):
+if TREZOR_MODEL in ('1', 'DISC1', 'DISC2'):
     # skip bootloader build
     env = Environment()
     def build_bootloader(target,source,env):
diff --git a/core/site_scons/models/D002/discovery2.py b/core/site_scons/models/D002/discovery2.py
index 5012021b09..0100883ad0 100644
--- a/core/site_scons/models/D002/discovery2.py
+++ b/core/site_scons/models/D002/discovery2.py
@@ -100,15 +100,15 @@ def configure(
     features_available.append("framebuffer")
     features_available.append("framebuffer32bit")
 
+    if "new_rendering" in features_wanted:
+        defines += ["XFRAMEBUFFER"]
+        defines += ["DISPLAY_RGBA8888"]
+        features_available.append("xframebuffer")
+        features_available.append("display_rgba8888")
+
     env.get("ENV")["LINKER_SCRIPT"] = linker_script
 
     defs = env.get("CPPDEFINES_IMPLICIT")
     defs += ["__ARM_FEATURE_CMSE=3"]
 
-    rust_defs = env.get("ENV")["RUST_INCLUDES"]
-    rust_defs += "-DFRAMEBUFFER;"
-    if "new_rendering" in features_wanted:
-        rust_defs += "-DXFRAMEBUFFER;"
-    env.get("ENV")["RUST_INCLUDES"] = rust_defs
-
     return features_available