boards/esp32*: move saul_gpio dep to board level

maribu · maribu · commit 77dfc7e2a53c · 2024-05-22T13:38:33.000+02:00
The ESP32 Ethernet Kit has only a single GPIO pin exposed to SAUL via
`saul_gpio`, but that GPIO doubles as PHY clock input when `esp32_eth`
is used. Hence, the `saul_gpio` dep should be optional and only kick
in when `esp32_eth` is not used.
diff --git a/boards/common/esp32x/Makefile.dep b/boards/common/esp32x/Makefile.dep
@@ -1,5 +1 @@
 USEMODULE += boards_common_esp32x
-
-ifneq (,$(filter saul_default,$(USEMODULE)))
-  USEMODULE += saul_gpio
-endif
diff --git a/boards/esp32-ethernet-kit-v1_0/Makefile.dep b/boards/esp32-ethernet-kit-v1_0/Makefile.dep
@@ -4,3 +4,13 @@ include $(RIOTBOARD)/common/esp32/Makefile.dep
 ifneq (,$(filter netdev_default,$(USEMODULE)))
   USEMODULE += esp_eth
 endif
+
+# saul_gpio does conflict eth, as the only SAUL enabled GPIO is the boot button.
+# But that GPIO doubles as phy clock input.
+ifneq (,$(filter esp_eth,$(USEMODULE)))
+  DISABLE_MODULE += saul_gpio
+endif
+
+ifneq (,$(filter saul_default,$(USEMODULE)))
+  DEFAULT_MODULE += saul_gpio
+endif
diff --git a/boards/esp32-heltec-lora32-v2/Makefile.dep b/boards/esp32-heltec-lora32-v2/Makefile.dep
@@ -2,4 +2,8 @@ ifneq (,$(filter netdev_default,$(USEMODULE)))
   USEMODULE += sx1276
 endif
 
+ifneq (,$(filter saul_default,$(USEMODULE)))
+  USEMODULE += saul_gpio
+endif
+
 include $(RIOTBOARD)/common/esp32/Makefile.dep
diff --git a/boards/esp32-mh-et-live-minikit/Makefile.dep b/boards/esp32-mh-et-live-minikit/Makefile.dep
@@ -10,4 +10,8 @@ ifneq (,$(filter sdcard_spi,$(USEMODULE)))
   endif
 endif
 
+ifneq (,$(filter saul_default,$(USEMODULE)))
+  USEMODULE += saul_gpio
+endif
+
 include $(RIOTBOARD)/common/esp32/Makefile.dep
diff --git a/boards/esp32-ttgo-t-beam/Makefile.dep b/boards/esp32-ttgo-t-beam/Makefile.dep
@@ -2,4 +2,8 @@ ifneq (,$(filter esp32_ttgo_t_beam_v1_0,$(USEMODULE)))
   FEATURES_REQUIRED += periph_i2c
 endif
 
+ifneq (,$(filter saul_default,$(USEMODULE)))
+  USEMODULE += saul_gpio
+endif
+
 include $(RIOTBOARD)/common/esp32/Makefile.dep
diff --git a/boards/esp32-wemos-lolin-d32-pro/Makefile.dep b/boards/esp32-wemos-lolin-d32-pro/Makefile.dep
@@ -8,4 +8,8 @@ ifneq (,$(filter vfs_default,$(USEMODULE)))
   USEMODULE += mtd
 endif
 
+ifneq (,$(filter saul_default,$(USEMODULE)))
+  USEMODULE += saul_gpio
+endif
+
 include $(RIOTBOARD)/common/esp32/Makefile.dep
diff --git a/boards/esp32-wroom-32/Makefile.dep b/boards/esp32-wroom-32/Makefile.dep
@@ -1 +1,5 @@
 include $(RIOTBOARD)/common/esp32/Makefile.dep
+
+ifneq (,$(filter saul_default,$(USEMODULE)))
+  USEMODULE += saul_gpio
+endif
diff --git a/boards/esp32-wrover-kit/Makefile.dep b/boards/esp32-wrover-kit/Makefile.dep
@@ -18,4 +18,8 @@ ifneq (,$(filter mtd,$(USEMODULE)))
   endif
 endif
 
+ifneq (,$(filter saul_default,$(USEMODULE)))
+  USEMODULE += saul_gpio
+endif
+
 include $(RIOTBOARD)/common/esp32/Makefile.dep
diff --git a/boards/esp32c3-devkit/Makefile.dep b/boards/esp32c3-devkit/Makefile.dep
@@ -1 +1,5 @@
 include $(RIOTBOARD)/common/esp32c3/Makefile.dep
