diff --git a/boards/esp32-wroom-32/Makefile.dep b/boards/esp32-wroom-32/Makefile.dep index 42df7386db..f19c2c1a36 100644 --- a/boards/esp32-wroom-32/Makefile.dep +++ b/boards/esp32-wroom-32/Makefile.dep @@ -1,51 +1,3 @@ USEMODULE += boards_common_esp32 include $(RIOTBOARD)/common/esp32/Makefile.dep - -# default parameter definitions when module enc28j60 is used -ifneq (, $(filter enc28j60, $(USEMODULE))) - - # avoid multiple definitions when package depenedencies are resolved recursively - ifndef ENC28J60_PARAM_DEFINED - ENC28J60_PARAM_DEFINED = 1 - - # default definitions - ENC28J60_PARAM_SPI ?= SPI_DEV\(0\) - ENC28J60_PARAM_CS ?= GPIO32 - ENC28J60_PARAM_INT ?= GPIO35 - ENC28J60_PARAM_RESET ?= GPIO33 - CFLAGS += -DENC28J60_PARAM_SPI=$(ENC28J60_PARAM_SPI) - CFLAGS += -DENC28J60_PARAM_CS=$(ENC28J60_PARAM_CS) - CFLAGS += -DENC28J60_PARAM_INT=$(ENC28J60_PARAM_INT) - CFLAGS += -DENC28J60_PARAM_RESET=$(ENC28J60_PARAM_RESET) - - # to satisfy variable defintions in tests/driver_enc28j60/Makefile - ENC_SPI = $(ENC28J60_PARAM_SPI) - ENC_CS = $(ENC28J60_PARAM_CS) - ENC_INT = $(ENC28J60_PARAM_INT) - ENC_RST = $(ENC28J60_PARAM_RESET) - - endif -endif - -# default parameter definitions when module mfr24j40 is used -ifneq (, $(filter mrf24j40, $(USEMODULE))) - - # avoid multiple definitions when package depenedencies are resolved recursively - ifndef MRF24J40_PARAM_DEFINED - MRF24J40_PARAM_DEFINED = 1 - - # default definitions - MRF24J40_PARAM_SPI = SPI_DEV\(0\) - MRF24J40_PARAM_SPI_CLK = SPI_CLK_1MHZ - MRF24J40_PARAM_CS ?= GPIO16 - MRF24J40_PARAM_INT ?= GPIO34 - MRF24J40_PARAM_RESET ?= GPIO17 - CFLAGS += -DMRF24J40_PARAM_SPI=$(MRF24J40_PARAM_SPI) - CFLAGS += -DMRF24J40_PARAM_SPI_CLK=$(MRF24J40_PARAM_SPI_CLK) - CFLAGS += -DMRF24J40_PARAM_CS=$(MRF24J40_PARAM_CS) - CFLAGS += -DMRF24J40_PARAM_INT=$(MRF24J40_PARAM_INT) - CFLAGS += -DMRF24J40_PARAM_RESET=$(MRF24J40_PARAM_RESET) - - endif -endif diff --git a/boards/esp32-wroom-32/doc.txt b/boards/esp32-wroom-32/doc.txt index 1bd5d6aa1a..ce5c6dfb66 100644 --- a/boards/esp32-wroom-32/doc.txt +++ b/boards/esp32-wroom-32/doc.txt @@ -107,9 +107,10 @@ MRF24J40-based IEEE 802.15.4 radio modules and ENC28J60-based Ethernet network i #ifdef BOARD_ESP32_WROOM-32 #if MODULE_MRF24J40 -#define MRF24J40_PARAM_CS GPIO16 /* MRF24J40 CS signal */ -#define MRF24J40_PARAM_RESET GPIO17 /* MRF24J40 RESET signal */ -#define MRF24J40_PARAM_INT GPIO34 /* MRF24J40 INT signal */ +#define MRF24J40_PARAM_CS GPIO16 /* MRF24J40 CS signal */ +#define MRF24J40_PARAM_RESET GPIO17 /* MRF24J40 RESET signal */ +#define MRF24J40_PARAM_INT GPIO34 /* MRF24J40 INT signal */ +#define MRF24J40_PARAM_SPI_CLK SPI_CLK_1MHZ /* SPI clock frequency */ #endif #if MODULE_ENC28J80