Skip to content

Commit aa87621

Browse files
crasbecrasbe
committed
boards: migrate ESP32 based boards to common board module system
1 parent 1434f78 commit aa87621

File tree

94 files changed

+126
-166
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+126
-166
lines changed

‎boards/Makefile‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,24 @@ DIRS += $(RIOTBOARD)/common/init
66
ifneq (,$(filter boards_common_adafruit-nrf52-bootloader,$(USEMODULE)))
77
DIRS += $(RIOTBOARD)/common/adafruit-nrf52-bootloader
88
endif
9+
ifneq (,$(filter boards_common_esp32,$(USEMODULE)))
10+
DIRS += $(RIOTBOARD)/common/esp32x
11+
endif
12+
ifneq (,$(filter boards_common_esp32c3,$(USEMODULE)))
13+
DIRS += $(RIOTBOARD)/common/esp32c3
14+
endif
15+
ifneq (,$(filter boards_common_esp32c6,$(USEMODULE)))
16+
DIRS += $(RIOTBOARD)/common/esp32c6
17+
endif
18+
ifneq (,$(filter boards_common_esp32h2,$(USEMODULE)))
19+
DIRS += $(RIOTBOARD)/common/esp32h2
20+
endif
21+
ifneq (,$(filter boards_common_esp32s2,$(USEMODULE)))
22+
DIRS += $(RIOTBOARD)/common/esp32s2
23+
endif
24+
ifneq (,$(filter boards_common_esp32s3,$(USEMODULE)))
25+
DIRS += $(RIOTBOARD)/common/esp32s3
26+
endif
927
ifneq (,$(filter boards_common_seeedstudio-xiao-nrf52840,$(USEMODULE)))
1028
DIRS += $(RIOTBOARD)/common/seeedstudio-xiao-nrf52840
1129
endif

‎boards/Makefile.dep‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,27 @@
22
ifneq (,$(filter boards_common_adafruit-nrf52-bootloader,$(USEMODULE)))
33
include $(RIOTBOARD)/common/adafruit-nrf52-bootloader/Makefile.dep
44
endif
5+
ifneq (,$(filter boards_common_esp32,$(USEMODULE)))
6+
include $(RIOTBOARD)/common/esp32/Makefile.dep
7+
endif
8+
ifneq (,$(filter boards_common_esp32c3,$(USEMODULE)))
9+
include $(RIOTBOARD)/common/esp32c3/Makefile.dep
10+
endif
11+
ifneq (,$(filter boards_common_esp32c6,$(USEMODULE)))
12+
include $(RIOTBOARD)/common/esp32c6/Makefile.dep
13+
endif
14+
ifneq (,$(filter boards_common_esp32h2,$(USEMODULE)))
15+
include $(RIOTBOARD)/common/esp32h2/Makefile.dep
16+
endif
17+
ifneq (,$(filter boards_common_esp32s2,$(USEMODULE)))
18+
include $(RIOTBOARD)/common/esp32s2/Makefile.dep
19+
endif
20+
ifneq (,$(filter boards_common_esp32s3,$(USEMODULE)))
21+
include $(RIOTBOARD)/common/esp32s3/Makefile.dep
22+
endif
23+
ifneq (,$(filter boards_common_esp32x,$(USEMODULE)))
24+
include $(RIOTBOARD)/common/esp32x/Makefile.dep
25+
endif
526
ifneq (,$(filter boards_common_seeedstudio-xiao-nrf52840,$(USEMODULE)))
627
include $(RIOTBOARD)/common/seeedstudio-xiao-nrf52840/Makefile.dep
728
endif

