From afff683696546b78cf8892813c6763efe9698e99 Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Fri, 22 Nov 2019 17:32:37 +0100 Subject: [PATCH 1/5] cpu/esp32: number of thread priorities for esp_eth The number of thread priority levels has to be 32 if esp_eth is used. --- cpu/esp32/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpu/esp32/Makefile.include b/cpu/esp32/Makefile.include index b52b43a823..f28699be1a 100644 --- a/cpu/esp32/Makefile.include +++ b/cpu/esp32/Makefile.include @@ -109,7 +109,7 @@ INCLUDES += -I$(RIOTBOARD)/common/$(CPU)/include INCLUDES += -I$(RIOTCPU)/$(CPU) # if any WiFi interface is used, the number of priority levels has to be 32 -ifneq (,$(filter esp_wifi_any,$(USEMODULE))) +ifneq (,$(filter esp_wifi_any esp_eth,$(USEMODULE))) CFLAGS += -DSCHED_PRIO_LEVELS=32 endif From 72967f8fc3dbdb57dec074a47f32f39f18994788 Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Fri, 22 Nov 2019 17:37:52 +0100 Subject: [PATCH 2/5] cpu/esp32: GNRC_NETIF_NUMOF is handled in CPU makefile Since Makefile.dep files are included as last files multiple times to resolve all module dependencies, GNRC_NETIF_NUMOF is handled here. --- boards/esp32-olimex-evb/Makefile.include | 10 +++------- cpu/esp32/Makefile.include | 4 ++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/boards/esp32-olimex-evb/Makefile.include b/boards/esp32-olimex-evb/Makefile.include index 020c145151..6367a3f004 100644 --- a/boards/esp32-olimex-evb/Makefile.include +++ b/boards/esp32-olimex-evb/Makefile.include @@ -2,14 +2,10 @@ PSEUDOMODULES += olimex_esp32_gateway USEMODULE += boards_common_esp32 -# enables esp_eth as network device +# 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))) - # avoid multiple definitions when package depenedencies are resolved recursively - ifndef MODULE_ESP_ETH_ADDED - MODULE_ESP_ETH_ADDED = 1 - USEMODULE += esp_eth - $(eval GNRC_NETIF_NUMOF=$(shell echo $$(($(GNRC_NETIF_NUMOF)+1)))) - endif + USEMODULE += esp_eth endif include $(RIOTBOARD)/common/esp32/Makefile.include diff --git a/cpu/esp32/Makefile.include b/cpu/esp32/Makefile.include index f28699be1a..6a87a62685 100644 --- a/cpu/esp32/Makefile.include +++ b/cpu/esp32/Makefile.include @@ -51,6 +51,10 @@ ifneq (,$(filter esp_wifi,$(USEMODULE))) USEMODULE += esp_wifi_any endif +ifneq (,$(filter esp_eth,$(USEMODULE))) + $(eval GNRC_NETIF_NUMOF=$(shell echo $$(($(GNRC_NETIF_NUMOF)+1)))) +endif + ifneq (,$(filter spiffs,$(USEMODULE))) export RIOT_TEST_TIMEOUT = 300 endif From 71d6a71364b4666cbadf0d19c63c1b410aea0b33 Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Sat, 23 Nov 2019 12:09:48 +0100 Subject: [PATCH 3/5] cpu/esp32: defines esp_now as default netdev If the user or the board definition doesn't enable `esp_wifi` or `esp_eth`, `esp_now` is defined as default netdev. fixup! cpu/esp32: defines esp_now as default netdev --- cpu/esp32/Makefile.include | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cpu/esp32/Makefile.include b/cpu/esp32/Makefile.include index 6a87a62685..6c2332ad27 100644 --- a/cpu/esp32/Makefile.include +++ b/cpu/esp32/Makefile.include @@ -41,6 +41,13 @@ ifneq (,$(filter esp_gdbstub,$(USEMODULE))) USEMODULE += esp_gdb endif +ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE))) + # use esp_now as default netdev if no other netdev module is enabled + ifeq (,$(filter esp_wifi esp_eth,$(USEMODULE))) + USEMODULE += esp_now + endif +endif + ifneq (,$(filter esp_now,$(USEMODULE))) $(eval GNRC_NETIF_NUMOF=$(shell echo $$(($(GNRC_NETIF_NUMOF)+1)))) USEMODULE += esp_wifi_any From 7325192fcdafe14714a15bbfcfb56fe4e17e9e73 Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Sat, 23 Nov 2019 12:10:57 +0100 Subject: [PATCH 4/5] cpu/esp8266: defines esp_now as default netdev If the user or the board definition doesn't enable `esp_wifi`, `esp_now` is defined as default netdev. --- cpu/esp8266/Makefile.include | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/cpu/esp8266/Makefile.include b/cpu/esp8266/Makefile.include index 1c7ba7e14e..4ee539a3e9 100644 --- a/cpu/esp8266/Makefile.include +++ b/cpu/esp8266/Makefile.include @@ -19,10 +19,25 @@ endif # SPECIAL module dependencies # cannot be done in Makefile.dep since Makefile.dep is included too late -ifneq (, $(filter esp_now esp_wifi, $(USEMODULE))) +ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE))) + # use esp_now as default netdev if no other netdev module is enabled + ifeq (,$(filter esp_wifi esp_eth,$(USEMODULE))) + USEMODULE += esp_now + endif +endif + +ifneq (, $(filter esp_wifi, $(USEMODULE))) $(eval GNRC_NETIF_NUMOF=$(shell echo $$(($(GNRC_NETIF_NUMOF)+1)))) - CFLAGS += -DSCHED_PRIO_LEVELS=32 USEMODULE += esp_wifi_any +endif + +ifneq (, $(filter esp_now, $(USEMODULE))) + $(eval GNRC_NETIF_NUMOF=$(shell echo $$(($(GNRC_NETIF_NUMOF)+1)))) + USEMODULE += esp_wifi_any +endif + +ifneq (, $(filter esp_wifi_any, $(USEMODULE))) + CFLAGS += -DSCHED_PRIO_LEVELS=32 USEMODULE += netopt USEMODULE += xtimer endif From 500c5f45f3f4f09cb815c42ae780376d43f8976d Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Sat, 23 Nov 2019 12:11:33 +0100 Subject: [PATCH 5/5] tests/netstat_l2: add esp8266 boards to BOARD_PROVIDES_NETIF --- tests/netstats_l2/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/netstats_l2/Makefile b/tests/netstats_l2/Makefile index 8773329a19..1da76655bb 100644 --- a/tests/netstats_l2/Makefile +++ b/tests/netstats_l2/Makefile @@ -4,7 +4,8 @@ BOARD_PROVIDES_NETIF := airfy-beacon fox iotlab-m3 mulle native nrf51dk nrf51don nrf6310 pba-d-01-kw2x samd21-xpro saml21-xpro samr21-xpro spark-core \ yunjia-nrf51822 msba2 \ esp32-mh-et-live-minikit esp32-olimex-evb \ - esp32-wemos-lolin-d32-pro esp32-wroom-32 esp32-wrover-kit + esp32-wemos-lolin-d32-pro esp32-wroom-32 esp32-wrover-kit \ + esp8266-esp-12x esp8266-olimex-mod esp8266-sparkfun-thing BOARD_WHITELIST += $(BOARD_PROVIDES_NETIF)