From f46b0c2da300e1777050ecc2d4d5419b70cdfe51 Mon Sep 17 00:00:00 2001 From: Leandro Lanzieri Date: Tue, 10 Mar 2020 14:25:48 +0100 Subject: [PATCH] boards/esp32: Move inclusion of boards_common_esp32 to common file --- boards/common/esp32/Makefile.dep | 2 ++ boards/esp32-mh-et-live-minikit/Makefile.dep | 2 -- boards/esp32-olimex-evb/Makefile.include | 2 -- boards/esp32-ttgo-t-beam/Makefile.dep | 2 -- boards/esp32-wemos-lolin-d32-pro/Makefile.dep | 1 - boards/esp32-wroom-32/Makefile.dep | 2 -- boards/esp32-wrover-kit/Makefile.dep | 2 -- 7 files changed, 2 insertions(+), 11 deletions(-) diff --git a/boards/common/esp32/Makefile.dep b/boards/common/esp32/Makefile.dep index 5472bf8b8d..09bfbf1579 100644 --- a/boards/common/esp32/Makefile.dep +++ b/boards/common/esp32/Makefile.dep @@ -1,3 +1,5 @@ +USEMODULE += boards_common_esp32 + ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif diff --git a/boards/esp32-mh-et-live-minikit/Makefile.dep b/boards/esp32-mh-et-live-minikit/Makefile.dep index f19c2c1a36..29d6c99ba8 100644 --- a/boards/esp32-mh-et-live-minikit/Makefile.dep +++ b/boards/esp32-mh-et-live-minikit/Makefile.dep @@ -1,3 +1 @@ -USEMODULE += boards_common_esp32 - include $(RIOTBOARD)/common/esp32/Makefile.dep diff --git a/boards/esp32-olimex-evb/Makefile.include b/boards/esp32-olimex-evb/Makefile.include index 6367a3f004..3b80eba858 100644 --- a/boards/esp32-olimex-evb/Makefile.include +++ b/boards/esp32-olimex-evb/Makefile.include @@ -1,7 +1,5 @@ PSEUDOMODULES += olimex_esp32_gateway -USEMODULE += boards_common_esp32 - # enables esp_eth as default network device # cannot be done in Makefile.dep since Makefile.dep is included too late ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE))) diff --git a/boards/esp32-ttgo-t-beam/Makefile.dep b/boards/esp32-ttgo-t-beam/Makefile.dep index 53b4915969..6c6d30e82b 100644 --- a/boards/esp32-ttgo-t-beam/Makefile.dep +++ b/boards/esp32-ttgo-t-beam/Makefile.dep @@ -2,6 +2,4 @@ ifneq (,$(filter esp32_ttgo_t_beam_v1_0,$(USEMODULE))) FEATURES_REQUIRED += periph_i2c endif -USEMODULE += boards_common_esp32 - 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 index d8a584436c..8953d3dac0 100644 --- a/boards/esp32-wemos-lolin-d32-pro/Makefile.dep +++ b/boards/esp32-wemos-lolin-d32-pro/Makefile.dep @@ -1,4 +1,3 @@ -USEMODULE += boards_common_esp32 USEMODULE += esp_spi_ram include $(RIOTBOARD)/common/esp32/Makefile.dep diff --git a/boards/esp32-wroom-32/Makefile.dep b/boards/esp32-wroom-32/Makefile.dep index f19c2c1a36..29d6c99ba8 100644 --- a/boards/esp32-wroom-32/Makefile.dep +++ b/boards/esp32-wroom-32/Makefile.dep @@ -1,3 +1 @@ -USEMODULE += boards_common_esp32 - include $(RIOTBOARD)/common/esp32/Makefile.dep diff --git a/boards/esp32-wrover-kit/Makefile.dep b/boards/esp32-wrover-kit/Makefile.dep index f19c2c1a36..29d6c99ba8 100644 --- a/boards/esp32-wrover-kit/Makefile.dep +++ b/boards/esp32-wrover-kit/Makefile.dep @@ -1,3 +1 @@ -USEMODULE += boards_common_esp32 - include $(RIOTBOARD)/common/esp32/Makefile.dep