alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-09-30 19:19:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/cmake' into 'master'

Browse Source 
Merge experimental CMake support to master

See merge request idf/esp-idf!3024
This commit is contained in:
Angus Gratton
2018-09-07 13:44:17 +08:00
parent aab43e6dda 36bc73e5a6
commit 4eeed31a04
294 changed files with 14200 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/ethernet/emac_main.c
View File

@@ -292,8 +292,8 @@ static void emac_set_user_config_data(eth_config_t *config)
#if DMA_RX_BUF_NUM > 9
emac_config.emac_flow_ctrl_enable = config->flow_ctrl_enable;
#else
if (config->flow_ctrl_enable == true) {
ESP_LOGE(TAG, "eth flow ctrl init err!!! Please run make menuconfig and make sure DMA_RX_BUF_NUM > 9 .");
if(config->flow_ctrl_enable == true) {
ESP_LOGE(TAG, "Can only configure flow_ctrl_enable==true if DMA_RX_BUF_NUM in menuconfig is >9. Disabling flow control.");
}
emac_config.emac_flow_ctrl_enable = false;
#endif