Ver Fonte

Merge branch 'bugfix/fix_esp32s2_chip_version_name' into 'master'

wifi: Change esp32s2beta dirname to esp32s2 in wifi-lib

See merge request espressif/esp-idf!7654
Jiang Jiang Jian há 6 anos atrás
pai
commit
e2d8f81ef5

+ 0 - 3
components/esp_wifi/CMakeLists.txt

@@ -34,9 +34,6 @@ idf_build_get_property(build_dir BUILD_DIR)
 
 # ToDo: Rename esp32s2beta to esp32s2 next time update wifi lib
 set(target_name "${idf_target}")
-if(idf_target STREQUAL "esp32s2")
-    set(target_name "esp32s2beta")
-endif()
 target_link_libraries(${COMPONENT_LIB} PUBLIC "-L ${CMAKE_CURRENT_SOURCE_DIR}/lib/${target_name}")
 
 if(link_binary_libs)

+ 1 - 1
components/esp_wifi/lib

@@ -1 +1 @@
-Subproject commit 16036e13dfd924bbc9cc834a107c43939071d335
+Subproject commit 6b5e54a1f75c78fef093262373d4b8781ac9ad1f

+ 1 - 1
components/esp_wifi/test_md5/test_md5.sh

@@ -19,7 +19,7 @@ case $IDF_TARGET in
         ;;
     esp32s2)
         PREFIX=xtensa-esp32s2-elf-
-        LIB_DIR=esp32s2beta
+        LIB_DIR=esp32s2
         ;;
     *)
         echo "Invalid IDF_TARGET value: \"${IDF_TARGET}\""