From 252c3886b0b73de3ea8365780c95d83f05e52182 Mon Sep 17 00:00:00 2001 From: Leandro Lanzieri Date: Wed, 17 Nov 2021 13:41:32 +0100 Subject: [PATCH] cpu/esp32: do not expand USEMODULE --- boards/esp32-wemos-lolin-d32-pro/Makefile.default | 1 + boards/esp32-wemos-lolin-d32-pro/Makefile.dep | 2 -- cpu/esp32/Makefile.dep | 4 ---- 3 files changed, 1 insertion(+), 6 deletions(-) create mode 100644 boards/esp32-wemos-lolin-d32-pro/Makefile.default diff --git a/boards/esp32-wemos-lolin-d32-pro/Makefile.default b/boards/esp32-wemos-lolin-d32-pro/Makefile.default new file mode 100644 index 0000000000..1881d1e317 --- /dev/null +++ b/boards/esp32-wemos-lolin-d32-pro/Makefile.default @@ -0,0 +1 @@ +DEFAULT_MODULE += esp_spi_ram diff --git a/boards/esp32-wemos-lolin-d32-pro/Makefile.dep b/boards/esp32-wemos-lolin-d32-pro/Makefile.dep index 8953d3dac0..29d6c99ba8 100644 --- a/boards/esp32-wemos-lolin-d32-pro/Makefile.dep +++ b/boards/esp32-wemos-lolin-d32-pro/Makefile.dep @@ -1,3 +1 @@ -USEMODULE += esp_spi_ram - include $(RIOTBOARD)/common/esp32/Makefile.dep diff --git a/cpu/esp32/Makefile.dep b/cpu/esp32/Makefile.dep index 0c1ee1aed3..8b119dd56b 100644 --- a/cpu/esp32/Makefile.dep +++ b/cpu/esp32/Makefile.dep @@ -66,10 +66,6 @@ ifneq (,$(filter periph_i2c,$(USEMODULE))) endif endif -ifneq (,$(filter esp_spi_ram,$(DISABLE_MODULE))) - USEMODULE := $(filter-out esp_spi_ram,$(USEMODULE)) -endif - ifneq (,$(filter esp_now esp_wifi esp_spi_ram,$(USEMODULE))) # the ESP-IDF heap has to be used if SPI RAM is used USEMODULE += esp_idf_heap