alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-10-28 20:14:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/master_build_c3_example' into 'master'

Browse Source 
CI: enable example builds for C3

Closes IDF-2364

See merge request espressif/esp-idf!11968
This commit is contained in:
Angus Gratton
2021-02-10 11:54:26 +08:00
parent 2c0962f727 04df1f3a42
commit 4ce47b0394
47 changed files with 245 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp_wifi/esp32c3/esp_adapter.c
View File

@@ -420,12 +420,12 @@ static void IRAM_ATTR wifi_rtc_disable_iso_wrapper(void)
#endif
}
static void IRAM_ATTR wifi_clock_enable_wrapper(void)
static void wifi_clock_enable_wrapper(void)
{
wifi_module_enable();
}
static void IRAM_ATTR wifi_clock_disable_wrapper(void)
static void wifi_clock_disable_wrapper(void)
{
wifi_module_disable();
}

3
components/freemodbus/CMakeLists.txt
View File

@@ -1,7 +1,4 @@
idf_build_get_property(target IDF_TARGET)
if(${target} STREQUAL "esp32c3")
return() # TODO ESP32-C3 IDF-2173
endif()
# The following five lines of boilerplate have to be in your project's
# CMakeLists in this exact order for cmake to work correctly

1
components/freemodbus/port/port.h
View File

@@ -17,7 +17,6 @@
#define PORT_COMMON_H_
#include "freertos/FreeRTOS.h"
#include "freertos/xtensa_api.h"
#include "esp_log.h" // for ESP_LOGE macro
#include "mbconfig.h"

3
components/freertos/port/riscv/include/freertos/portmacro.h
View File

@@ -38,6 +38,7 @@ extern "C" {
#include <stdbool.h>
#include <stdio.h>
#include <limits.h>
#include "esp_timer.h" /* required for FreeRTOS run time stats */
#include "sdkconfig.h"
#include "esp_attr.h"
@@ -270,7 +271,7 @@ static inline unsigned portENTER_CRITICAL_NESTED(void) {
#ifdef CONFIG_FREERTOS_RUN_TIME_STATS_USING_ESP_TIMER
/* Coarse resolution time (us) */
#define portALT_GET_RUN_TIME_COUNTER_VALUE(x) do{(void)x; }while(0)
#define portALT_GET_RUN_TIME_COUNTER_VALUE(x) do {x = (uint32_t)esp_timer_get_time();} while(0)
#endif
extern void esp_vApplicationIdleHook( void );

2
components/freertos/port/xtensa/include/freertos/portmacro.h
View File

@@ -302,7 +302,7 @@ static inline void uxPortCompareSetExtram(volatile uint32_t *addr, uint32_t comp
#ifdef CONFIG_FREERTOS_RUN_TIME_STATS_USING_ESP_TIMER
/* Coarse resolution time (us) */
#define portALT_GET_RUN_TIME_COUNTER_VALUE(x) x = (uint32_t)esp_timer_get_time()
#define portALT_GET_RUN_TIME_COUNTER_VALUE(x) do {x = (uint32_t)esp_timer_get_time();} while(0)
#endif
void vPortYield( void );

7
components/hal/include/hal/spi_types.h
View File

@@ -49,11 +49,16 @@ FLAG_ATTR(spi_event_t)
#define SPI_HOST SPI1_HOST
#define HSPI_HOST SPI2_HOST
#define VSPI_HOST SPI3_HOST
#else // !CONFIG_IDF_TARGET_ESP32
#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
// SPI_HOST (SPI1_HOST) is not supported by the SPI Master and SPI Slave driver on ESP32-S2 and later
#define SPI_HOST SPI1_HOST
#define FSPI_HOST SPI2_HOST
#define HSPI_HOST SPI3_HOST
#elif CONFIG_IDF_TARGET_ESP32C3
/* No SPI3_host on C3 */
#define SPI_HOST SPI1_HOST
#define FSPI_HOST SPI2_HOST
#define HSPI_HOST SPI2_HOST
#endif
/** @endcond */

8
components/mbedtls/CMakeLists.txt
View File

@@ -182,8 +182,12 @@ set_property(TARGET mbedcrypto APPEND PROPERTY LINK_INTERFACE_LIBRARIES mbedtls)
target_link_libraries(${COMPONENT_LIB} PUBLIC ${mbedtls_targets})
if(CONFIG_ESP_TLS_USE_DS_PERIPHERAL)
# Link target (esp32s2) library to component library
target_link_libraries(${COMPONENT_LIB} PUBLIC ${target})
# Link target (e.g. esp32s2) library to component library
idf_component_get_property(target_lib ${target} COMPONENT_LIB)
set_property(TARGET mbedcrypto APPEND PROPERTY INTERFACE_LINK_LIBRARIES $<LINK_ONLY:${target_lib}>)
# The linker seems to be unable to resolve all the dependencies without increasing this
set_property(TARGET mbedcrypto APPEND PROPERTY LINK_INTERFACE_MULTIPLICITY 6)
target_link_libraries(${COMPONENT_LIB} PUBLIC ${target_lib})
endif()
# Link esp-cryptoauthlib to mbedtls

1
components/wpa_supplicant/src/common/bss.c
View File

@@ -14,7 +14,6 @@
#include "drivers/driver.h"
#include "eap_peer/eap.h"
#include "wpa_supplicant_i.h"
#include "config.h"
#include "scan.h"
#include "bss.h"
#ifdef ESP_SUPPLICANT

1
components/wpa_supplicant/src/common/scan.c
View File

@@ -10,7 +10,6 @@
#include "utils/common.h"
#include "common/ieee802_11_defs.h"
#include "config.h"
#include "wpa_supplicant_i.h"
#include "drivers/driver.h"
#include "common/ieee802_11_common.h"

4
components/wpa_supplicant/src/esp_supplicant/esp_common.c
View File

@@ -194,7 +194,7 @@ static void esp_register_action_frame(struct wpa_supplicant *wpa_s)
}
static void esp_supplicant_sta_conn_handler(void* arg, esp_event_base_t event_base,
int event_id, void* event_data)
int32_t event_id, void* event_data)
{
u8 bssid[ETH_ALEN];
u8 *ie;
@@ -221,7 +221,7 @@ static void esp_supplicant_sta_conn_handler(void* arg, esp_event_base_t event_ba
}
static void esp_supplicant_sta_disconn_handler(void* arg, esp_event_base_t event_base,
int event_id, void* event_data)
int32_t event_id, void* event_data)
{
struct wpa_supplicant *wpa_s = &g_wpa_supp;
wpas_rrm_reset(wpa_s);

2
components/wpa_supplicant/src/esp_supplicant/esp_scan.c
View File

@@ -33,7 +33,7 @@
extern struct wpa_supplicant g_wpa_supp;
static void esp_scan_done_event_handler(void* arg, esp_event_base_t event_base,
int event_id, void* event_data)
int32_t event_id, void* event_data)
{
struct wpa_supplicant *wpa_s = &g_wpa_supp;
if (!wpa_s->scanning) {