Merge branch 'feature/remove_wps_lib' into 'master'

feat(lib): remove wps library See merge request sdk/ESP8266_RTOS_SDK!377
espressif · Aug 10, 2018 · af14369 · af14369
2 parents 3d1844c + 9f19a82
commit af14369
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 145 deletions.
diff --git a/components/esp8266/CMakeLists.txt b/components/esp8266/CMakeLists.txt
@@ -12,7 +12,7 @@ register_component()
 target_link_libraries(${COMPONENT_NAME} "-L ${CMAKE_CURRENT_SOURCE_DIR}/lib")
 if(NOT CONFIG_NO_BLOBS)
     target_link_libraries(${COMPONENT_NAME} airkiss crypto espnow gcc hal core mirom
-                                            net80211 phy pp pwm smartconfig ssc wpa wps cirom)
+                                            net80211 phy pp pwm smartconfig ssc wpa cirom)
 endif()
 
 target_link_libraries(${COMPONENT_NAME} "-u call_user_start")

diff --git a/components/esp8266/component.mk b/components/esp8266/component.mk
@@ -12,7 +12,7 @@ COMPONENT_SRCDIRS := driver source
 LIBS ?=
 ifndef CONFIG_NO_BLOBS
 LIBS += airkiss crypto espnow gcc hal core net80211 \
-        phy pp pwm smartconfig ssc wpa wps
+        phy pp pwm smartconfig ssc wpa
 endif
 
 #Linker scripts used to link the final application.

diff --git a/components/esp8266/include/esp_wps.h b/components/esp8266/include/esp_wps.h
diff --git a/components/esp8266/lib/VERSION b/components/esp8266/lib/VERSION
@@ -6,5 +6,4 @@ gwen:
     pp:         830c0c8
     pwm:        0181338
     smartconfig:86a18f3
-    wpa:        f59f0e0
-    wps:        f59f0e0
+    wpa:        f59f0e0
diff --git a/components/esp8266/lib/libwps.a b/components/esp8266/lib/libwps.a