+
+ifneq (,$(filter saul_default,$(USEMODULE)))
+  USEMODULE += saul_gpio
+endif
diff --git a/boards/esp32c3-wemos-mini/Makefile.dep b/boards/esp32c3-wemos-mini/Makefile.dep
@@ -7,4 +7,8 @@ ifeq (,$(filter esp32c3_wemos_mini_v%,$(USEMODULE)))
   USEMODULE += esp32c3_wemos_mini_v2_1_0
 endif
 
+ifneq (,$(filter saul_default,$(USEMODULE)))
+  USEMODULE += saul_gpio
+endif
+
 include $(RIOTBOARD)/common/esp32c3/Makefile.dep
diff --git a/boards/esp32s2-devkit/Makefile.dep b/boards/esp32s2-devkit/Makefile.dep
@@ -1 +1,5 @@
 include $(RIOTBOARD)/common/esp32s2/Makefile.dep
+
+ifneq (,$(filter saul_default,$(USEMODULE)))
+  USEMODULE += saul_gpio
+endif
diff --git a/boards/esp32s2-lilygo-ttgo-t8/Makefile.dep b/boards/esp32s2-lilygo-ttgo-t8/Makefile.dep
@@ -16,4 +16,8 @@ ifneq (,$(filter disp_dev,$(USEMODULE)))
   USEMODULE += st7789
 endif
 
+ifneq (,$(filter saul_default,$(USEMODULE)))
+  USEMODULE += saul_gpio
+endif
+
 include $(RIOTBOARD)/common/esp32s2/Makefile.dep
diff --git a/boards/esp32s2-wemos-mini/Makefile.dep b/boards/esp32s2-wemos-mini/Makefile.dep
@@ -1,2 +1,6 @@
 include $(RIOTBOARD)/common/makefiles/stdio_tinyusb_cdc_acm.dep.mk
 include $(RIOTBOARD)/common/esp32s2/Makefile.dep
+
+ifneq (,$(filter saul_default,$(USEMODULE)))
+  USEMODULE += saul_gpio
+endif
diff --git a/boards/esp32s3-box/Makefile.dep b/boards/esp32s3-box/Makefile.dep
@@ -14,5 +14,9 @@ ifneq (,$(filter disp_dev,$(USEMODULE)))
   USEMODULE += ili9341
 endif
 
+ifneq (,$(filter saul_default,$(USEMODULE)))
+  USEMODULE += saul_gpio
+endif
+
 include $(RIOTBOARD)/common/esp32s3/Makefile.dep
 include $(RIOTBOARD)/common/makefiles/stdio_cdc_acm.dep.mk
diff --git a/boards/esp32s3-devkit/Makefile.dep b/boards/esp32s3-devkit/Makefile.dep
@@ -1 +1,5 @@
 include $(RIOTBOARD)/common/esp32s3/Makefile.dep
+
+ifneq (,$(filter saul_default,$(USEMODULE)))
+  USEMODULE += saul_gpio
+endif
diff --git a/boards/esp32s3-pros3/Makefile.dep b/boards/esp32s3-pros3/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 saul_default,$(USEMODULE)))
+  USEMODULE += saul_gpio
+endif
+
 include $(RIOTBOARD)/common/esp32s3/Makefile.dep
 include $(RIOTBOARD)/common/makefiles/stdio_cdc_acm.dep.mk
diff --git a/boards/esp32s3-usb-otg/Makefile.dep b/boards/esp32s3-usb-otg/Makefile.dep
@@ -26,3 +26,7 @@ endif
 ifneq (,$(filter disp_dev,$(USEMODULE)))
   USEMODULE += st7789
 endif
+
+ifneq (,$(filter saul_default,$(USEMODULE)))
+  USEMODULE += saul_gpio
+endif
diff --git a/boards/esp32s3-wt32-sc01-plus/Makefile.dep b/boards/esp32s3-wt32-sc01-plus/Makefile.dep
@@ -39,3 +39,7 @@ endif
 ifneq (,$(filter periph_i2c,$(USEMODULE)))
   USEMODULE += esp_i2c_hw
 endif
+
+ifneq (,$(filter saul_default,$(USEMODULE)))
+  USEMODULE += saul_gpio
+endif
diff --git a/boards/hip-badge/Makefile.dep b/boards/hip-badge/Makefile.dep
@@ -4,6 +4,7 @@ endif
 
 ifneq (,$(filter saul_default,$(USEMODULE)))
   USEMODULE += sgp30
+  USEMODULE += saul_gpio
 endif
 
 include $(RIOTBOARD)/common/esp32c3/Makefile.dep