‎boards/Makefile.features‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,25 @@
11
# SORT THIS ALPHABETICALLY BY COMMON BOARD NAME!
2+
ifneq (,$(filter boards_common_esp32,$(USEMODULE)))
3+
include $(RIOTBOARD)/common/esp32/Makefile.features
4+
endif
5+
ifneq (,$(filter boards_common_esp32c3,$(USEMODULE)))
6+
include $(RIOTBOARD)/common/esp32c3/Makefile.features
7+
endif
8+
ifneq (,$(filter boards_common_esp32c6,$(USEMODULE)))
9+
include $(RIOTBOARD)/common/esp32c6/Makefile.features
10+
endif
11+
ifneq (,$(filter boards_common_esp32h2,$(USEMODULE)))
12+
include $(RIOTBOARD)/common/esp32h2/Makefile.features
13+
endif
14+
ifneq (,$(filter boards_common_esp32s2,$(USEMODULE)))
15+
include $(RIOTBOARD)/common/esp32s2/Makefile.features
16+
endif
17+
ifneq (,$(filter boards_common_esp32s3,$(USEMODULE)))
18+
include $(RIOTBOARD)/common/esp32s3/Makefile.features
19+
endif
20+
ifneq (,$(filter boards_common_esp32x,$(USEMODULE)))
21+
include $(RIOTBOARD)/common/esp32x/Makefile.features
22+
endif
223
ifneq (,$(filter boards_common_seeedstudio-xiao-nrf52840,$(USEMODULE)))
324
include $(RIOTBOARD)/common/seeedstudio-xiao-nrf52840/Makefile.features
425
endif

‎boards/Makefile.include‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,27 @@
22
ifneq (,$(filter boards_common_adafruit-nrf52-bootloader,$(USEMODULE)))
33
include $(RIOTBOARD)/common/adafruit-nrf52-bootloader/Makefile.include
44
endif
5+
ifneq (,$(filter boards_common_esp32,$(USEMODULE)))
6+
include $(RIOTBOARD)/common/esp32/Makefile.include
7+
endif
8+
ifneq (,$(filter boards_common_esp32c3,$(USEMODULE)))
9+
include $(RIOTBOARD)/common/esp32c3/Makefile.include
10+
endif
11+
ifneq (,$(filter boards_common_esp32c6,$(USEMODULE)))
12+
include $(RIOTBOARD)/common/esp32c6/Makefile.include
13+
endif
14+
ifneq (,$(filter boards_common_esp32h2,$(USEMODULE)))
15+
include $(RIOTBOARD)/common/esp32h2/Makefile.include
16+
endif
17+
ifneq (,$(filter boards_common_esp32s2,$(USEMODULE)))
18+
include $(RIOTBOARD)/common/esp32s2/Makefile.include
19+
endif
20+
ifneq (,$(filter boards_common_esp32s3,$(USEMODULE)))
21+
include $(RIOTBOARD)/common/esp32s3/Makefile.include
22+
endif
23+
ifneq (,$(filter boards_common_esp32x,$(USEMODULE)))
24+
include $(RIOTBOARD)/common/esp32x/Makefile.include
25+
endif
526
ifneq (,$(filter boards_common_seeedstudio-xiao-nrf52840,$(USEMODULE)))
627
include $(RIOTBOARD)/common/seeedstudio-xiao-nrf52840/Makefile.include
728
endif

‎boards/arduino-nano-esp32/Makefile.dep‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
22
USEMODULE += saul_gpio
33
endif
44

5+
USEMODULE += boards_common_esp32s3
6+
57
include $(RIOTBOARD)/common/esp32s3/stdio_esp32s3_default.dep.mk
6-
include $(RIOTBOARD)/common/esp32s3/Makefile.dep

‎boards/arduino-nano-esp32/Makefile.include‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,3 @@ FLASH_SIZE ?= 16
44
PORT_LINUX ?= /dev/ttyACM0
55

66
OPENOCD_CONFIG ?= board/esp32s3-builtin.cfg
7-
8-
include $(RIOTBOARD)/common/esp32s3/Makefile.include

‎boards/common/esp32/Makefile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
MODULE = boards_common_esp32
22

3-
DIRS = $(RIOTBOARD)/common/esp32x
4-
53
include $(RIOTBASE)/Makefile.base

‎boards/common/esp32/Makefile.dep‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
USEMODULE += boards_common_esp32
2-
3-
include $(RIOTBOARD)/common/esp32x/Makefile.dep
1+
USEMODULE += boards_common_esp32x

‎boards/common/esp32/Makefile.include‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
INCLUDES += -I$(RIOTBOARD)/common/esp32/include
2-
3-
include $(RIOTBOARD)/common/esp32x/Makefile.include

‎boards/common/esp32c3/Makefile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
MODULE = boards_common_esp32c3
22

3-
DIRS = $(RIOTBOARD)/common/esp32x
4-
53
include $(RIOTBASE)/Makefile.base

0 commit comments

Comments
 (0)