6 files changed, 13 insertions, 4 deletions

diff --git a/firmware/export/backlight.h b/firmware/export/backlight.h
index a177fe740f..506a9f6b03 100644
--- a/firmware/export/backlight.h
+++ b/firmware/export/backlight.h
@@ -43,8 +43,6 @@ void backlight_set_fade_in(bool value);
 void backlight_set_fade_out(bool value);
 #endif
 
-extern int backlight_brightness;
-
 void backlight_set_timeout_plugged(int value);
 
 #ifdef HAS_BUTTON_HOLD
@@ -82,6 +80,7 @@ void sim_remote_backlight(int value);
 #endif
 
 #ifdef HAVE_BACKLIGHT_BRIGHTNESS
+extern int backlight_brightness;
 void backlight_set_brightness(int val);
 #endif /* HAVE_BACKLIGHT_BRIGHTNESS */
 
diff --git a/firmware/export/config-c200.h b/firmware/export/config-c200.h
index 8e26585e94..e169606510 100644
--- a/firmware/export/config-c200.h
+++ b/firmware/export/config-c200.h
@@ -134,7 +134,9 @@
 
 /* define this if the backlight thread is used for fade, not for sim, needs
  * HAVE_BACKLIGHT_BRIGHTNESS */
+#ifndef BOOTLOADER
 #define USE_BACKLIGHT_SW_FADING
+#endif
 
 /* Define this if you have a PortalPlayer PP5024 */
 #define CONFIG_CPU PP5022
diff --git a/firmware/export/config-cowond2.h b/firmware/export/config-cowond2.h
index b723201340..c6e4555f18 100644
--- a/firmware/export/config-cowond2.h
+++ b/firmware/export/config-cowond2.h
@@ -124,7 +124,9 @@
 
 /* define this if the backlight thread is used for fade, not for sim, needs
  * HAVE_BACKLIGHT_BRIGHTNESS */
+#ifndef BOOTLOADER
 #define USE_BACKLIGHT_SW_FADING
+#endif
 
 /* Define this if you have a TCC7801 */
 #define CONFIG_CPU TCC7801
diff --git a/firmware/export/config-e200.h b/firmware/export/config-e200.h
index d9bebef9bc..3cae14cc87 100644
--- a/firmware/export/config-e200.h
+++ b/firmware/export/config-e200.h
@@ -131,7 +131,9 @@
 
 /* define this if the backlight thread is used for fade, not for sim, needs
  * HAVE_BACKLIGHT_BRIGHTNESS */
+#ifndef BOOTLOADER
 #define USE_BACKLIGHT_SW_FADING
+#endif
 
 /* Define this if you have a PortalPlayer PP5024 */
 #define CONFIG_CPU PP5024
diff --git a/firmware/export/config-h300.h b/firmware/export/config-h300.h
index 2af426f048..680ca91245 100644
--- a/firmware/export/config-h300.h
+++ b/firmware/export/config-h300.h
@@ -116,8 +116,9 @@
 
 /* define this if the backlight thread is used for fade, not for sim, needs
  * HAVE_BACKLIGHT_BRIGHTNESS */
+#ifndef BOOTLOADER
 #define USE_BACKLIGHT_SW_FADING
-
+#endif
 
 /* Define this if your LCD can be enabled/disabled */
 #define HAVE_LCD_ENABLE
diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h
index 089d219534..03b84606c9 100644
--- a/firmware/export/config-iaudiox5.h
+++ b/firmware/export/config-iaudiox5.h
@@ -124,8 +124,11 @@
 
 #ifndef SIMULATOR
 
-/* define this if the backlight thread is used for fade, not for sim */
+/* define this if the backlight thread is used for fade, not for sim, needs
+ * HAVE_BACKLIGHT_BRIGHTNESS */
+#ifndef BOOTLOADER
 #define USE_BACKLIGHT_SW_FADING
+#endif
 
 /* Define this if your LCD can set contrast */
 #define HAVE_LCD_CONTRAST