diff --git a/arch b/arch
index 64609d18df..139a8394ac 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit 64609d18df529479e9c5eccd82e67006fedd962b
+Subproject commit 139a8394acd4dff3e5983be13543d8a264681c91
diff --git a/configs b/configs
index c706f1adc1..ba2b1db6db 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit c706f1adc1ff2897ae0e69553cafc3c23bf7c455
+Subproject commit ba2b1db6db4cd8f44047f5817233a922ee69343e
diff --git a/drivers/lcd/ili9341.c b/drivers/lcd/ili9341.c
index 66c186bf40..d2039c2803 100644
--- a/drivers/lcd/ili9341.c
+++ b/drivers/lcd/ili9341.c
@@ -324,16 +324,16 @@
 /* First LCD display */
 
 #ifdef CONFIG_LCD_ILI9341_IFACE0
-#  ifdef CONFIG_LCD_ILI9341_IFACE0_LANDSCAPE
+#  if defined(CONFIG_LCD_ILI9341_IFACE0_LANDSCAPE)
 #    define ILI9341_IFACE0_ORIENT     ILI9341_MADCTL_LANDSCAPE_PARAM1
 #    define ILI9341_IFACE0_STRIDE     ILI9341_YRES
-#  elif CONFIG_LCD_ILI9341_IFACE0_PORTRAIT
+#  elif defined(CONFIG_LCD_ILI9341_IFACE0_PORTRAIT)
 #    define ILI9341_IFACE0_ORIENT     ILI9341_MADCTL_PORTRAIT_PARAM1
 #    define ILI9341_IFACE0_STRIDE     ILI9341_XRES
-#  elif CONFIG_LCD_ILI9341_IFACE0_RLANDSCAPE
+#  elif defined(CONFIG_LCD_ILI9341_IFACE0_RLANDSCAPE)
 #    define ILI9341_IFACE0_ORIENT     ILI9341_MADCTL_RLANDSCAPE_PARAM1
 #    define ILI9341_IFACE0_STRIDE     ILI9341_YRES
-#  elif CONFIG_LCD_ILI9341_IFACE0_RPORTRAIT
+#  elif defined(CONFIG_LCD_ILI9341_IFACE0_RPORTRAIT)
 #    define ILI9341_IFACE0_ORIENT     ILI9341_MADCTL_RPORTRAIT_PARAM1
 #    define ILI9341_IFACE0_STRIDE     ILI9341_XRES
 #  endif