diff --git a/components/esp8266/include/esp_wifi_os_adapter.h b/components/esp8266/include/esp_wifi_os_adapter.h
index 4a42010d..d91ac19c 100644
--- a/components/esp8266/include/esp_wifi_os_adapter.h
+++ b/components/esp8266/include/esp_wifi_os_adapter.h
@@ -37,8 +37,6 @@ extern "C" {
 
 typedef struct {
     int32_t version;
-    uint32_t (*enter_critical)(void);
-    void (*exit_critical)(uint32_t tmp);
 
     void *(*task_create)(void *task_func, const char *name, uint32_t stack_depth, void *param, uint32_t prio);
     void (*task_delete)(void *task_handle);
diff --git a/components/esp8266/include/esp_wifi_osi.h b/components/esp8266/include/esp_wifi_osi.h
index 961e3427..9e19dcc9 100644
--- a/components/esp8266/include/esp_wifi_osi.h
+++ b/components/esp8266/include/esp_wifi_osi.h
@@ -23,12 +23,6 @@ extern "C" {
 
 extern wifi_osi_funcs_t s_wifi_osi_funcs;
 
-#define wifi_enter_critical(t) \
-    t = s_wifi_osi_funcs.enter_critical()
-
-#define wifi_exit_critical(t) \
-    s_wifi_osi_funcs.exit_critical(t)
-
 #define wifi_task_create(func, name, depth, param, pri) \
     s_wifi_osi_funcs.task_create(func, name, depth, param, pri)
 
diff --git a/components/esp8266/lib/VERSION b/components/esp8266/lib/VERSION
index f9afa99f..b6e70bd5 100644
--- a/components/esp8266/lib/VERSION
+++ b/components/esp8266/lib/VERSION
@@ -1,9 +1,9 @@
 gwen:
-    crypto:     8943c89
+    crypto:     eca7811
     espnow:     8943c89
-    core:       b394446
-    net80211:   b394446
-    pp:         830c0c8
+    core:       eca7811
+    net80211:   eca7811
+    pp:         eca7811
     pwm:        0181338
-    smartconfig:68bd9c5
-    wpa:        f59f0e0
\ No newline at end of file
+    smartconfig:eca7811
+    wpa:        eca7811
\ No newline at end of file
diff --git a/components/esp8266/lib/libcrypto.a b/components/esp8266/lib/libcrypto.a
index 754e4250..b26241c9 100644
Binary files a/components/esp8266/lib/libcrypto.a and b/components/esp8266/lib/libcrypto.a differ
diff --git a/components/esp8266/lib/libpp.a b/components/esp8266/lib/libpp.a
index ae97345c..4e5d1f6a 100644
Binary files a/components/esp8266/lib/libpp.a and b/components/esp8266/lib/libpp.a differ
diff --git a/components/esp8266/lib/libsmartconfig.a b/components/esp8266/lib/libsmartconfig.a
index 822ab1bc..1c830c59 100644
Binary files a/components/esp8266/lib/libsmartconfig.a and b/components/esp8266/lib/libsmartconfig.a differ
diff --git a/components/esp8266/lib/libwpa.a b/components/esp8266/lib/libwpa.a
index b5872f35..6dbdf1c7 100644
Binary files a/components/esp8266/lib/libwpa.a and b/components/esp8266/lib/libwpa.a differ
diff --git a/components/esp8266/source/esp_wifi_os_adapter.c b/components/esp8266/source/esp_wifi_os_adapter.c
index 2fa9d0f0..02e4c55c 100644
--- a/components/esp8266/source/esp_wifi_os_adapter.c
+++ b/components/esp8266/source/esp_wifi_os_adapter.c
@@ -31,18 +31,6 @@
 #include "esp_newlib.h"
 #endif
 
-static uint32_t IRAM_ATTR enter_critical_wrapper(void)
-{
-    taskENTER_CRITICAL();
-
-    return 0;
-}
-
-static void IRAM_ATTR exit_critical_wrapper(uint32_t tmp)
-{
-    taskEXIT_CRITICAL();
-}
-
 static void *task_create_wrapper(void *task_func, const char *name, uint32_t stack_depth, void *param, uint32_t prio)
 {
     portBASE_TYPE ret;
@@ -367,11 +355,8 @@ static int32_t rand_wrapper(void)
     return (int32_t)esp_random();
 }
 
-wifi_osi_funcs_t s_wifi_osi_funcs = {
+const wifi_osi_funcs_t s_wifi_osi_funcs = {
     .version = ESP_WIFI_OS_ADAPTER_VERSION,
-
-    .enter_critical = enter_critical_wrapper,
-    .exit_critical = exit_critical_wrapper,
     
     .task_create = task_create_wrapper,
     .task_delete = task_delete_wrapper,
diff --git a/components/spi_flash/src/spi_flash.c b/components/spi_flash/src/spi_flash.c
index 74fbaf68..703b9dfb 100644
--- a/components/spi_flash/src/spi_flash.c
+++ b/components/spi_flash/src/spi_flash.c
@@ -95,9 +95,9 @@
 #define SPI_FLASH_RDSR2      0x35
 #define SPI_FLASH_PROTECT_STATUS                (BIT(2)|BIT(3)|BIT(4)|BIT(5)|BIT(6)|BIT(14))
 
-#define FLASH_INTR_DECLARE(t)                   uint32_t t
-#define FLASH_INTR_LOCK(t)                      wifi_enter_critical(t)
-#define FLASH_INTR_UNLOCK(t)                    wifi_exit_critical(t)
+#define FLASH_INTR_DECLARE(t)
+#define FLASH_INTR_LOCK(t)                      vPortEnterCritical()
+#define FLASH_INTR_UNLOCK(t)                    vPortExitCritical()
 
 #define FLASH_ALIGN_BYTES                       4
 #define FLASH_ALIGN(addr)                       ((((size_t)addr) + (FLASH_ALIGN_BYTES - 1)) & (~(FLASH_ALIGN_BYTES - 1)))
@@ -140,6 +140,9 @@ extern void pp_soft_wdt_feed(void);
 extern void pp_soft_wdt_stop(void);
 extern void pp_soft_wdt_restart(void);
 
+extern void vPortEnterCritical(void);
+extern void vPortExitCritical(void);
+
 esp_spi_flash_chip_t flashchip = {
     0x1640ef,
     (32 / 8) * 1024 * 1024,