Skip to content

boards: migrate ESP32 based boards to common board module system #21835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

boards: migrate ESP32 based boards to common board module system #21835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1434f78
DELETEME: build ESP32 based boards
crasbe Oct 30, 2025
ff6abd9
boards: migrate ESP32 based boards to common board module system
crasbe Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 23 additions & 13 deletions .murdock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 21 additions & 0 deletions boards/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 21 additions & 0 deletions boards/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
21 changes: 21 additions & 0 deletions boards/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
21 changes: 21 additions & 0 deletions boards/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions boards/arduino-nano-esp32/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
MODULE = board

DIRS = $(RIOTBOARD)/common/esp32s3

include $(RIOTBASE)/Makefile.base
3 changes: 2 additions & 1 deletion boards/arduino-nano-esp32/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions boards/arduino-nano-esp32/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,3 @@ FLASH_SIZE ?= 16
PORT_LINUX ?= /dev/ttyACM0

OPENOCD_CONFIG ?= board/esp32s3-builtin.cfg

include $(RIOTBOARD)/common/esp32s3/Makefile.include
2 changes: 0 additions & 2 deletions boards/common/esp32/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
MODULE = boards_common_esp32

DIRS = $(RIOTBOARD)/common/esp32x

include $(RIOTBASE)/Makefile.base
4 changes: 1 addition & 3 deletions boards/common/esp32/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
USEMODULE += boards_common_esp32

include $(RIOTBOARD)/common/esp32x/Makefile.dep
USEMODULE += boards_common_esp32x
2 changes: 0 additions & 2 deletions boards/common/esp32/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
INCLUDES += -I$(RIOTBOARD)/common/esp32/include

include $(RIOTBOARD)/common/esp32x/Makefile.include
2 changes: 0 additions & 2 deletions boards/common/esp32c3/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
MODULE = boards_common_esp32c3

DIRS = $(RIOTBOARD)/common/esp32x

include $(RIOTBASE)/Makefile.base
4 changes: 1 addition & 3 deletions boards/common/esp32c3/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
USEMODULE += boards_common_esp32c3

include $(RIOTBOARD)/common/esp32x/Makefile.dep
USEMODULE += boards_common_esp32x
2 changes: 0 additions & 2 deletions boards/common/esp32c3/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
INCLUDES += -I$(RIOTBOARD)/common/esp32c3/include

include $(RIOTBOARD)/common/esp32x/Makefile.include
2 changes: 0 additions & 2 deletions boards/common/esp32c6/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
MODULE = boards_common_esp32c6

DIRS = $(RIOTBOARD)/common/esp32x

include $(RIOTBASE)/Makefile.base
4 changes: 1 addition & 3 deletions boards/common/esp32c6/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
USEMODULE += boards_common_esp32c6

include $(RIOTBOARD)/common/esp32x/Makefile.dep
USEMODULE += boards_common_esp32x
2 changes: 0 additions & 2 deletions boards/common/esp32c6/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
INCLUDES += -I$(RIOTBOARD)/common/esp32c6/include

include $(RIOTBOARD)/common/esp32x/Makefile.include
2 changes: 0 additions & 2 deletions boards/common/esp32h2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
MODULE = boards_common_esp32h2

DIRS = $(RIOTBOARD)/common/esp32x

include $(RIOTBASE)/Makefile.base
4 changes: 1 addition & 3 deletions boards/common/esp32h2/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
USEMODULE += boards_common_esp32h2

include $(RIOTBOARD)/common/esp32x/Makefile.dep
USEMODULE += boards_common_esp32x
2 changes: 0 additions & 2 deletions boards/common/esp32h2/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
INCLUDES += -I$(RIOTBOARD)/common/esp32h2/include

include $(RIOTBOARD)/common/esp32x/Makefile.include
2 changes: 0 additions & 2 deletions boards/common/esp32s2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
MODULE = boards_common_esp32s2

DIRS = $(RIOTBOARD)/common/esp32x

include $(RIOTBASE)/Makefile.base
4 changes: 1 addition & 3 deletions boards/common/esp32s2/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
USEMODULE += boards_common_esp32s2

include $(RIOTBOARD)/common/esp32x/Makefile.dep
USEMODULE += boards_common_esp32x
2 changes: 0 additions & 2 deletions boards/common/esp32s2/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
INCLUDES += -I$(RIOTBOARD)/common/esp32s2/include

include $(RIOTBOARD)/common/esp32x/Makefile.include
2 changes: 0 additions & 2 deletions boards/common/esp32s3/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
MODULE = boards_common_esp32s3

