jrtkcoder
diff --git a/‎VERSION
+14-8 b/‎VERSION
+14-8
diff --git a/‎include/espressif/esp_libc.h
+9-1 b/‎include/espressif/esp_libc.h
+9-1
diff --git a/‎include/freertos/portable.h
+1-1 b/‎include/freertos/portable.h
+1-1
diff --git a/‎include/lwip/lwip/mem.h
+1-1 b/‎include/lwip/lwip/mem.h
+1-1
diff --git a/‎include/openssl/platform/ssl_port.h
+2-2 b/‎include/openssl/platform/ssl_port.h
+2-2
diff --git a/‎ld/eagle.app.v6.common.ld
+1 b/‎ld/eagle.app.v6.common.ld
+1
diff --git a/‎lib/libcrypto.a
16 Bytes b/‎lib/libcrypto.a
16 Bytes
diff --git a/‎lib/libespnow.a
0 Bytes b/‎lib/libespnow.a
0 Bytes
diff --git a/‎lib/libfreertos.a
1.18 KB b/‎lib/libfreertos.a
1.18 KB
diff --git a/‎lib/liblwip.a
60 Bytes b/‎lib/liblwip.a
60 Bytes
diff --git a/‎lib/libmain.a
8.63 KB b/‎lib/libmain.a
8.63 KB
diff --git a/‎lib/libmesh.a
0 Bytes b/‎lib/libmesh.a
0 Bytes
diff --git a/‎lib/libminic.a
8 Bytes b/‎lib/libminic.a
8 Bytes
diff --git a/‎lib/libnet80211.a
8 Bytes b/‎lib/libnet80211.a
8 Bytes
diff --git a/‎lib/libpp.a
32 Bytes b/‎lib/libpp.a
32 Bytes
diff --git a/‎lib/libpwm.a
0 Bytes b/‎lib/libpwm.a
0 Bytes
diff --git a/‎lib/libsmartconfig.a
0 Bytes b/‎lib/libsmartconfig.a
0 Bytes
diff --git a/‎lib/libssl.a
-3.05 KB b/‎lib/libssl.a
-3.05 KB
diff --git a/‎lib/libwpa.a
28 Bytes b/‎lib/libwpa.a
28 Bytes
diff --git a/‎lib/libwps.a
44 Bytes b/‎lib/libwps.a
44 Bytes
@@ -1,14 +1,20 @@
 gwen:
-    espnow:     1aafc07
-    main:       caff253
-    mesh:       1aafc07
-    net80211:   caff253
-    pp:         caff253
-    wpa:        caff253
-    wps:        1aafc07
+    crypto:     a8c4880
+    espnow:     a8c4880
+    main:       a8c4880
+    mesh:       a8c4880
+    minic:      a8c4880
+    net80211:   a8c4880
+    pp:         a8c4880
+    pwm:        a8c4880
+    smartconfig:a8c4880
+    wpa:        a8c4880
+    wps:        a8c4880
 
 gitlab:
     espconn:    3a998034
-    lwip:       2235ad17
+    freertos:   ac047746
+    lwip:       ac047746
     driver:     7bee5263
     mbedtls:    1ac9f1f4
+    ssl:        eefb383a
@@ -126,7 +126,15 @@ do{\
 #define os_malloc(s)    \
     ({  \
         static const char mem_debug_file[] ICACHE_RODATA_ATTR STORE_ATTR = __FILE__;    \
-        pvPortMalloc(s, mem_debug_file, __LINE__);  \
+        pvPortMalloc(s, mem_debug_file, __LINE__, false);  \
+    })
+#endif
+
+#ifndef os_malloc_iram
+#define os_malloc_iram(s)    \
+    ({  \
+        static const char mem_debug_file[] ICACHE_RODATA_ATTR STORE_ATTR = __FILE__;    \
+        pvPortMalloc(s, mem_debug_file, __LINE__, true);  \
     })
 #endif
 
 
@@ -368,7 +368,7 @@ extern "C" {
 void *pvPortMalloc( size_t xSize ) PRIVILEGED_FUNCTION;
 void vPortFree( void *pv ) PRIVILEGED_FUNCTION;
 #else
-void *pvPortMalloc( size_t xSize, const char *file, unsigned line) PRIVILEGED_FUNCTION;
+void *pvPortMalloc( size_t xSize, const char *file, unsigned line, bool use_iram) PRIVILEGED_FUNCTION;
 void vPortFree( void *pv, const char * file, unsigned line) PRIVILEGED_FUNCTION;
 #endif
 
 
@@ -81,7 +81,7 @@ typedef size_t mem_size_t;
 	}while(0)
 #endif
 #ifndef mem_malloc
-#define mem_malloc(s) ({const char *file = mem_debug_file; pvPortMalloc(s, file, __LINE__);})
+#define mem_malloc(s) ({const char *file = mem_debug_file; pvPortMalloc(s, file, __LINE__, false);})
 #endif
 #ifndef mem_calloc
 #define mem_calloc(s) ({const char *file = mem_debug_file; pvPortCalloc(s, file, __LINE__);})
 
@@ -25,14 +25,14 @@
 
 #ifdef MEMLEAK_DEBUG
 
-extern void *pvPortMalloc( size_t xWantedSize, const char * file, unsigned line);
+extern void *pvPortMalloc( size_t xWantedSize, const char * file, unsigned line, bool use_iram);
 extern void *pvPortZalloc( size_t xWantedSize, const char * file, unsigned line);
 extern void vPortFree(void *pv, const char * file, unsigned line);
 
 #define ssl_mem_malloc(s)    \
     ({  \
         static const char mem_debug_file[] ICACHE_RODATA_ATTR STORE_ATTR = __FILE__;    \
-        pvPortMalloc(s, mem_debug_file, __LINE__);  \
+        pvPortMalloc(s, mem_debug_file, __LINE__, false);  \
     })
 
 #define ssl_mem_zalloc(s)    \
 
@@ -94,6 +94,7 @@ SECTIONS
     *(.init.literal)
     *(.init)
     *libfreertos.a:(.literal .text .literal.* .text.*)
+    *libmain.a:spi_flash.o(.literal .text .literal.* .text.*)
     *(.literal .text .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
     *(.fini.literal)
     *(.fini)