2 files changed, 8 insertions, 4 deletions

diff --git a/firmware/export/config.h b/firmware/export/config.h
index 2519b87f0d..e83194e0f4 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -772,6 +772,11 @@ Lyre prototype 1 */
 #define LCD_SPLIT_LINES 0
 #endif
 
+/* Most displays have a horizontal stride */
+#ifndef LCD_STRIDEFORMAT
+# define LCD_STRIDEFORMAT HORIZONTAL_STRIDE
+#endif
+
 /* Simulator LCD dimensions. Set to standard dimensions if undefined */
 #ifndef SIM_LCD_WIDTH
 #define SIM_LCD_WIDTH LCD_WIDTH
@@ -978,8 +983,7 @@ Lyre prototype 1 */
     || defined(CPU_S5L870X) || (CONFIG_CPU == S3C2440) \
     || defined(APPLICATION) || (CONFIG_CPU == PP5002) \
     || (CONFIG_CPU == RK27XX) || (CONFIG_CPU == IMX233) ||              \
-    (defined(HAVE_LCD_COLOR) &&                                         \
-     (!defined(LCD_STRIDEFORMAT) || (LCD_STRIDEFORMAT != VERTICAL_STRIDE)))
+    (defined(HAVE_LCD_COLOR) && (LCD_STRIDEFORMAT == HORIZONTAL_STRIDE))
 #define HAVE_SEMAPHORE_OBJECTS
 #endif
 
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 0edef7b866..67b22190ad 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -82,7 +82,7 @@ enum screen_type {
 
 struct scrollinfo;
 
-#if defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE
+#if LCD_STRIDEFORMAT == VERTICAL_STRIDE
 #define STRIDE_MAIN(w, h)   (h)
 #else
 #define STRIDE_MAIN(w, h)   (w)
@@ -496,7 +496,7 @@ typedef void lcd_blockfunc_type(fb_data *address, unsigned mask, unsigned bits);
 #endif
 
 #ifndef LCD_NBELEMS
-#if defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE
+#if LCD_STRIDEFORMAT == VERTICAL_STRIDE
 #define LCD_NBELEMS(w, h) (((w-1)*STRIDE_MAIN(w, h)) + h)
 #else
 #define LCD_NBELEMS(w, h) (((h-1)*STRIDE_MAIN(w, h)) + w)