From cce395da896a2df9b60ab262838e900d6bbfc4bc Mon Sep 17 00:00:00 2001
From: Marian Buschsieweke <marian.buschsieweke@posteo.net>
Date: Sun, 9 Jul 2023 11:33:12 +0200
Subject: [PATCH 1/3] boards/esp32s3-box: select ili9341 when disp_dev is used

This matches the behavior when KConfig is used.
---
 boards/esp32s3-box/Makefile.dep | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/boards/esp32s3-box/Makefile.dep b/boards/esp32s3-box/Makefile.dep
index 76baa9818f..375667ef06 100644
--- a/boards/esp32s3-box/Makefile.dep
+++ b/boards/esp32s3-box/Makefile.dep
@@ -10,5 +10,9 @@ ifeq (,$(filter stdio_% slipdev_stdio usbus usbus% tinyusb_device,$(USEMODULE)))
   # include $(RIOTMAKE)/tools/usb_board_reset.mk
 endif
 
+ifneq (,$(filter disp_dev,$(USEMODULE)))
+  USEMODULE += ili9341
+endif
+
 include $(RIOTBOARD)/common/esp32s3/Makefile.dep
 include $(RIOTBOARD)/common/makefiles/stdio_cdc_acm.dep.mk

From 69fb00bdfa13c5e83409fd6b5bd5068cf00fc08b Mon Sep 17 00:00:00 2001
From: Marian Buschsieweke <marian.buschsieweke@posteo.net>
Date: Sun, 9 Jul 2023 11:36:12 +0200
Subject: [PATCH 2/3] boards/sipeed-longan-nano: default to variant with TFT

Without KConfig presence of the TFT is assumed in anycase, with KConfig
it is optional. This turns the opt-in into an opt-out to match behavior
with make by default, fixing the nightly breakage.
---
 boards/sipeed-longan-nano/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boards/sipeed-longan-nano/Kconfig b/boards/sipeed-longan-nano/Kconfig
index eb126d4ac7..0899330d76 100644
--- a/boards/sipeed-longan-nano/Kconfig
+++ b/boards/sipeed-longan-nano/Kconfig
@@ -38,6 +38,7 @@ menu "Sipeed Longan Nano Board Configuration"
 
     config SIPEED_LONGAN_NANO_WITH_TFT
         bool "Board with TFT display"
+        default y
         select HAVE_ST7735
         help
             Indicates that a Sipeed Longan Nano board with TFT display is used.

From ca07f77f486cae1498e2bba4f20c951166532bea Mon Sep 17 00:00:00 2001
From: Marian Buschsieweke <marian.buschsieweke@posteo.net>
Date: Sun, 9 Jul 2023 11:48:19 +0200
Subject: [PATCH 3/3] drivers/st7735: fix inconsistency in dependency modeling

In KConfig `MODULE_ST7789` now is hidden module that automatically
gets selected when `HAVE_ST7789` is selected in `MODULE_ST7735` is used.

Co-authored-by: Gunar Schorcht <gunar@schorcht.net>
---
 drivers/st7735/Kconfig | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/st7735/Kconfig b/drivers/st7735/Kconfig
index 40fa5643b7..1c873ac3f0 100644
--- a/drivers/st7735/Kconfig
+++ b/drivers/st7735/Kconfig
@@ -23,12 +23,15 @@ config HAVE_ST7735
       Indicates that an ST7735 display is present.
 
 config MODULE_ST7789
-    bool "ST7789 display driver"
-    select MODULE_ST7735
+    bool
+    depends on HAVE_ST7789
+    default y if MODULE_ST7735
+    help
+        ST7789 display driver
 
 config HAVE_ST7789
     bool
-    select MODULE_ST7789 if MODULE_DISP_DEV
+    select MODULE_ST7735 if MODULE_DISP_DEV
     help
       Indicates that an ST7789 display is present.