kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-26 06:53:52 +01:00
Code Releases Activity

cpu/esp32/esp-idf: migration to ESP-IDF v5.4

Browse Source
This commit is contained in:
Gunar Schorcht 2025-03-02 11:35:41 +01:00
parent c93a346ef1
commit cd7b1a662d
3 changed files with 31 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cpu/esp32/esp-idf/esp_idf.mk
View File

@ -1,19 +1,25 @@
# common definitions for all ESP-IDF modules
# additional include pathes required by ESP-IDF module
INCLUDES += -I$(ESP32_SDK_DIR)/components/bootloader_support/bootloader_flash/include
INCLUDES += -I$(ESP32_SDK_DIR)/components/bootloader_support/include
INCLUDES += -I$(ESP32_SDK_DIR)/components/bootloader_support/include_bootloader
INCLUDES += -I$(ESP32_SDK_DIR)/components/driver/$(CPU_FAM)/include
INCLUDES += -I$(ESP32_SDK_DIR)/components/bootloader_support/private_include
INCLUDES += -I$(ESP32_SDK_DIR)/components/efuse/include
INCLUDES += -I$(ESP32_SDK_DIR)/components/efuse/$(CPU_FAM)/include
INCLUDES += -I$(ESP32_SDK_DIR)/components/efuse/$(CPU_FAM)/private_include
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_app_format/include
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_driver_gpio/include
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_hw_support/ldo/include
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_hw_support/port/include
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_hw_support/port/$(CPU_FAM)
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_hw_support/port/$(CPU_FAM)/private_include
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_ipc/include
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_mm/include
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_pm/include
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_system/port/public_compat
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_system/port/include/private
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_timer/include
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_timer/private_include
INCLUDES += -I$(ESP32_SDK_DIR)/components/freertos/esp_additions/include
INCLUDES += -I$(ESP32_SDK_DIR)/components/hal/platform_port/include/hal
INCLUDES += -I$(ESP32_SDK_DIR)/components/hal/$(CPU_FAM)/include
INCLUDES += -I$(ESP32_SDK_DIR)/components/newlib/priv_include
INCLUDES += -I$(ESP32_SDK_DIR)/components/spi_flash/include
@ -22,8 +28,12 @@ ifneq (,$(filter xtensa%,$(TARGET_ARCH)))
INCLUDES += -I$(ESP32_SDK_DIR)/components/xtensa/$(CPU_FAM)/include
endif
ifneq (,$(filter esp32c3 esp32h2 esp32s3,$(CPU_FAM)))
INCLUDES += -I$(ESP32_SDK_DIR)/components/esp_hw_support/port/$(CPU_FAM)/private_include
ifeq (esp32s3,$(CPU_FAM))
INCLUDES += -I$(ESP32_SDK_DIR)/components/spi_flash/include/spi_flash
endif
ifneq (,$(filter periph_i2c%,$(USEMODULE)))
INCLUDES += -I$(ESP32_SDK_DIR)/components/driver/i2c/include
endif
SRC := $(addprefix $(ESP32_SDK_DIR)/,$(ESP32_SDK_SRC))

7
cpu/esp32/esp-idf/esp_idf_cflags.mk
View File

@ -34,13 +34,10 @@ CFLAGS += -Wno-enum-compare
# those are false positives.
CFLAGS += -Wno-cast-align
# TODO: required to be able to compile with GCC 12.1, remove them after upgrade to ESP-IDF 5.1
CFLAGS += -Wno-attributes
# TODO: required to be able to compile with GCC 14.0, remove them later
CFLAGS += -Wno-enum-conversion
CFLAGS += -Wno-error=format=
CFLAGS += -Wno-format
CFLAGS += -Wno-use-after-free
CFLAGS += -Wno-incompatible-pointer-types
CFLAGS += -Wno-unused-function
# additional CFLAGS required for RISC-V architecture
ifneq (,$(filter riscv32%,$(TARGET_ARCH)))

48
cpu/esp32/esp-idf/esp_idf_support.c
View File

@ -36,39 +36,6 @@
ESP_EVENT_DEFINE_BASE(IP_EVENT);
#endif
/* Global variables required by ESP-IDF */
uint8_t *g_wpa_anonymous_identity;
int g_wpa_anonymous_identity_len;
uint8_t *g_wpa_username;
int g_wpa_username_len;
uint8_t *g_wpa_password;
int g_wpa_password_len;
uint8_t *g_wpa_new_password;
int g_wpa_new_password_len;
const uint8_t *g_wpa_client_cert;
int g_wpa_client_cert_len;
const uint8_t *g_wpa_private_key;
int g_wpa_private_key_len;
const uint8_t *g_wpa_private_key_passwd;
int g_wpa_private_key_passwd_len;
const uint8_t *g_wpa_ca_cert;
int g_wpa_ca_cert_len;
char *g_wpa_ttls_phase2_type;
bool g_wpa_suiteb_certification;
char *g_wpa_phase1_options;
uint8_t *g_wpa_pac_file;
int g_wpa_pac_file_len;
/*
* provided by: /path/to/esp-idf/components/log/log_freertos.c
*/
@ -88,7 +55,7 @@ static esp_log_level_entry_t _log_levels[] = {
};
/*
* provided by: /path/to/esp-idf/component/log/log.c
* provided by: /path/to/esp-idf/components/log/log.c
*/
void IRAM_ATTR esp_log_write(esp_log_level_t level,
const char* tag, const char* format, ...)
@ -100,7 +67,7 @@ void IRAM_ATTR esp_log_write(esp_log_level_t level,
}
/*
* provided by: /path/to/esp-idf/component/log/log.c
* provided by: /path/to/esp-idf/components/log/log.c
*/
void IRAM_ATTR esp_log_writev(esp_log_level_t level,
const char *tag,
@ -134,7 +101,7 @@ void IRAM_ATTR esp_log_writev(esp_log_level_t level,
}
/*
* provided by: /path/to/esp-idf/component/log/log.c
* provided by: /path/to/esp-idf/components/log/log.c
*/
void esp_log_level_set(const char* tag, esp_log_level_t level)
{
@ -152,3 +119,12 @@ void esp_log_level_set(const char* tag, esp_log_level_t level)
_log_levels[i].level = level;
}
/*
* provided by: /path/to/esp-idf/components/newlib/time.c
*/
void esp_newlib_time_init(void)
{
extern void esp_time_impl_init(void);
esp_time_impl_init();
}