riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12757 from gschorcht/cpu/esp32/fix_xtimer_deps

Browse Source 
cpu/esp32: fix xtimer dependency
This commit is contained in:
Alexandre Abadie 2019-11-21 09:23:19 +01:00 committed by GitHub
commit bef34d400e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cpu/esp32/Makefile.dep
View File

@ -12,6 +12,7 @@ ifneq (,$(filter esp_eth,$(USEMODULE)))
USEMODULE += netdev_eth USEMODULE += netdev_eth
USEMODULE += netopt USEMODULE += netopt
USEMODULE += riot_freertos USEMODULE += riot_freertos
USEMODULE += xtimer
INCLUDES += -I$(RIOTCPU)/$(CPU)/vendor/esp-idf/include/ethernet INCLUDES += -I$(RIOTCPU)/$(CPU)/vendor/esp-idf/include/ethernet
INCLUDES += -I$(ESP32_SDK_DIR)/components/ethernet/include INCLUDES += -I$(ESP32_SDK_DIR)/components/ethernet/include
endif endif
@ -38,6 +39,7 @@ ifneq (,$(filter esp_wifi_any,$(USEMODULE)))
USEMODULE += esp_idf_wpa_supplicant_port USEMODULE += esp_idf_wpa_supplicant_port
USEMODULE += esp_idf_nvs_flash USEMODULE += esp_idf_nvs_flash
USEMODULE += riot_freertos USEMODULE += riot_freertos
USEMODULE += xtimer
# crypto and hashes produce symbol conflicts with esp_idf_wpa_supplicant_crypto # crypto and hashes produce symbol conflicts with esp_idf_wpa_supplicant_crypto
DISABLE_MODULE += crypto DISABLE_MODULE += crypto
@ -50,11 +52,6 @@ ifneq (,$(filter esp_idf_nvs_flash,$(USEMODULE)))
USEMODULE += pthread USEMODULE += pthread
endif endif
ifneq (,$(filter riot_freertos,$(USEMODULE)))
# add additional modules required by riot_freertos
USEMODULE += xtimer
endif
ifneq (,$(filter periph_i2c,$(USEMODULE))) ifneq (,$(filter periph_i2c,$(USEMODULE)))
ifneq (,$(filter esp_i2c_hw,$(USEMODULE))) ifneq (,$(filter esp_i2c_hw,$(USEMODULE)))
USEMODULE += core_thread_flags USEMODULE += core_thread_flags
@ -89,7 +86,6 @@ endif
ifneq (,$(filter shell,$(USEMODULE))) ifneq (,$(filter shell,$(USEMODULE)))
USEMODULE += ps USEMODULE += ps
USEMODULE += xtimer
endif endif
# if SPI RAM is enabled, ESP-IDF heap and quot flash mode have to be used # if SPI RAM is enabled, ESP-IDF heap and quot flash mode have to be used

4
cpu/esp32/freertos/timers.c
View File

@ -10,6 +10,8 @@
#ifndef DOXYGEN #ifndef DOXYGEN
#ifdef MODULE_XTIMER
#define ENABLE_DEBUG 0 #define ENABLE_DEBUG 0
#include "debug.h" #include "debug.h"
@ -103,4 +105,6 @@ BaseType_t xTimerStop (TimerHandle_t xTimer, TickType_t xBlockTime)
return pdTRUE; return pdTRUE;
} }
#endif /* MODULE_XTIMER */
#endif /* DOXYGEN */ #endif /* DOXYGEN */