From 1434f786650e511c279eddd8039d28bedd7d2371 Mon Sep 17 00:00:00 2001 From: crasbe Date: Thu, 30 Oct 2025 16:17:48 +0100 Subject: [PATCH 1/2] DELETEME: build ESP32 based boards --- .murdock | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/.murdock b/.murdock index 416a7cffbfbf..201ed1731766 100755 --- a/.murdock +++ b/.murdock @@ -6,21 +6,31 @@ #export APPS="examples/basic/hello-world tests/unittests" QUICKBUILD_BOARDS=" -adafruit-itsybitsy-m4 -atmega256rfr2-xpro +arduino-nano-esp32 +esp32-ethernet-kit-v1_0 +esp32-ethernet-kit-v1_1 +esp32-ethernet-kit-v1_2 +esp32-heltec-lora32-v2 +esp32-mh-et-live-minikit +esp32-olimex-evb +esp32-ttgo-t-beam +esp32-wemos-d1-r32 +esp32-wemos-lolin-d32-pro esp32-wroom-32 +esp32-wrover-kit +esp32c3-devkit +esp32c3-wemos-mini +esp32c6-devkit +esp32h2-devkit +esp32s2-devkit +esp32s2-lilygo-ttgo-t8 +esp32s2-wemos-mini +esp32s3-box esp32s3-devkit -frdm-k64f -hifive1b -msb-430 -msba2 -native32 -native64 -nrf52840dk -qn9080dk -samr21-xpro -stk3200 -stm32f429i-disc1" +esp32s3-pros3 +esp32s3-usb-otg +esp32s3-wt32-sc01-plus +seeedstudio-xiao-esp32c3" # this configures boards that are available via pifleet case "${CI_MURDOCK_PROJECT}" in From ff6abd93bbf7464018ff779ef7aab0148c6f2d54 Mon Sep 17 00:00:00 2001 From: crasbe Date: Thu, 30 Oct 2025 16:13:05 +0100 Subject: [PATCH 2/2] boards: migrate ESP32 based boards to common board module system --- boards/Makefile | 21 +++++++++++++++++++ boards/Makefile.dep | 21 +++++++++++++++++++ boards/Makefile.features | 21 +++++++++++++++++++ boards/Makefile.include | 21 +++++++++++++++++++ boards/arduino-nano-esp32/Makefile | 2 -- boards/arduino-nano-esp32/Makefile.dep | 3 ++- boards/arduino-nano-esp32/Makefile.include | 2 -- boards/common/esp32/Makefile | 2 -- boards/common/esp32/Makefile.dep | 4 +--- boards/common/esp32/Makefile.include | 2 -- boards/common/esp32c3/Makefile | 2 -- boards/common/esp32c3/Makefile.dep | 4 +--- boards/common/esp32c3/Makefile.include | 2 -- boards/common/esp32c6/Makefile | 2 -- boards/common/esp32c6/Makefile.dep | 4 +--- boards/common/esp32c6/Makefile.include | 2 -- boards/common/esp32h2/Makefile | 2 -- boards/common/esp32h2/Makefile.dep | 4 +--- boards/common/esp32h2/Makefile.include | 2 -- boards/common/esp32s2/Makefile | 2 -- boards/common/esp32s2/Makefile.dep | 4 +--- boards/common/esp32s2/Makefile.include | 2 -- boards/common/esp32s3/Makefile | 2 -- boards/common/esp32s3/Makefile.dep | 4 +--- boards/common/esp32s3/Makefile.include | 2 -- boards/common/esp32x/Makefile.dep | 1 - boards/esp32-ethernet-kit-v1_0/Makefile | 2 -- boards/esp32-ethernet-kit-v1_0/Makefile.dep | 2 +- .../esp32-ethernet-kit-v1_0/Makefile.include | 3 --- boards/esp32-ethernet-kit-v1_1/Makefile | 2 ++ boards/esp32-ethernet-kit-v1_2/Makefile | 2 ++ boards/esp32-heltec-lora32-v2/Makefile | 2 -- boards/esp32-heltec-lora32-v2/Makefile.dep | 2 +- .../esp32-heltec-lora32-v2/Makefile.include | 1 - boards/esp32-mh-et-live-minikit/Makefile | 2 -- boards/esp32-mh-et-live-minikit/Makefile.dep | 2 +- .../esp32-mh-et-live-minikit/Makefile.include | 2 -- boards/esp32-olimex-evb/Makefile | 2 -- boards/esp32-olimex-evb/Makefile.dep | 4 ++-- boards/esp32-olimex-evb/Makefile.include | 2 -- boards/esp32-ttgo-t-beam/Makefile | 2 -- boards/esp32-ttgo-t-beam/Makefile.dep | 2 +- boards/esp32-ttgo-t-beam/Makefile.include | 2 -- boards/esp32-wemos-d1-r32/Makefile | 2 -- boards/esp32-wemos-d1-r32/Makefile.dep | 4 ++-- boards/esp32-wemos-d1-r32/Makefile.include | 2 -- boards/esp32-wemos-lolin-d32-pro/Makefile | 2 -- boards/esp32-wemos-lolin-d32-pro/Makefile.dep | 2 +- .../Makefile.include | 2 -- boards/esp32-wroom-32/Makefile | 2 -- boards/esp32-wroom-32/Makefile.dep | 4 ++-- boards/esp32-wroom-32/Makefile.include | 2 -- boards/esp32-wrover-kit/Makefile | 2 -- boards/esp32-wrover-kit/Makefile.dep | 2 +- boards/esp32-wrover-kit/Makefile.include | 2 -- boards/esp32c3-devkit/Makefile | 2 -- boards/esp32c3-devkit/Makefile.dep | 4 ++-- boards/esp32c3-devkit/Makefile.include | 2 -- boards/esp32c3-wemos-mini/Makefile | 2 -- boards/esp32c3-wemos-mini/Makefile.dep | 2 +- boards/esp32c3-wemos-mini/Makefile.include | 2 -- boards/esp32c6-devkit/Makefile | 2 -- boards/esp32c6-devkit/Makefile.dep | 4 ++-- boards/esp32c6-devkit/Makefile.include | 2 -- boards/esp32h2-devkit/Makefile | 2 -- boards/esp32h2-devkit/Makefile.dep | 4 ++-- boards/esp32h2-devkit/Makefile.include | 2 -- boards/esp32s2-devkit/Makefile | 2 -- boards/esp32s2-devkit/Makefile.dep | 4 ++-- boards/esp32s2-devkit/Makefile.include | 2 -- boards/esp32s2-lilygo-ttgo-t8/Makefile | 2 -- boards/esp32s2-lilygo-ttgo-t8/Makefile.dep | 2 +- .../esp32s2-lilygo-ttgo-t8/Makefile.include | 2 -- boards/esp32s2-wemos-mini/Makefile | 2 -- boards/esp32s2-wemos-mini/Makefile.dep | 3 ++- boards/esp32s2-wemos-mini/Makefile.include | 2 -- boards/esp32s3-box/Makefile | 2 -- boards/esp32s3-box/Makefile.dep | 3 ++- boards/esp32s3-box/Makefile.include | 2 -- boards/esp32s3-devkit/Makefile | 2 -- boards/esp32s3-devkit/Makefile.dep | 4 ++-- boards/esp32s3-devkit/Makefile.include | 2 -- boards/esp32s3-pros3/Makefile | 2 -- boards/esp32s3-pros3/Makefile.dep | 3 ++- boards/esp32s3-pros3/Makefile.include | 2 -- boards/esp32s3-usb-otg/Makefile | 2 -- boards/esp32s3-usb-otg/Makefile.dep | 3 ++- boards/esp32s3-usb-otg/Makefile.include | 2 -- boards/esp32s3-wt32-sc01-plus/Makefile | 2 -- boards/esp32s3-wt32-sc01-plus/Makefile.dep | 3 ++- .../esp32s3-wt32-sc01-plus/Makefile.include | 2 -- boards/seeedstudio-xiao-esp32c3/Makefile | 2 -- boards/seeedstudio-xiao-esp32c3/Makefile.dep | 2 +- .../seeedstudio-xiao-esp32c3/Makefile.include | 2 -- 94 files changed, 131 insertions(+), 166 deletions(-) diff --git a/boards/Makefile b/boards/Makefile index ae92f259427e..04eb6db8188f 100644 --- a/boards/Makefile +++ b/boards/Makefile @@ -6,6 +6,27 @@ DIRS += $(RIOTBOARD)/common/init ifneq (,$(filter boards_common_adafruit-nrf52-bootloader,$(USEMODULE))) DIRS += $(RIOTBOARD)/common/adafruit-nrf52-bootloader endif +ifneq (,$(filter boards_common_esp32,$(USEMODULE))) + DIRS += $(RIOTBOARD)/common/esp32 +endif +ifneq (,$(filter boards_common_esp32c3,$(USEMODULE))) + DIRS += $(RIOTBOARD)/common/esp32c3 +endif +ifneq (,$(filter boards_common_esp32c6,$(USEMODULE))) + DIRS += $(RIOTBOARD)/common/esp32c6 +endif +ifneq (,$(filter boards_common_esp32h2,$(USEMODULE))) + DIRS += $(RIOTBOARD)/common/esp32h2 +endif +ifneq (,$(filter boards_common_esp32s2,$(USEMODULE))) + DIRS += $(RIOTBOARD)/common/esp32s2 +endif +ifneq (,$(filter boards_common_esp32s3,$(USEMODULE))) + DIRS += $(RIOTBOARD)/common/esp32s3 +endif +ifneq (,$(filter boards_common_esp32x,$(USEMODULE))) + DIRS += $(RIOTBOARD)/common/esp32x +endif ifneq (,$(filter boards_common_seeedstudio-xiao-nrf52840,$(USEMODULE))) DIRS += $(RIOTBOARD)/common/seeedstudio-xiao-nrf52840 endif diff --git a/boards/Makefile.dep b/boards/Makefile.dep index 062278e48135..cf3a8eece7a6 100644 --- a/boards/Makefile.dep +++ b/boards/Makefile.dep @@ -2,6 +2,27 @@ ifneq (,$(filter boards_common_adafruit-nrf52-bootloader,$(USEMODULE))) include $(RIOTBOARD)/common/adafruit-nrf52-bootloader/Makefile.dep endif +ifneq (,$(filter boards_common_esp32,$(USEMODULE))) + include $(RIOTBOARD)/common/esp32/Makefile.dep +endif +ifneq (,$(filter boards_common_esp32c3,$(USEMODULE))) + include $(RIOTBOARD)/common/esp32c3/Makefile.dep +endif +ifneq (,$(filter boards_common_esp32c6,$(USEMODULE))) + include $(RIOTBOARD)/common/esp32c6/Makefile.dep +endif +ifneq (,$(filter boards_common_esp32h2,$(USEMODULE))) + include $(RIOTBOARD)/common/esp32h2/Makefile.dep +endif +ifneq (,$(filter boards_common_esp32s2,$(USEMODULE))) + include $(RIOTBOARD)/common/esp32s2/Makefile.dep +endif +ifneq (,$(filter boards_common_esp32s3,$(USEMODULE))) + include $(RIOTBOARD)/common/esp32s3/Makefile.dep +endif +ifneq (,$(filter boards_common_esp32x,$(USEMODULE))) + include $(RIOTBOARD)/common/esp32x/Makefile.dep +endif ifneq (,$(filter boards_common_seeedstudio-xiao-nrf52840,$(USEMODULE))) include $(RIOTBOARD)/common/seeedstudio-xiao-nrf52840/Makefile.dep endif diff --git a/boards/Makefile.features b/boards/Makefile.features index 895bb1116850..3f3fb5cc2e44 100644 --- a/boards/Makefile.features +++ b/boards/Makefile.features @@ -1,4 +1,25 @@ # SORT THIS ALPHABETICALLY BY COMMON BOARD NAME! +ifneq (,$(filter boards_common_esp32,$(USEMODULE))) + include $(RIOTBOARD)/common/esp32/Makefile.features +endif +ifneq (,$(filter boards_common_esp32c3,$(USEMODULE))) + include $(RIOTBOARD)/common/esp32c3/Makefile.features +endif +ifneq (,$(filter boards_common_esp32c6,$(USEMODULE))) + include $(RIOTBOARD)/common/esp32c6/Makefile.features +endif +ifneq (,$(filter boards_common_esp32h2,$(USEMODULE))) + include $(RIOTBOARD)/common/esp32h2/Makefile.features +endif +ifneq (,$(filter boards_common_esp32s2,$(USEMODULE))) + include $(RIOTBOARD)/common/esp32s2/Makefile.features +endif +ifneq (,$(filter boards_common_esp32s3,$(USEMODULE))) + include $(RIOTBOARD)/common/esp32s3/Makefile.features +endif +ifneq (,$(filter boards_common_esp32x,$(USEMODULE))) + include $(RIOTBOARD)/common/esp32x/Makefile.features +endif ifneq (,$(filter boards_common_seeedstudio-xiao-nrf52840,$(USEMODULE))) include $(RIOTBOARD)/common/seeedstudio-xiao-nrf52840/Makefile.features endif diff --git a/boards/Makefile.include b/boards/Makefile.include index 4fb738b7adb0..c22abd106ecb 100644 --- a/boards/Makefile.include +++ b/boards/Makefile.include @@ -2,6 +2,27 @@ ifneq (,$(filter boards_common_adafruit-nrf52-bootloader,$(USEMODULE))) include $(RIOTBOARD)/common/adafruit-nrf52-bootloader/Makefile.include endif +ifneq (,$(filter boards_common_esp32,$(USEMODULE))) + include $(RIOTBOARD)/common/esp32/Makefile.include +endif +ifneq (,$(filter boards_common_esp32c3,$(USEMODULE))) + include $(RIOTBOARD)/common/esp32c3/Makefile.include +endif +ifneq (,$(filter boards_common_esp32c6,$(USEMODULE))) + include $(RIOTBOARD)/common/esp32c6/Makefile.include +endif +ifneq (,$(filter boards_common_esp32h2,$(USEMODULE))) + include $(RIOTBOARD)/common/esp32h2/Makefile.include +endif +ifneq (,$(filter boards_common_esp32s2,$(USEMODULE))) + include $(RIOTBOARD)/common/esp32s2/Makefile.include +endif +ifneq (,$(filter boards_common_esp32s3,$(USEMODULE))) + include $(RIOTBOARD)/common/esp32s3/Makefile.include +endif +ifneq (,$(filter boards_common_esp32x,$(USEMODULE))) + include $(RIOTBOARD)/common/esp32x/Makefile.include +endif ifneq (,$(filter boards_common_seeedstudio-xiao-nrf52840,$(USEMODULE))) include $(RIOTBOARD)/common/seeedstudio-xiao-nrf52840/Makefile.include endif diff --git a/boards/arduino-nano-esp32/Makefile b/boards/arduino-nano-esp32/Makefile index a8b9d8fbed28..f8fcbb53a065 100644 --- a/boards/arduino-nano-esp32/Makefile +++ b/boards/arduino-nano-esp32/Makefile @@ -1,5 +1,3 @@ MODULE = board -DIRS = $(RIOTBOARD)/common/esp32s3 - include $(RIOTBASE)/Makefile.base diff --git a/boards/arduino-nano-esp32/Makefile.dep b/boards/arduino-nano-esp32/Makefile.dep index 14a46b01477c..70098172d4c5 100644 --- a/boards/arduino-nano-esp32/Makefile.dep +++ b/boards/arduino-nano-esp32/Makefile.dep @@ -2,5 +2,6 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif +USEMODULE += boards_common_esp32s3 + include $(RIOTBOARD)/common/esp32s3/stdio_esp32s3_default.dep.mk -include $(RIOTBOARD)/common/esp32s3/Makefile.dep diff --git a/boards/arduino-nano-esp32/Makefile.include b/boards/arduino-nano-esp32/Makefile.include index 9f8b9c9191b9..5a887403aa8e 100644 --- a/boards/arduino-nano-esp32/Makefile.include +++ b/boards/arduino-nano-esp32/Makefile.include @@ -4,5 +4,3 @@ FLASH_SIZE ?= 16 PORT_LINUX ?= /dev/ttyACM0 OPENOCD_CONFIG ?= board/esp32s3-builtin.cfg - -include $(RIOTBOARD)/common/esp32s3/Makefile.include diff --git a/boards/common/esp32/Makefile b/boards/common/esp32/Makefile index e5d7fa66732d..765715e31582 100644 --- a/boards/common/esp32/Makefile +++ b/boards/common/esp32/Makefile @@ -1,5 +1,3 @@ MODULE = boards_common_esp32 -DIRS = $(RIOTBOARD)/common/esp32x - include $(RIOTBASE)/Makefile.base diff --git a/boards/common/esp32/Makefile.dep b/boards/common/esp32/Makefile.dep index 75223137e08a..d4ad27b75285 100644 --- a/boards/common/esp32/Makefile.dep +++ b/boards/common/esp32/Makefile.dep @@ -1,3 +1 @@ -USEMODULE += boards_common_esp32 - -include $(RIOTBOARD)/common/esp32x/Makefile.dep +USEMODULE += boards_common_esp32x diff --git a/boards/common/esp32/Makefile.include b/boards/common/esp32/Makefile.include index 9b9467b6bd05..99f065f4194f 100644 --- a/boards/common/esp32/Makefile.include +++ b/boards/common/esp32/Makefile.include @@ -1,3 +1 @@ INCLUDES += -I$(RIOTBOARD)/common/esp32/include - -include $(RIOTBOARD)/common/esp32x/Makefile.include diff --git a/boards/common/esp32c3/Makefile b/boards/common/esp32c3/Makefile index ca9b5d623320..6388618e79e9 100644 --- a/boards/common/esp32c3/Makefile +++ b/boards/common/esp32c3/Makefile @@ -1,5 +1,3 @@ MODULE = boards_common_esp32c3 -DIRS = $(RIOTBOARD)/common/esp32x - include $(RIOTBASE)/Makefile.base diff --git a/boards/common/esp32c3/Makefile.dep b/boards/common/esp32c3/Makefile.dep index 9e9617fb1a37..d4ad27b75285 100644 --- a/boards/common/esp32c3/Makefile.dep +++ b/boards/common/esp32c3/Makefile.dep @@ -1,3 +1 @@ -USEMODULE += boards_common_esp32c3 - -include $(RIOTBOARD)/common/esp32x/Makefile.dep +USEMODULE += boards_common_esp32x diff --git a/boards/common/esp32c3/Makefile.include b/boards/common/esp32c3/Makefile.include index 65cd66d0e5d7..f9587cfd4165 100644 --- a/boards/common/esp32c3/Makefile.include +++ b/boards/common/esp32c3/Makefile.include @@ -1,3 +1 @@ INCLUDES += -I$(RIOTBOARD)/common/esp32c3/include - -include $(RIOTBOARD)/common/esp32x/Makefile.include diff --git a/boards/common/esp32c6/Makefile b/boards/common/esp32c6/Makefile index 02e09b08ba1c..dfc069defb22 100644 --- a/boards/common/esp32c6/Makefile +++ b/boards/common/esp32c6/Makefile @@ -1,5 +1,3 @@ MODULE = boards_common_esp32c6 -DIRS = $(RIOTBOARD)/common/esp32x - include $(RIOTBASE)/Makefile.base diff --git a/boards/common/esp32c6/Makefile.dep b/boards/common/esp32c6/Makefile.dep index 43be8f58bc8a..d4ad27b75285 100644 --- a/boards/common/esp32c6/Makefile.dep +++ b/boards/common/esp32c6/Makefile.dep @@ -1,3 +1 @@ -USEMODULE += boards_common_esp32c6 - -include $(RIOTBOARD)/common/esp32x/Makefile.dep +USEMODULE += boards_common_esp32x diff --git a/boards/common/esp32c6/Makefile.include b/boards/common/esp32c6/Makefile.include index acef63f895dd..6657757981b0 100644 --- a/boards/common/esp32c6/Makefile.include +++ b/boards/common/esp32c6/Makefile.include @@ -1,3 +1 @@ INCLUDES += -I$(RIOTBOARD)/common/esp32c6/include - -include $(RIOTBOARD)/common/esp32x/Makefile.include diff --git a/boards/common/esp32h2/Makefile b/boards/common/esp32h2/Makefile index 1784a6118d3b..ae19ad641730 100644 --- a/boards/common/esp32h2/Makefile +++ b/boards/common/esp32h2/Makefile @@ -1,5 +1,3 @@ MODULE = boards_common_esp32h2 -DIRS = $(RIOTBOARD)/common/esp32x - include $(RIOTBASE)/Makefile.base diff --git a/boards/common/esp32h2/Makefile.dep b/boards/common/esp32h2/Makefile.dep index e55438c370f1..d4ad27b75285 100644 --- a/boards/common/esp32h2/Makefile.dep +++ b/boards/common/esp32h2/Makefile.dep @@ -1,3 +1 @@ -USEMODULE += boards_common_esp32h2 - -include $(RIOTBOARD)/common/esp32x/Makefile.dep +USEMODULE += boards_common_esp32x diff --git a/boards/common/esp32h2/Makefile.include b/boards/common/esp32h2/Makefile.include index 288555cce2fe..da97ddfeabe2 100644 --- a/boards/common/esp32h2/Makefile.include +++ b/boards/common/esp32h2/Makefile.include @@ -1,3 +1 @@ INCLUDES += -I$(RIOTBOARD)/common/esp32h2/include - -include $(RIOTBOARD)/common/esp32x/Makefile.include diff --git a/boards/common/esp32s2/Makefile b/boards/common/esp32s2/Makefile index 0e519a988def..bd03c5d1fbbb 100644 --- a/boards/common/esp32s2/Makefile +++ b/boards/common/esp32s2/Makefile @@ -1,5 +1,3 @@ MODULE = boards_common_esp32s2 -DIRS = $(RIOTBOARD)/common/esp32x - include $(RIOTBASE)/Makefile.base diff --git a/boards/common/esp32s2/Makefile.dep b/boards/common/esp32s2/Makefile.dep index 5f7ba2dc4eb3..d4ad27b75285 100644 --- a/boards/common/esp32s2/Makefile.dep +++ b/boards/common/esp32s2/Makefile.dep @@ -1,3 +1 @@ -USEMODULE += boards_common_esp32s2 - -include $(RIOTBOARD)/common/esp32x/Makefile.dep +USEMODULE += boards_common_esp32x diff --git a/boards/common/esp32s2/Makefile.include b/boards/common/esp32s2/Makefile.include index b636e151f6cb..9d1eb4443d08 100644 --- a/boards/common/esp32s2/Makefile.include +++ b/boards/common/esp32s2/Makefile.include @@ -1,3 +1 @@ INCLUDES += -I$(RIOTBOARD)/common/esp32s2/include - -include $(RIOTBOARD)/common/esp32x/Makefile.include diff --git a/boards/common/esp32s3/Makefile b/boards/common/esp32s3/Makefile index 7b8e172f6fa0..1dbe9ac0e0b6 100644 --- a/boards/common/esp32s3/Makefile +++ b/boards/common/esp32s3/Makefile @@ -1,5 +1,3 @@ MODULE = boards_common_esp32s3 -DIRS = $(RIOTBOARD)/common/esp32x - include $(RIOTBASE)/Makefile.base diff --git a/boards/common/esp32s3/Makefile.dep b/boards/common/esp32s3/Makefile.dep index 71a4add39de1..d4ad27b75285 100644 --- a/boards/common/esp32s3/Makefile.dep +++ b/boards/common/esp32s3/Makefile.dep @@ -1,3 +1 @@ -USEMODULE += boards_common_esp32s3 - -include $(RIOTBOARD)/common/esp32x/Makefile.dep +USEMODULE += boards_common_esp32x diff --git a/boards/common/esp32s3/Makefile.include b/boards/common/esp32s3/Makefile.include index c24567396294..c3d707dfbf02 100644 --- a/boards/common/esp32s3/Makefile.include +++ b/boards/common/esp32s3/Makefile.include @@ -1,3 +1 @@ INCLUDES += -I$(RIOTBOARD)/common/esp32s3/include - -include $(RIOTBOARD)/common/esp32x/Makefile.include diff --git a/boards/common/esp32x/Makefile.dep b/boards/common/esp32x/Makefile.dep index d4ad27b75285..e69de29bb2d1 100644 --- a/boards/common/esp32x/Makefile.dep +++ b/boards/common/esp32x/Makefile.dep @@ -1 +0,0 @@ -USEMODULE += boards_common_esp32x diff --git a/boards/esp32-ethernet-kit-v1_0/Makefile b/boards/esp32-ethernet-kit-v1_0/Makefile index ca00a69d9cec..f8fcbb53a065 100644 --- a/boards/esp32-ethernet-kit-v1_0/Makefile +++ b/boards/esp32-ethernet-kit-v1_0/Makefile @@ -1,5 +1,3 @@ MODULE = board -DIRS = $(RIOTBOARD)/common/esp32 - include $(RIOTBASE)/Makefile.base diff --git a/boards/esp32-ethernet-kit-v1_0/Makefile.dep b/boards/esp32-ethernet-kit-v1_0/Makefile.dep index 8b7842afa32e..1ede80e6af2f 100644 --- a/boards/esp32-ethernet-kit-v1_0/Makefile.dep +++ b/boards/esp32-ethernet-kit-v1_0/Makefile.dep @@ -1,4 +1,4 @@ -include $(RIOTBOARD)/common/esp32/Makefile.dep +USEMODULE += boards_common_esp32 # enables esp_eth as default network device ifneq (,$(filter netdev_default,$(USEMODULE))) diff --git a/boards/esp32-ethernet-kit-v1_0/Makefile.include b/boards/esp32-ethernet-kit-v1_0/Makefile.include index 0106995d08d8..8f10f49614d3 100644 --- a/boards/esp32-ethernet-kit-v1_0/Makefile.include +++ b/boards/esp32-ethernet-kit-v1_0/Makefile.include @@ -1,4 +1,3 @@ - # configure the serial interface PORT_LINUX ?= /dev/ttyUSB1 @@ -9,5 +8,3 @@ endif # Only consider TTYs matching the following filter when auto-selecting the TTY # with `MOST_RECENT_PORT=1`. TTY_BOARD_FILTER := --driver 'ftdi_sio' --vendor FTDI --model 'Dual RS232-HS' --iface-num 1 - -include $(RIOTBOARD)/common/esp32/Makefile.include diff --git a/boards/esp32-ethernet-kit-v1_1/Makefile b/boards/esp32-ethernet-kit-v1_1/Makefile index 6540e8066617..ee786c2e6206 100644 --- a/boards/esp32-ethernet-kit-v1_1/Makefile +++ b/boards/esp32-ethernet-kit-v1_1/Makefile @@ -1,2 +1,4 @@ +MODULE = board + DIRS = $(RIOTBOARD)/esp32-ethernet-kit-v1_0 include $(RIOTBASE)/Makefile.base diff --git a/boards/esp32-ethernet-kit-v1_2/Makefile b/boards/esp32-ethernet-kit-v1_2/Makefile index 6540e8066617..ee786c2e6206 100644 --- a/boards/esp32-ethernet-kit-v1_2/Makefile +++ b/boards/esp32-ethernet-kit-v1_2/Makefile @@ -1,2 +1,4 @@ +MODULE = board + DIRS = $(RIOTBOARD)/esp32-ethernet-kit-v1_0 include $(RIOTBASE)/Makefile.base diff --git a/boards/esp32-heltec-lora32-v2/Makefile b/boards/esp32-heltec-lora32-v2/Makefile index ca00a69d9cec..f8fcbb53a065 100644 --- a/boards/esp32-heltec-lora32-v2/Makefile +++ b/boards/esp32-heltec-lora32-v2/Makefile @@ -1,5 +1,3 @@ MODULE = board -DIRS = $(RIOTBOARD)/common/esp32 - include $(RIOTBASE)/Makefile.base diff --git a/boards/esp32-heltec-lora32-v2/Makefile.dep b/boards/esp32-heltec-lora32-v2/Makefile.dep index f236876e4067..87cf98dacb29 100644 --- a/boards/esp32-heltec-lora32-v2/Makefile.dep +++ b/boards/esp32-heltec-lora32-v2/Makefile.dep @@ -6,4 +6,4 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif -include $(RIOTBOARD)/common/esp32/Makefile.dep +USEMODULE += boards_common_esp32 diff --git a/boards/esp32-heltec-lora32-v2/Makefile.include b/boards/esp32-heltec-lora32-v2/Makefile.include index 30a3389a47f8..e69de29bb2d1 100644 --- a/boards/esp32-heltec-lora32-v2/Makefile.include +++ b/boards/esp32-heltec-lora32-v2/Makefile.include @@ -1 +0,0 @@ -include $(RIOTBOARD)/common/esp32/Makefile.include diff --git a/boards/esp32-mh-et-live-minikit/Makefile b/boards/esp32-mh-et-live-minikit/Makefile index ca00a69d9cec..f8fcbb53a065 100644 --- a/boards/esp32-mh-et-live-minikit/Makefile +++ b/boards/esp32-mh-et-live-minikit/Makefile @@ -1,5 +1,3 @@ MODULE = board -DIRS = $(RIOTBOARD)/common/esp32 - include $(RIOTBASE)/Makefile.base diff --git a/boards/esp32-mh-et-live-minikit/Makefile.dep b/boards/esp32-mh-et-live-minikit/Makefile.dep index 714868b61949..a0b2cbeabcd7 100644 --- a/boards/esp32-mh-et-live-minikit/Makefile.dep +++ b/boards/esp32-mh-et-live-minikit/Makefile.dep @@ -14,4 +14,4 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif -include $(RIOTBOARD)/common/esp32/Makefile.dep +USEMODULE += boards_common_esp32 diff --git a/boards/esp32-mh-et-live-minikit/Makefile.include b/boards/esp32-mh-et-live-minikit/Makefile.include index b1f1a76ce242..02518cfa2ed9 100644 --- a/boards/esp32-mh-et-live-minikit/Makefile.include +++ b/boards/esp32-mh-et-live-minikit/Makefile.include @@ -1,5 +1,3 @@ -include $(RIOTBOARD)/common/esp32/Makefile.include - # Only consider TTYs matching the following filter when auto-selecting the TTY # with `MOST_RECENT_PORT=1`. TTY_BOARD_FILTER := --driver 'cp210x' --vendor 'Silicon Labs' --model 'CP2104 USB to UART Bridge Controller' diff --git a/boards/esp32-olimex-evb/Makefile b/boards/esp32-olimex-evb/Makefile index ca00a69d9cec..f8fcbb53a065 100644 --- a/boards/esp32-olimex-evb/Makefile +++ b/boards/esp32-olimex-evb/Makefile @@ -1,5 +1,3 @@ MODULE = board -DIRS = $(RIOTBOARD)/common/esp32 - include $(RIOTBASE)/Makefile.base diff --git a/boards/esp32-olimex-evb/Makefile.dep b/boards/esp32-olimex-evb/Makefile.dep index bd77f00ea246..9d014883848f 100644 --- a/boards/esp32-olimex-evb/Makefile.dep +++ b/boards/esp32-olimex-evb/Makefile.dep @@ -1,5 +1,3 @@ -include $(RIOTBOARD)/common/esp32/Makefile.dep - # enables esp_eth as default network device ifneq (,$(filter netdev_default,$(USEMODULE))) USEMODULE += esp_eth @@ -14,3 +12,5 @@ endif ifneq (,$(filter mtd,$(USEMODULE))) USEMODULE += mtd_sdmmc_default endif + +USEMODULE += boards_common_esp32 diff --git a/boards/esp32-olimex-evb/Makefile.include b/boards/esp32-olimex-evb/Makefile.include index 331cf84c6e34..cf9071b90ff4 100644 --- a/boards/esp32-olimex-evb/Makefile.include +++ b/boards/esp32-olimex-evb/Makefile.include @@ -1,7 +1,5 @@ PSEUDOMODULES += olimex_esp32_gateway -include $(RIOTBOARD)/common/esp32/Makefile.include - # Only consider TTYs matching the following filter when auto-selecting the TTY # with `MOST_RECENT_PORT=1`. TTY_BOARD_FILTER := --driver 'ch341' --vendor '1a86' --model 'USB2.0-Serial' diff --git a/boards/esp32-ttgo-t-beam/Makefile b/boards/esp32-ttgo-t-beam/Makefile index ca00a69d9cec..f8fcbb53a065 100644 --- a/boards/esp32-ttgo-t-beam/Makefile +++ b/boards/esp32-ttgo-t-beam/Makefile @@ -1,5 +1,3 @@ MODULE = board -DIRS = $(RIOTBOARD)/common/esp32 - include $(RIOTBASE)/Makefile.base diff --git a/boards/esp32-ttgo-t-beam/Makefile.dep b/boards/esp32-ttgo-t-beam/Makefile.dep index 371b1e06b0db..79013432951a 100644 --- a/boards/esp32-ttgo-t-beam/Makefile.dep +++ b/boards/esp32-ttgo-t-beam/Makefile.dep @@ -6,4 +6,4 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif -include $(RIOTBOARD)/common/esp32/Makefile.dep +USEMODULE += boards_common_esp32 diff --git a/boards/esp32-ttgo-t-beam/Makefile.include b/boards/esp32-ttgo-t-beam/Makefile.include index e3e3e449ac3c..4a5b4d7b73d8 100644 --- a/boards/esp32-ttgo-t-beam/Makefile.include +++ b/boards/esp32-ttgo-t-beam/Makefile.include @@ -1,7 +1,5 @@ PSEUDOMODULES += esp32_ttgo_t_beam_v1_0 -include $(RIOTBOARD)/common/esp32/Makefile.include - # Only consider TTYs matching the following filter when auto-selecting the TTY # with `MOST_RECENT_PORT=1`. TTY_BOARD_FILTER := --driver 'cp210x' --vendor 'Silicon Labs' --model 'CP2104 USB to UART Bridge Controller' diff --git a/boards/esp32-wemos-d1-r32/Makefile b/boards/esp32-wemos-d1-r32/Makefile index ca00a69d9cec..f8fcbb53a065 100644 --- a/boards/esp32-wemos-d1-r32/Makefile +++ b/boards/esp32-wemos-d1-r32/Makefile @@ -1,5 +1,3 @@ MODULE = board -DIRS = $(RIOTBOARD)/common/esp32 - include $(RIOTBASE)/Makefile.base diff --git a/boards/esp32-wemos-d1-r32/Makefile.dep b/boards/esp32-wemos-d1-r32/Makefile.dep index 2c4f9792d812..3679d48369d8 100644 --- a/boards/esp32-wemos-d1-r32/Makefile.dep +++ b/boards/esp32-wemos-d1-r32/Makefile.dep @@ -1,5 +1,5 @@ -include $(RIOTBOARD)/common/esp32/Makefile.dep - ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif + +USEMODULE += boards_common_esp32 diff --git a/boards/esp32-wemos-d1-r32/Makefile.include b/boards/esp32-wemos-d1-r32/Makefile.include index 2887a14b1b2c..568d61432bc1 100644 --- a/boards/esp32-wemos-d1-r32/Makefile.include +++ b/boards/esp32-wemos-d1-r32/Makefile.include @@ -1,5 +1,3 @@ -include $(RIOTBOARD)/common/esp32/Makefile.include - # Only consider TTYs matching the following filter when auto-selecting the TTY # with `MOST_RECENT_PORT=1`. TTY_BOARD_FILTER := --driver 'cp210x' --vendor 'Silicon Labs' --model 'CP2102 USB to UART Bridge Controller' diff --git a/boards/esp32-wemos-lolin-d32-pro/Makefile b/boards/esp32-wemos-lolin-d32-pro/Makefile index ca00a69d9cec..f8fcbb53a065 100644 --- a/boards/esp32-wemos-lolin-d32-pro/Makefile +++ b/boards/esp32-wemos-lolin-d32-pro/Makefile @@ -1,5 +1,3 @@ MODULE = board -DIRS = $(RIOTBOARD)/common/esp32 - include $(RIOTBASE)/Makefile.base diff --git a/boards/esp32-wemos-lolin-d32-pro/Makefile.dep b/boards/esp32-wemos-lolin-d32-pro/Makefile.dep index 81fe57b33a8a..820f453b6ab1 100644 --- a/boards/esp32-wemos-lolin-d32-pro/Makefile.dep +++ b/boards/esp32-wemos-lolin-d32-pro/Makefile.dep @@ -12,4 +12,4 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif -include $(RIOTBOARD)/common/esp32/Makefile.dep +USEMODULE += boards_common_esp32 diff --git a/boards/esp32-wemos-lolin-d32-pro/Makefile.include b/boards/esp32-wemos-lolin-d32-pro/Makefile.include index 826398d8eb1f..c4cc10be731a 100644 --- a/boards/esp32-wemos-lolin-d32-pro/Makefile.include +++ b/boards/esp32-wemos-lolin-d32-pro/Makefile.include @@ -1,7 +1,5 @@ PSEUDOMODULES += esp_lolin_tft -include $(RIOTBOARD)/common/esp32/Makefile.include - # Only consider TTYs matching the following filter when auto-selecting the TTY # with `MOST_RECENT_PORT=1`. TTY_BOARD_FILTER := --driver 'ch341' --vendor '1a86' --model 'USB2.0-Serial' diff --git a/boards/esp32-wroom-32/Makefile b/boards/esp32-wroom-32/Makefile index ca00a69d9cec..f8fcbb53a065 100644 --- a/boards/esp32-wroom-32/Makefile +++ b/boards/esp32-wroom-32/Makefile @@ -1,5 +1,3 @@ MODULE = board -DIRS = $(RIOTBOARD)/common/esp32 - include $(RIOTBASE)/Makefile.base diff --git a/boards/esp32-wroom-32/Makefile.dep b/boards/esp32-wroom-32/Makefile.dep index 2c4f9792d812..3679d48369d8 100644 --- a/boards/esp32-wroom-32/Makefile.dep +++ b/boards/esp32-wroom-32/Makefile.dep @@ -1,5 +1,5 @@ -include $(RIOTBOARD)/common/esp32/Makefile.dep - ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif + +USEMODULE += boards_common_esp32 diff --git a/boards/esp32-wroom-32/Makefile.include b/boards/esp32-wroom-32/Makefile.include index 2887a14b1b2c..568d61432bc1 100644 --- a/boards/esp32-wroom-32/Makefile.include +++ b/boards/esp32-wroom-32/Makefile.include @@ -1,5 +1,3 @@ -include $(RIOTBOARD)/common/esp32/Makefile.include - # Only consider TTYs matching the following filter when auto-selecting the TTY # with `MOST_RECENT_PORT=1`. TTY_BOARD_FILTER := --driver 'cp210x' --vendor 'Silicon Labs' --model 'CP2102 USB to UART Bridge Controller' diff --git a/boards/esp32-wrover-kit/Makefile b/boards/esp32-wrover-kit/Makefile index ca00a69d9cec..f8fcbb53a065 100644 --- a/boards/esp32-wrover-kit/Makefile +++ b/boards/esp32-wrover-kit/Makefile @@ -1,5 +1,3 @@ MODULE = board -DIRS = $(RIOTBOARD)/common/esp32 - include $(RIOTBASE)/Makefile.base diff --git a/boards/esp32-wrover-kit/Makefile.dep b/boards/esp32-wrover-kit/Makefile.dep index 15337dcd819a..fc35e6457f83 100644 --- a/boards/esp32-wrover-kit/Makefile.dep +++ b/boards/esp32-wrover-kit/Makefile.dep @@ -25,4 +25,4 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif -include $(RIOTBOARD)/common/esp32/Makefile.dep +USEMODULE += boards_common_esp32 diff --git a/boards/esp32-wrover-kit/Makefile.include b/boards/esp32-wrover-kit/Makefile.include index 5fe61f13583c..8300f2eb83ef 100644 --- a/boards/esp32-wrover-kit/Makefile.include +++ b/boards/esp32-wrover-kit/Makefile.include @@ -10,5 +10,3 @@ TTY_BOARD_FILTER := --driver 'ftdi_sio' --vendor FTDI --model 'Dual RS232-HS' -- ifneq (,$(filter esp_jtag,$(USEMODULE))) OPENOCD_CONFIG ?= board/esp32-wrover-kit-3.3v.cfg endif - -include $(RIOTBOARD)/common/esp32/Makefile.include diff --git a/boards/esp32c3-devkit/Makefile b/boards/esp32c3-devkit/Makefile index 13fe94b28b78..f8fcbb53a065 100644 --- a/boards/esp32c3-devkit/Makefile +++ b/boards/esp32c3-devkit/Makefile @@ -1,5 +1,3 @@ MODULE = board -DIRS = $(RIOTBOARD)/common/esp32c3 - include $(RIOTBASE)/Makefile.base diff --git a/boards/esp32c3-devkit/Makefile.dep b/boards/esp32c3-devkit/Makefile.dep index a15809229722..948242f0608a 100644 --- a/boards/esp32c3-devkit/Makefile.dep +++ b/boards/esp32c3-devkit/Makefile.dep @@ -1,5 +1,5 @@ -include $(RIOTBOARD)/common/esp32c3/Makefile.dep - ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif + +USEMODULE += boards_common_esp32c3 diff --git a/boards/esp32c3-devkit/Makefile.include b/boards/esp32c3-devkit/Makefile.include index 728ae3c44d23..361584557854 100644 --- a/boards/esp32c3-devkit/Makefile.include +++ b/boards/esp32c3-devkit/Makefile.include @@ -1,5 +1,3 @@ -include $(RIOTBOARD)/common/esp32c3/Makefile.include - # Only consider TTYs matching the following filter when auto-selecting the TTY # with `MOST_RECENT_PORT=1`. TTY_BOARD_FILTER := --driver 'cp210x' --vendor 'Silicon Labs' --model 'CP2102N USB to UART Bridge Controller' diff --git a/boards/esp32c3-wemos-mini/Makefile b/boards/esp32c3-wemos-mini/Makefile index 13fe94b28b78..f8fcbb53a065 100644 --- a/boards/esp32c3-wemos-mini/Makefile +++ b/boards/esp32c3-wemos-mini/Makefile @@ -1,5 +1,3 @@ MODULE = board -DIRS = $(RIOTBOARD)/common/esp32c3 - include $(RIOTBASE)/Makefile.base diff --git a/boards/esp32c3-wemos-mini/Makefile.dep b/boards/esp32c3-wemos-mini/Makefile.dep index b2909c3d65d1..ebe263b15869 100644 --- a/boards/esp32c3-wemos-mini/Makefile.dep +++ b/boards/esp32c3-wemos-mini/Makefile.dep @@ -11,4 +11,4 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif -include $(RIOTBOARD)/common/esp32c3/Makefile.dep +USEMODULE += boards_common_esp32c3 diff --git a/boards/esp32c3-wemos-mini/Makefile.include b/boards/esp32c3-wemos-mini/Makefile.include index 96ebc9535c21..54533c1c48cd 100644 --- a/boards/esp32c3-wemos-mini/Makefile.include +++ b/boards/esp32c3-wemos-mini/Makefile.include @@ -2,5 +2,3 @@ PORT_LINUX ?= /dev/ttyACM0 PSEUDOMODULES += esp32c3_wemos_mini_v1_0_0 PSEUDOMODULES += esp32c3_wemos_mini_v2_1_0 - -include $(RIOTBOARD)/common/esp32c3/Makefile.include diff --git a/boards/esp32c6-devkit/Makefile b/boards/esp32c6-devkit/Makefile index 099f5c658a51..f8fcbb53a065 100644 --- a/boards/esp32c6-devkit/Makefile +++ b/boards/esp32c6-devkit/Makefile @@ -1,5 +1,3 @@ MODULE = board -DIRS = $(RIOTBOARD)/common/esp32c6 - include $(RIOTBASE)/Makefile.base diff --git a/boards/esp32c6-devkit/Makefile.dep b/boards/esp32c6-devkit/Makefile.dep index 561c001b0cd5..df9ef087bede 100644 --- a/boards/esp32c6-devkit/Makefile.dep +++ b/boards/esp32c6-devkit/Makefile.dep @@ -1,5 +1,5 @@ -include $(RIOTBOARD)/common/esp32c6/Makefile.dep - ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif + +USEMODULE += boards_common_esp32c6 diff --git a/boards/esp32c6-devkit/Makefile.include b/boards/esp32c6-devkit/Makefile.include index 57665655fb89..361584557854 100644 --- a/boards/esp32c6-devkit/Makefile.include +++ b/boards/esp32c6-devkit/Makefile.include @@ -1,5 +1,3 @@ -include $(RIOTBOARD)/common/esp32c6/Makefile.include - # Only consider TTYs matching the following filter when auto-selecting the TTY # with `MOST_RECENT_PORT=1`. TTY_BOARD_FILTER := --driver 'cp210x' --vendor 'Silicon Labs' --model 'CP2102N USB to UART Bridge Controller' diff --git a/boards/esp32h2-devkit/Makefile b/boards/esp32h2-devkit/Makefile index bd237085cf7a..f8fcbb53a065 100644 --- a/boards/esp32h2-devkit/Makefile +++ b/boards/esp32h2-devkit/Makefile @@ -1,5 +1,3 @@ MODULE = board -DIRS = $(RIOTBOARD)/common/esp32h2 - include $(RIOTBASE)/Makefile.base diff --git a/boards/esp32h2-devkit/Makefile.dep b/boards/esp32h2-devkit/Makefile.dep index 0ee98219c3fe..1cb59452c10f 100644 --- a/boards/esp32h2-devkit/Makefile.dep +++ b/boards/esp32h2-devkit/Makefile.dep @@ -1,5 +1,5 @@ -include $(RIOTBOARD)/common/esp32h2/Makefile.dep - ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif + +USEMODULE += boards_common_esp32h2 diff --git a/boards/esp32h2-devkit/Makefile.include b/boards/esp32h2-devkit/Makefile.include index d719a9689141..361584557854 100644 --- a/boards/esp32h2-devkit/Makefile.include +++ b/boards/esp32h2-devkit/Makefile.include @@ -1,5 +1,3 @@ -include $(RIOTBOARD)/common/esp32h2/Makefile.include - # Only consider TTYs matching the following filter when auto-selecting the TTY # with `MOST_RECENT_PORT=1`. TTY_BOARD_FILTER := --driver 'cp210x' --vendor 'Silicon Labs' --model 'CP2102N USB to UART Bridge Controller' diff --git a/boards/esp32s2-devkit/Makefile b/boards/esp32s2-devkit/Makefile index c71e835d772a..f8fcbb53a065 100644 --- a/boards/esp32s2-devkit/Makefile +++ b/boards/esp32s2-devkit/Makefile @@ -1,5 +1,3 @@ MODULE = board -DIRS = $(RIOTBOARD)/common/esp32s2 - include $(RIOTBASE)/Makefile.base diff --git a/boards/esp32s2-devkit/Makefile.dep b/boards/esp32s2-devkit/Makefile.dep index 91ac3df7081e..51c136aa23fa 100644 --- a/boards/esp32s2-devkit/Makefile.dep +++ b/boards/esp32s2-devkit/Makefile.dep @@ -1,5 +1,5 @@ -include $(RIOTBOARD)/common/esp32s2/Makefile.dep - ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif + +USEMODULE += boards_common_esp32s2 diff --git a/boards/esp32s2-devkit/Makefile.include b/boards/esp32s2-devkit/Makefile.include index 12997eb0f6da..85027705d7eb 100644 --- a/boards/esp32s2-devkit/Makefile.include +++ b/boards/esp32s2-devkit/Makefile.include @@ -5,8 +5,6 @@ PSEUDOMODULES += esp32s2_devkitc_1r PSEUDOMODULES += esp32s2_saola_1 PSEUDOMODULES += esp32s2_saola_1r -include $(RIOTBOARD)/common/esp32s2/Makefile.include - # Only consider TTYs matching the following filter when auto-selecting the TTY # with `MOST_RECENT_PORT=1`. TTY_BOARD_FILTER := --driver 'cp210x' --vendor 'Silicon Labs' --model 'CP2102N USB to UART Bridge Controller' diff --git a/boards/esp32s2-lilygo-ttgo-t8/Makefile b/boards/esp32s2-lilygo-ttgo-t8/Makefile index c71e835d772a..f8fcbb53a065 100644 --- a/boards/esp32s2-lilygo-ttgo-t8/Makefile +++ b/boards/esp32s2-lilygo-ttgo-t8/Makefile @@ -1,5 +1,3 @@ MODULE = board -DIRS = $(RIOTBOARD)/common/esp32s2 - include $(RIOTBASE)/Makefile.base diff --git a/boards/esp32s2-lilygo-ttgo-t8/Makefile.dep b/boards/esp32s2-lilygo-ttgo-t8/Makefile.dep index ff14e2483dc1..b8e431f983b2 100644 --- a/boards/esp32s2-lilygo-ttgo-t8/Makefile.dep +++ b/boards/esp32s2-lilygo-ttgo-t8/Makefile.dep @@ -20,4 +20,4 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif -include $(RIOTBOARD)/common/esp32s2/Makefile.dep +USEMODULE += boards_common_esp32s2 diff --git a/boards/esp32s2-lilygo-ttgo-t8/Makefile.include b/boards/esp32s2-lilygo-ttgo-t8/Makefile.include index 65924a77f320..60ea95c52ae8 100644 --- a/boards/esp32s2-lilygo-ttgo-t8/Makefile.include +++ b/boards/esp32s2-lilygo-ttgo-t8/Makefile.include @@ -4,8 +4,6 @@ ifneq (,$(filter esp32s2-lilygo-ttgo-t8-usb,$(USEMODULE))) PORT_LINUX ?= /dev/ttyACM0 endif -include $(RIOTBOARD)/common/esp32s2/Makefile.include - # Only consider TTYs matching the following filter when auto-selecting the TTY # with `MOST_RECENT_PORT=1`. TTY_BOARD_FILTER := --driver 'ch341' --vendor '1a86' --model 'USB Serial' diff --git a/boards/esp32s2-wemos-mini/Makefile b/boards/esp32s2-wemos-mini/Makefile index c71e835d772a..f8fcbb53a065 100644 --- a/boards/esp32s2-wemos-mini/Makefile +++ b/boards/esp32s2-wemos-mini/Makefile @@ -1,5 +1,3 @@ MODULE = board -DIRS = $(RIOTBOARD)/common/esp32s2 - include $(RIOTBASE)/Makefile.base diff --git a/boards/esp32s2-wemos-mini/Makefile.dep b/boards/esp32s2-wemos-mini/Makefile.dep index 89a525ccf038..d3532f1e5ba5 100644 --- a/boards/esp32s2-wemos-mini/Makefile.dep +++ b/boards/esp32s2-wemos-mini/Makefile.dep @@ -1,6 +1,7 @@ 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 + +USEMODULE += boards_common_esp32s2 diff --git a/boards/esp32s2-wemos-mini/Makefile.include b/boards/esp32s2-wemos-mini/Makefile.include index e0dc0e02c291..41c0266894ea 100644 --- a/boards/esp32s2-wemos-mini/Makefile.include +++ b/boards/esp32s2-wemos-mini/Makefile.include @@ -2,5 +2,3 @@ PORT_LINUX ?= /dev/ttyACM0 CFLAGS += -DCONFIG_CONSOLE_UART_TX=39 CFLAGS += -DCONFIG_CONSOLE_UART_RX=37 - -include $(RIOTBOARD)/common/esp32s2/Makefile.include diff --git a/boards/esp32s3-box/Makefile b/boards/esp32s3-box/Makefile index a8b9d8fbed28..f8fcbb53a065 100644 --- a/boards/esp32s3-box/Makefile +++ b/boards/esp32s3-box/Makefile @@ -1,5 +1,3 @@ MODULE = board -DIRS = $(RIOTBOARD)/common/esp32s3 - include $(RIOTBASE)/Makefile.base diff --git a/boards/esp32s3-box/Makefile.dep b/boards/esp32s3-box/Makefile.dep index 3e5cbc162a2d..11414310a43c 100644 --- a/boards/esp32s3-box/Makefile.dep +++ b/boards/esp32s3-box/Makefile.dep @@ -7,4 +7,5 @@ ifneq (,$(filter saul_default,$(USEMODULE))) endif include $(RIOTBOARD)/common/esp32s3/stdio_esp32s3_default.dep.mk -include $(RIOTBOARD)/common/esp32s3/Makefile.dep + +USEMODULE += boards_common_esp32s3 diff --git a/boards/esp32s3-box/Makefile.include b/boards/esp32s3-box/Makefile.include index b804cf918761..4b43b58087cb 100644 --- a/boards/esp32s3-box/Makefile.include +++ b/boards/esp32s3-box/Makefile.include @@ -1,5 +1,3 @@ PORT_LINUX ?= /dev/ttyACM0 OPENOCD_CONFIG ?= board/esp32s3-builtin.cfg - -include $(RIOTBOARD)/common/esp32s3/Makefile.include diff --git a/boards/esp32s3-devkit/Makefile b/boards/esp32s3-devkit/Makefile index a8b9d8fbed28..f8fcbb53a065 100644 --- a/boards/esp32s3-devkit/Makefile +++ b/boards/esp32s3-devkit/Makefile @@ -1,5 +1,3 @@ MODULE = board -DIRS = $(RIOTBOARD)/common/esp32s3 - include $(RIOTBASE)/Makefile.base diff --git a/boards/esp32s3-devkit/Makefile.dep b/boards/esp32s3-devkit/Makefile.dep index e0fb1d1e0d53..1aead5398b60 100644 --- a/boards/esp32s3-devkit/Makefile.dep +++ b/boards/esp32s3-devkit/Makefile.dep @@ -1,5 +1,5 @@ -include $(RIOTBOARD)/common/esp32s3/Makefile.dep - ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif + +USEMODULE += boards_common_esp32s3 diff --git a/boards/esp32s3-devkit/Makefile.include b/boards/esp32s3-devkit/Makefile.include index 403fb40c3749..ee80116bc6db 100644 --- a/boards/esp32s3-devkit/Makefile.include +++ b/boards/esp32s3-devkit/Makefile.include @@ -9,8 +9,6 @@ PSEUDOMODULES += esp32s3_devkitc_1u_n8r8 PSEUDOMODULES += esp32s3_devkitm_1_n8r8 PSEUDOMODULES += esp32s3_devkitm_1u_n8r8 -include $(RIOTBOARD)/common/esp32s3/Makefile.include - # Only consider TTYs matching the following filter when auto-selecting the TTY # with `MOST_RECENT_PORT=1`. TTY_BOARD_FILTER := --driver 'cp210x' --vendor 'Silicon Labs' --model 'CP2102N USB to UART Bridge Controller' diff --git a/boards/esp32s3-pros3/Makefile b/boards/esp32s3-pros3/Makefile index a8b9d8fbed28..f8fcbb53a065 100644 --- a/boards/esp32s3-pros3/Makefile +++ b/boards/esp32s3-pros3/Makefile @@ -1,5 +1,3 @@ MODULE = board -DIRS = $(RIOTBOARD)/common/esp32s3 - include $(RIOTBASE)/Makefile.base diff --git a/boards/esp32s3-pros3/Makefile.dep b/boards/esp32s3-pros3/Makefile.dep index 14a46b01477c..e9c8884444cd 100644 --- a/boards/esp32s3-pros3/Makefile.dep +++ b/boards/esp32s3-pros3/Makefile.dep @@ -3,4 +3,5 @@ ifneq (,$(filter saul_default,$(USEMODULE))) endif include $(RIOTBOARD)/common/esp32s3/stdio_esp32s3_default.dep.mk -include $(RIOTBOARD)/common/esp32s3/Makefile.dep + +USEMODULE += boards_common_esp32s3 diff --git a/boards/esp32s3-pros3/Makefile.include b/boards/esp32s3-pros3/Makefile.include index 30fe489f8fd8..68b833cec345 100644 --- a/boards/esp32s3-pros3/Makefile.include +++ b/boards/esp32s3-pros3/Makefile.include @@ -4,5 +4,3 @@ FLASH_SIZE ?= 16 PORT_LINUX ?= /dev/ttyACM0 OPENOCD_CONFIG ?= board/esp32s3-builtin.cfg - -include $(RIOTBOARD)/common/esp32s3/Makefile.include diff --git a/boards/esp32s3-usb-otg/Makefile b/boards/esp32s3-usb-otg/Makefile index a8b9d8fbed28..f8fcbb53a065 100644 --- a/boards/esp32s3-usb-otg/Makefile +++ b/boards/esp32s3-usb-otg/Makefile @@ -1,5 +1,3 @@ MODULE = board -DIRS = $(RIOTBOARD)/common/esp32s3 - include $(RIOTBASE)/Makefile.base diff --git a/boards/esp32s3-usb-otg/Makefile.dep b/boards/esp32s3-usb-otg/Makefile.dep index ea5db8e874c9..255a6a5afd21 100644 --- a/boards/esp32s3-usb-otg/Makefile.dep +++ b/boards/esp32s3-usb-otg/Makefile.dep @@ -1,5 +1,4 @@ include $(RIOTBOARD)/common/esp32s3/stdio_esp32s3_default.dep.mk -include $(RIOTBOARD)/common/esp32s3/Makefile.dep # default to using fatfs on SD card ifneq (,$(filter vfs_default,$(USEMODULE))) @@ -24,3 +23,5 @@ endif ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif + +USEMODULE += boards_common_esp32s3 diff --git a/boards/esp32s3-usb-otg/Makefile.include b/boards/esp32s3-usb-otg/Makefile.include index b804cf918761..4b43b58087cb 100644 --- a/boards/esp32s3-usb-otg/Makefile.include +++ b/boards/esp32s3-usb-otg/Makefile.include @@ -1,5 +1,3 @@ PORT_LINUX ?= /dev/ttyACM0 OPENOCD_CONFIG ?= board/esp32s3-builtin.cfg - -include $(RIOTBOARD)/common/esp32s3/Makefile.include diff --git a/boards/esp32s3-wt32-sc01-plus/Makefile b/boards/esp32s3-wt32-sc01-plus/Makefile index a8b9d8fbed28..f8fcbb53a065 100644 --- a/boards/esp32s3-wt32-sc01-plus/Makefile +++ b/boards/esp32s3-wt32-sc01-plus/Makefile @@ -1,5 +1,3 @@ MODULE = board -DIRS = $(RIOTBOARD)/common/esp32s3 - include $(RIOTBASE)/Makefile.base diff --git a/boards/esp32s3-wt32-sc01-plus/Makefile.dep b/boards/esp32s3-wt32-sc01-plus/Makefile.dep index 127742cdb0a2..a303180c8f48 100644 --- a/boards/esp32s3-wt32-sc01-plus/Makefile.dep +++ b/boards/esp32s3-wt32-sc01-plus/Makefile.dep @@ -1,5 +1,4 @@ include $(RIOTBOARD)/common/esp32s3/stdio_esp32s3_default.dep.mk -include $(RIOTBOARD)/common/esp32s3/Makefile.dep # default to using fatfs on SD card ifneq (,$(filter vfs_default,$(USEMODULE))) @@ -31,3 +30,5 @@ endif ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif + +USEMODULE += boards_common_esp32s3 diff --git a/boards/esp32s3-wt32-sc01-plus/Makefile.include b/boards/esp32s3-wt32-sc01-plus/Makefile.include index b804cf918761..4b43b58087cb 100644 --- a/boards/esp32s3-wt32-sc01-plus/Makefile.include +++ b/boards/esp32s3-wt32-sc01-plus/Makefile.include @@ -1,5 +1,3 @@ PORT_LINUX ?= /dev/ttyACM0 OPENOCD_CONFIG ?= board/esp32s3-builtin.cfg - -include $(RIOTBOARD)/common/esp32s3/Makefile.include diff --git a/boards/seeedstudio-xiao-esp32c3/Makefile b/boards/seeedstudio-xiao-esp32c3/Makefile index 13fe94b28b78..f8fcbb53a065 100644 --- a/boards/seeedstudio-xiao-esp32c3/Makefile +++ b/boards/seeedstudio-xiao-esp32c3/Makefile @@ -1,5 +1,3 @@ MODULE = board -DIRS = $(RIOTBOARD)/common/esp32c3 - include $(RIOTBASE)/Makefile.base diff --git a/boards/seeedstudio-xiao-esp32c3/Makefile.dep b/boards/seeedstudio-xiao-esp32c3/Makefile.dep index 8899361edd24..690466b90921 100644 --- a/boards/seeedstudio-xiao-esp32c3/Makefile.dep +++ b/boards/seeedstudio-xiao-esp32c3/Makefile.dep @@ -14,4 +14,4 @@ ifeq (,$(filter stdio_% slipdev_stdio,$(USEMODULE))) USEMODULE += stdio_usb_serial_jtag endif -include $(RIOTBOARD)/common/esp32c3/Makefile.dep +USEMODULE += boards_common_esp32c3 diff --git a/boards/seeedstudio-xiao-esp32c3/Makefile.include b/boards/seeedstudio-xiao-esp32c3/Makefile.include index d1bfece841d2..eb34f191bc81 100644 --- a/boards/seeedstudio-xiao-esp32c3/Makefile.include +++ b/boards/seeedstudio-xiao-esp32c3/Makefile.include @@ -1,3 +1 @@ PORT_LINUX ?= /dev/ttyACM0 - -include $(RIOTBOARD)/common/esp32c3/Makefile.include