DIRS = $(RIOTBOARD)/common/esp32x

include $(RIOTBASE)/Makefile.base
4 changes: 1 addition & 3 deletions boards/common/esp32s3/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
USEMODULE += boards_common_esp32s3

include $(RIOTBOARD)/common/esp32x/Makefile.dep
USEMODULE += boards_common_esp32x
2 changes: 0 additions & 2 deletions boards/common/esp32s3/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
INCLUDES += -I$(RIOTBOARD)/common/esp32s3/include

include $(RIOTBOARD)/common/esp32x/Makefile.include
1 change: 0 additions & 1 deletion boards/common/esp32x/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
USEMODULE += boards_common_esp32x
2 changes: 0 additions & 2 deletions boards/esp32-ethernet-kit-v1_0/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
MODULE = board

DIRS = $(RIOTBOARD)/common/esp32

include $(RIOTBASE)/Makefile.base
2 changes: 1 addition & 1 deletion boards/esp32-ethernet-kit-v1_0/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)))
Expand Down
3 changes: 0 additions & 3 deletions boards/esp32-ethernet-kit-v1_0/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

# configure the serial interface
PORT_LINUX ?= /dev/ttyUSB1

Expand All @@ -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
2 changes: 2 additions & 0 deletions boards/esp32-ethernet-kit-v1_1/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
MODULE = board

DIRS = $(RIOTBOARD)/esp32-ethernet-kit-v1_0
include $(RIOTBASE)/Makefile.base
2 changes: 2 additions & 0 deletions boards/esp32-ethernet-kit-v1_2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
MODULE = board

DIRS = $(RIOTBOARD)/esp32-ethernet-kit-v1_0
include $(RIOTBASE)/Makefile.base
2 changes: 0 additions & 2 deletions boards/esp32-heltec-lora32-v2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
MODULE = board

DIRS = $(RIOTBOARD)/common/esp32

include $(RIOTBASE)/Makefile.base
2 changes: 1 addition & 1 deletion boards/esp32-heltec-lora32-v2/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += saul_gpio
endif

include $(RIOTBOARD)/common/esp32/Makefile.dep
USEMODULE += boards_common_esp32
1 change: 0 additions & 1 deletion boards/esp32-heltec-lora32-v2/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
include $(RIOTBOARD)/common/esp32/Makefile.include
2 changes: 0 additions & 2 deletions boards/esp32-mh-et-live-minikit/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
MODULE = board

DIRS = $(RIOTBOARD)/common/esp32

include $(RIOTBASE)/Makefile.base
2 changes: 1 addition & 1 deletion boards/esp32-mh-et-live-minikit/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += saul_gpio
endif

include $(RIOTBOARD)/common/esp32/Makefile.dep
USEMODULE += boards_common_esp32
2 changes: 0 additions & 2 deletions boards/esp32-mh-et-live-minikit/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
2 changes: 0 additions & 2 deletions boards/esp32-olimex-evb/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
MODULE = board

DIRS = $(RIOTBOARD)/common/esp32

include $(RIOTBASE)/Makefile.base
4 changes: 2 additions & 2 deletions boards/esp32-olimex-evb/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -14,3 +12,5 @@ endif
ifneq (,$(filter mtd,$(USEMODULE)))
USEMODULE += mtd_sdmmc_default
endif

USEMODULE += boards_common_esp32
2 changes: 0 additions & 2 deletions boards/esp32-olimex-evb/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
2 changes: 0 additions & 2 deletions boards/esp32-ttgo-t-beam/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
MODULE = board

DIRS = $(RIOTBOARD)/common/esp32

include $(RIOTBASE)/Makefile.base
2 changes: 1 addition & 1 deletion boards/esp32-ttgo-t-beam/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += saul_gpio
endif

include $(RIOTBOARD)/common/esp32/Makefile.dep
USEMODULE += boards_common_esp32
2 changes: 0 additions & 2 deletions boards/esp32-ttgo-t-beam/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
2 changes: 0 additions & 2 deletions boards/esp32-wemos-d1-r32/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
MODULE = board

DIRS = $(RIOTBOARD)/common/esp32

include $(RIOTBASE)/Makefile.base
4 changes: 2 additions & 2 deletions boards/esp32-wemos-d1-r32/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
include $(RIOTBOARD)/common/esp32/Makefile.dep

ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += saul_gpio
endif

USEMODULE += boards_common_esp32
2 changes: 0 additions & 2 deletions boards/esp32-wemos-d1-r32/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Loading
Loading