3 files changed, 8 insertions, 3 deletions

diff --git a/firmware/export/config/sansae200v2.h b/firmware/export/config/sansae200v2.h
index 00833d56a6..e7ff291cc7 100644
--- a/firmware/export/config/sansae200v2.h
+++ b/firmware/export/config/sansae200v2.h
@@ -65,14 +65,17 @@
 #define HAVE_LCD_SLEEP
 #define HAVE_LCD_SLEEP_SETTING
  */
-#endif
 
 /* define this if you can flip your LCD */
 #define HAVE_LCD_FLIP
 
 /* define this if you can invert the colours on your LCD */
 #define HAVE_LCD_INVERT
-
+#else /* !BOOTLOADER */
+#define DISABLE_ALPHA_BITMAP
+#define DISABLE_LOGO
+#define DISABLE_BACKTRACE
+#endif /* !BOOTLOADER */
 /* put the lcd frame buffer in IRAM */
 #define IRAM_LCDFRAMEBUFFER IBSS_ATTR
 
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 67b22190ad..05d12cc2ec 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -237,7 +237,7 @@ extern bool lcd_putsxy_scroll_func(int x, int y, const unsigned char *string,
 
 /* performance function */
 #if defined(HAVE_LCD_COLOR)
-#if MEMORYSIZE > 2
+#if MEMORYSIZE > 2 && !defined(BOOTLOADER)
 #define LCD_YUV_DITHER 0x1
     extern void lcd_yuv_set_options(unsigned options);
     extern void lcd_blit_yuv(unsigned char * const src[3],
diff --git a/firmware/export/system.h b/firmware/export/system.h
index 172fe05b6e..552540a1db 100644
--- a/firmware/export/system.h
+++ b/firmware/export/system.h
@@ -266,8 +266,10 @@ static inline void cpu_boost_unlock(void)
 /* Define this if target has support for generating backtraces */
 #if defined(CPU_ARM) || \
     (defined(CPU_MIPS) && (CONFIG_PLATFORM & PLATFORM_NATIVE))
+#ifndef DISABLE_BACKTRACE
     #define HAVE_RB_BACKTRACE
 #endif
+#endif
 
 #ifndef MIN_STACK_ALIGN
 #define MIN_STACK_ALIGN (sizeof (uintptr_t))