From 86623ba27f6ca1153d52e9d1f2c2a299b4ff3cb5 Mon Sep 17 00:00:00 2001
From: XiaochaoGONG <gongxiaochao@espressif.com>
Date: Tue, 31 Mar 2020 11:37:25 +0800
Subject: [PATCH] sync submodule idfv4.0

---
 .gitlab-ci.yml                                         |  5 ++++-
 components/esp-sr/CMakeLists.txt                       | 10 +++++-----
 esp-idf                                                |  2 +-
 .../components/network_blufi/wechat_security.c         |  2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2eb1673..75fb0cd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,7 +36,10 @@ before_script:
   - source esp-idf/tools/ci/configure_ci_environment.sh
 
   # fetch the submodules (& if necessary re-fetch repo) from gitlab
-  - time ./esp-idf/tools/ci/get-full-sources.sh
+  - time git submodule update --init --recursive
+
+  - ./esp-idf/install.sh
+  - . ./esp-idf/export.sh
 
 
 .add_gitlab_key_before:
diff --git a/components/esp-sr/CMakeLists.txt b/components/esp-sr/CMakeLists.txt
index 6317ec3..f139f41 100644
--- a/components/esp-sr/CMakeLists.txt
+++ b/components/esp-sr/CMakeLists.txt
@@ -12,9 +12,9 @@ target_link_libraries(${COMPONENT_TARGET} "-L ${CMAKE_CURRENT_SOURCE_DIR}/lib")
 target_link_libraries(${COMPONENT_TARGET} "-L ${CMAKE_CURRENT_SOURCE_DIR}/wake_word_engine")
 target_link_libraries(${COMPONENT_TARGET} "-L ${CMAKE_CURRENT_SOURCE_DIR}/acoustic_algorithm")
 target_link_libraries(${COMPONENT_TARGET} 
-    dl_lib_sr
-    c_speech_features
-    wakenet
-    hilexin_wn5
     esp_audio_processor
-    )
\ No newline at end of file
+    hilexin_wn5
+    wakenet
+    c_speech_features
+    dl_lib_sr
+    )
diff --git a/esp-idf b/esp-idf
index 463a9d8..57a5a48 160000
--- a/esp-idf
+++ b/esp-idf
@@ -1 +1 @@
-Subproject commit 463a9d8b7f9af8205222b80707f9bdbba7c530e1
+Subproject commit 57a5a486ffc5e5e61eb7b69e3456f4cebdb24a63
diff --git a/examples/single_chip/recognition_wechat/components/network_blufi/wechat_security.c b/examples/single_chip/recognition_wechat/components/network_blufi/wechat_security.c
index a8baf9d..43cb3c1 100644
--- a/examples/single_chip/recognition_wechat/components/network_blufi/wechat_security.c
+++ b/examples/single_chip/recognition_wechat/components/network_blufi/wechat_security.c
@@ -40,7 +40,7 @@
 #include "mbedtls/aes.h"
 #include "mbedtls/dhm.h"
 #include "mbedtls/md5.h"
-#include "rom/crc.h"
+#include "esp32/rom/crc.h"
 
 /* wechat Includes */
 #include "wechat_blufi.h"