fix(core): don't use RSOD_INFINITE_LOOP on models using DSI/LTDC disp…

…lays [no changelog]
trezor · Feb 6, 2025 · 85bbc89 · 85bbc89
1 parent ef1f44c
commit 85bbc89
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/core/embed/models/T2B1/model_T2B1.h b/core/embed/models/T2B1/model_T2B1.h
@@ -27,6 +27,7 @@
 #define IMAGE_HASH_BLAKE2S
 
 #define DISPLAY_JUMP_BEHAVIOR DISPLAY_RETAIN_CONTENT
+#define RSOD_INFINITE_LOOP 1
 
 // SHARED WITH MAKEFILE
 // common

diff --git a/core/embed/models/T2T1/model_T2T1.h b/core/embed/models/T2T1/model_T2T1.h
@@ -27,6 +27,7 @@
 #define IMAGE_HASH_BLAKE2S
 
 #define DISPLAY_JUMP_BEHAVIOR DISPLAY_RETAIN_CONTENT
+#define RSOD_INFINITE_LOOP 1
 
 // SHARED WITH MAKEFILE
 // common

diff --git a/core/embed/models/T3B1/model_T3B1.h b/core/embed/models/T3B1/model_T3B1.h
@@ -28,6 +28,7 @@
 #define IMAGE_HASH_SHA256
 
 #define DISPLAY_JUMP_BEHAVIOR DISPLAY_RETAIN_CONTENT
+#define RSOD_INFINITE_LOOP 1
 
 // SHARED WITH MAKEFILE, LINKER SCRIPT etc.
 // misc

diff --git a/core/embed/models/T3T1/model_T3T1.h b/core/embed/models/T3T1/model_T3T1.h
@@ -28,6 +28,7 @@
 #define IMAGE_HASH_SHA256
 
 #define DISPLAY_JUMP_BEHAVIOR DISPLAY_RETAIN_CONTENT
+#define RSOD_INFINITE_LOOP 1
 
 // SHARED WITH MAKEFILE, LINKER SCRIPT etc.
 // misc

diff --git a/core/embed/sys/startup/stm32/bootutils.c b/core/embed/sys/startup/stm32/bootutils.c
@@ -35,8 +35,10 @@
 
 // Battery powered devices (USE_POWERCTL) should not stall
 // after showing RSOD, as it would drain the battery.
-#ifndef USE_POWERCTL
-#define RSOD_INFINITE_LOOP
+#ifdef USE_POWERCTL
+#ifdef RSOD_INFINITE_LOOP
+#error "RSOD_INFINITE_LOOP is not supported on battery powered devices"
+#endif
 #endif
 
 #ifdef STM32U5