diff --git a/Makefile b/Makefile
index 2b3bfd30..82e7ae8a 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ ifeq ($(COMPILE), gcc)
 	AR = xtensa-lx106-elf-ar
 	CC = xtensa-lx106-elf-gcc
 	NM = xtensa-lx106-elf-nm
-	CPP = xtensa-lx106-elf-cpp
+	CPP = xtensa-lx106-elf-g++
 	OBJCOPY = xtensa-lx106-elf-objcopy
 	OBJDUMP = xtensa-lx106-elf-objdump
 else
@@ -162,6 +162,7 @@ else
 endif
 
 CSRCS ?= $(wildcard *.c)
+CPPSRCS ?= $(wildcard *.cpp)
 ASRCs ?= $(wildcard *.s)
 ASRCS ?= $(wildcard *.S)
 SUBDIRS ?= $(patsubst %/,%,$(dir $(wildcard */Makefile)))
@@ -170,10 +171,12 @@ ODIR := .output
 OBJODIR := $(ODIR)/$(TARGET)/$(FLAVOR)/obj
 
 OBJS := $(CSRCS:%.c=$(OBJODIR)/%.o) \
+        $(CPPSRCS:%.cpp=$(OBJODIR)/%.o) \
         $(ASRCs:%.s=$(OBJODIR)/%.o) \
         $(ASRCS:%.S=$(OBJODIR)/%.o)
 
 DEPS := $(CSRCS:%.c=$(OBJODIR)/%.d) \
+        $(CPPSRCS:%.cpp=$(OBJODIR)/%.d) \
         $(ASRCs:%.s=$(OBJODIR)/%.d) \
         $(ASRCS:%.S=$(OBJODIR)/%.d)
 
@@ -188,7 +191,6 @@ OBINS := $(GEN_BINS:%=$(BINODIR)/%)
 
 CCFLAGS += 			\
 	-g			\
-	-O2			\
 	-Wpointer-arith		\
 	-Wundef			\
 	-Werror			\
@@ -196,7 +198,9 @@ CCFLAGS += 			\
 	-fno-inline-functions	\
 	-nostdlib       \
 	-mlongcalls	\
-	-mtext-section-literals
+	-mtext-section-literals \
+	-ffunction-sections \
+	-fdata-sections
 #	-Wall			
 
 CFLAGS = $(CCFLAGS) $(DEFINES) $(EXTRA_CCFLAGS) $(INCLUDES)
@@ -327,6 +331,18 @@ $(OBJODIR)/%.d: %.c
 	$(CC) -M $(CFLAGS) $< > $@.$$$$; \
 	sed 's,\($*\.o\)[ :]*,$(OBJODIR)/\1 $@ : ,g' < $@.$$$$ > $@; \
 	rm -f $@.$$$$
+	
+$(OBJODIR)/%.o: %.cpp
+	@mkdir -p $(OBJODIR);
+	$(CPP) $(if $(findstring $<,$(DSRCS)),$(DFLAGS),$(CFLAGS)) $(COPTS_$(*F)) -o $@ -c $<
+
+$(OBJODIR)/%.d: %.cpp
+	@mkdir -p $(OBJODIR);
+	@echo DEPEND: $(CPP) -M $(CFLAGS) $<
+	@set -e; rm -f $@; \
+	$(CPP) -M $(CFLAGS) $< > $@.$$$$; \
+	sed 's,\($*\.o\)[ :]*,$(OBJODIR)/\1 $@ : ,g' < $@.$$$$ > $@; \
+	rm -f $@.$$$$
 
 $(OBJODIR)/%.o: %.s
 	@mkdir -p $(OBJODIR);
diff --git a/app/Makefile b/app/Makefile
index cfc62c29..5fd4e949 100644
--- a/app/Makefile
+++ b/app/Makefile
@@ -50,6 +50,7 @@ COMPONENTS_eagle.app.v6 = \
 
 LINKFLAGS_eagle.app.v6 = \
 	-L../lib        \
+	-Wl,--gc-sections   \
 	-nostdlib	\
     -T$(LD_FILE)   \
 	-Wl,--no-check-sections	\
diff --git a/app/user/user_main.c b/app/user/user_main.c
index b068bffe..65eb81f3 100644
--- a/app/user/user_main.c
+++ b/app/user/user_main.c
@@ -148,8 +148,7 @@ void task3(void *pvParameters)
  * Parameters   : none
  * Returns      : none
 *******************************************************************************/
-void ICACHE_FLASH_ATTR
-user_init(void)
+void user_init(void)
 {
     printf("SDK version:%s\n", system_get_sdk_version());
 
diff --git a/examples/smart_config/user/user_main.c b/examples/smart_config/user/user_main.c
index 334dd9d4..6e2bfa7c 100644
--- a/examples/smart_config/user/user_main.c
+++ b/examples/smart_config/user/user_main.c
@@ -20,8 +20,6 @@
 #define server_ip "192.168.101.142"
 #define server_port 9669
 
-sc_type SC_Type = 0;
-
 void ICACHE_FLASH_ATTR
 smartconfig_done(sc_status status, void *pdata)
 {
@@ -34,6 +32,12 @@ smartconfig_done(sc_status status, void *pdata)
             break;
         case SC_STATUS_GETTING_SSID_PSWD:
             printf("SC_STATUS_GETTING_SSID_PSWD\n");
+            sc_type *type = pdata;
+            if (*type == SC_TYPE_ESPTOUCH) {
+                printf("SC_TYPE:SC_TYPE_ESPTOUCH\n");
+            } else {
+                printf("SC_TYPE:SC_TYPE_AIRKISS\n");
+            }
             break;
         case SC_STATUS_LINK:
             printf("SC_STATUS_LINK\n");
@@ -45,7 +49,7 @@ smartconfig_done(sc_status status, void *pdata)
             break;
         case SC_STATUS_LINK_OVER:
             printf("SC_STATUS_LINK_OVER\n");
-            if (SC_Type == SC_TYPE_ESPTOUCH) {
+            if (pdata != NULL) {
                 uint8 phone_ip[4] = {0};
 
                 memcpy(phone_ip, (uint8*)pdata, 4);
@@ -60,10 +64,8 @@ smartconfig_done(sc_status status, void *pdata)
 void ICACHE_FLASH_ATTR
 smartconfig_task(void *pvParameters)
 {
-    SC_Type = SC_TYPE_ESPTOUCH;
-	
-	smartconfig_start(SC_Type, smartconfig_done);//SC_TYPE_AIRKISS
-
+    smartconfig_start(smartconfig_done);
+    
     vTaskDelete(NULL);
 }
 
diff --git a/include/espressif/c_types.h b/include/espressif/c_types.h
index ab788ccb..4e2666b8 100644
--- a/include/espressif/c_types.h
+++ b/include/espressif/c_types.h
@@ -72,12 +72,12 @@ typedef enum {
 #define DMEM_ATTR __attribute__((section(".bss")))
 #define SHMEM_ATTR
 
-#ifdef ICACHE_FLASH
-#define ICACHE_FLASH_ATTR __attribute__((section(".irom0.text")))
-#define ICACHE_RODATA_ATTR __attribute__((section(".irom.text")))
-#else
+#define IRAM_ATTR __attribute__((section(".text")))
+
 #define ICACHE_FLASH_ATTR
-#endif /* ICACHE_FLASH */
+#define ICACHE_RODATA_ATTR __attribute__((section(".irom.text")))
+
+#define STORE_ATTR __attribute__((aligned(4)))
 
 #ifndef __cplusplus
 typedef unsigned char   bool;
diff --git a/include/espressif/esp_libc.h b/include/espressif/esp_libc.h
index a0cd0b38..f8ad2df6 100644
--- a/include/espressif/esp_libc.h
+++ b/include/espressif/esp_libc.h
@@ -36,7 +36,6 @@ int printf(const char *format, ...);
 int sprintf(char *out, const char *format, ...);
 int snprintf(char *buf, unsigned int count, const char *format, ...);
 int puts(const char *str);
-int putchar(int c);
 
 void *malloc(size_t n);
 void free(void *p);
@@ -47,16 +46,13 @@ void *realloc(void *p, size_t n);
 int atoi(const char *s);
 long atol(const char *s);
 
+unsigned long os_random(void);
+int os_get_random(unsigned char *buf, size_t len);
+
 /* NOTE: don't use printf_opt in irq handler, for test */
-#define printf_opt(fmt, ...) do {	\
-	static const char flash_str[] ICACHE_RODATA_ATTR = fmt;	\
+#define os_printf(fmt, ...) do {	\
+	static const char flash_str[] ICACHE_RODATA_ATTR STORE_ATTR = fmt;	\
 	printf(flash_str, ##__VA_ARGS__);	\
 	} while(0)
 
-/* NOTE: don't use printf_opt in irq handler, for test */
-#define sprintf_opt(out, fmt, ...) do {	\
-	static const char flash_str[] ICACHE_RODATA_ATTR = fmt;	\
-	sprintf(out, flash_str, ##__VA_ARGS__);	\
-	} while(0)
-
 #endif /* __LIBC_H__ */
diff --git a/include/espressif/smartconfig.h b/include/espressif/smartconfig.h
index a39312d4..c17113f1 100644
--- a/include/espressif/smartconfig.h
+++ b/include/espressif/smartconfig.h
@@ -22,7 +22,7 @@ typedef enum {
 typedef void (*sc_callback_t)(sc_status status, void *pdata);
 
 const char *smartconfig_get_version(void);
-bool smartconfig_start(sc_type type, sc_callback_t cb, ...);
+bool smartconfig_start(sc_callback_t cb, ...);
 bool smartconfig_stop(void);
 bool esptouch_set_timeout(uint8 time_s);//15s~255s, offset:45s
 
diff --git a/include/freertos/FreeRTOSConfig.h b/include/freertos/FreeRTOSConfig.h
index 5cae6ecf..293f2bb4 100644
--- a/include/freertos/FreeRTOSConfig.h
+++ b/include/freertos/FreeRTOSConfig.h
@@ -83,7 +83,7 @@
 #define configCPU_CLOCK_HZ			( ( unsigned long ) 80000000 )	
 #define configTICK_RATE_HZ			( ( portTickType ) 100 )
 #define configMAX_PRIORITIES		( ( unsigned portBASE_TYPE ) 15 )
-#define configMINIMAL_STACK_SIZE	( ( unsigned short )156 )	
+#define configMINIMAL_STACK_SIZE	( ( unsigned short )176 )	
 //#define configTOTAL_HEAP_SIZE		( ( size_t ) ( 17 * 1024 ) )
 #define configMAX_TASK_NAME_LEN		( 16 )
 #define configUSE_TRACE_FACILITY	0
diff --git a/include/lwip/arch/cc.h b/include/lwip/arch/cc.h
index 0bbf7cc6..e62fc171 100644
--- a/include/lwip/arch/cc.h
+++ b/include/lwip/arch/cc.h
@@ -73,6 +73,13 @@ typedef int sys_prot_t;
 //#define LWIP_DEBUG
 
 #ifdef LWIP_DEBUG
+#include <stdio.h>
+
+#define os_printf(fmt, ...) do {	\
+	static const char flash_str[] ICACHE_RODATA_ATTR STORE_ATTR = fmt;	\
+	printf(flash_str, ##__VA_ARGS__);	\
+	} while(0)
+
 #define LWIP_PLATFORM_DIAG(x)   do {os_printf x;} while(0)
 #define LWIP_PLATFORM_ASSERT(x) do {os_printf(x); sys_arch_assert(__FILE__, __LINE__);} while(0)
 #else
diff --git a/include/lwip/lwip/dhcp.h b/include/lwip/lwip/dhcp.h
index e7afd30d..c8f95aab 100644
--- a/include/lwip/lwip/dhcp.h
+++ b/include/lwip/lwip/dhcp.h
@@ -206,6 +206,18 @@ void dhcp_fine_tmr(void);
 #define DHCP_OPTION_TCP_TTL 37
 #define DHCP_OPTION_END 255
 
+/**add options for support more router by liuHan**/
+#ifdef LWIP_ESP8266
+#define DHCP_OPTION_DOMAIN_NAME 15
+#define DHCP_OPTION_PRD 31
+#define DHCP_OPTION_STATIC_ROUTER 33
+#define DHCP_OPTION_VSN 43
+#define DHCP_OPTION_NB_TINS 44
+#define DHCP_OPTION_NB_TINT 46
+#define DHCP_OPTION_NB_TIS 47
+#define DHCP_OPTION_CLASSLESS_STATIC_ROUTER 121
+
+#endif
 /** DHCP options */
 #define DHCP_OPTION_REQUESTED_IP 50 /* RFC 2132 9.1, requested IP address */
 #define DHCP_OPTION_LEASE_TIME 51 /* RFC 2132 9.2, time in seconds, in 4 bytes */
diff --git a/include/lwip/lwip/memp.h b/include/lwip/lwip/memp.h
index 895217b7..a810640b 100644
--- a/include/lwip/lwip/memp.h
+++ b/include/lwip/lwip/memp.h
@@ -76,7 +76,7 @@ typedef enum {
 #endif /* MEM_USE_POOLS */
 
 #if MEMP_MEM_MALLOC || MEM_USE_POOLS
-extern const u16_t memp_sizes[MEMP_MAX];
+extern const u32_t memp_sizes[MEMP_MAX];
 #endif /* MEMP_MEM_MALLOC || MEM_USE_POOLS */
 
 #if MEMP_MEM_MALLOC
diff --git a/include/lwip/lwipopts.h b/include/lwip/lwipopts.h
index 4592bcfa..0691fd45 100644
--- a/include/lwip/lwipopts.h
+++ b/include/lwip/lwipopts.h
@@ -250,6 +250,13 @@
    ---------- Network Interfaces options ----------
    ------------------------------------------------
 */
+
+/**
+ * LWIP_NETIF_HOSTNAME==1: use DHCP_OPTION_HOSTNAME with netif's hostname
+ * field.
+ */
+#define LWIP_NETIF_HOSTNAME             1
+
 /**
  * LWIP_NETIF_TX_SINGLE_PBUF: if this is set to 1, lwIP tries to put all data
  * to be sent into one single pbuf. This is for compatibility with DMA-enabled
@@ -336,7 +343,7 @@
  * LWIP_TCPIP_CORE_LOCKING: (EXPERIMENTAL!)
  * Don't use it if you're not an active lwIP project member
  */
-#define LWIP_TCPIP_CORE_LOCKING         1
+#define LWIP_TCPIP_CORE_LOCKING         0
 
 /*
    ------------------------------------
diff --git a/ld/eagle.app.v6.ld b/ld/eagle.app.v6.ld
index 48956a1b..50b66f28 100644
--- a/ld/eagle.app.v6.ld
+++ b/ld/eagle.app.v6.ld
@@ -188,7 +188,7 @@ SECTIONS
     *(.entry.text)
     *(.init.literal)
     *(.init)
-    *(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
+    *(.literal .text .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
     *(.fini.literal)
     *(.fini)
     *(.gnu.version)
@@ -209,6 +209,7 @@ SECTIONS
   {
     _irom0_text_start = ABSOLUTE(.);
     *(.irom0.literal .irom.literal .irom.text.literal .irom0.text .irom.text)
+    *(.literal.* .text.*)
     _irom0_text_end = ABSOLUTE(.);
   } >irom0_0_seg :irom0_0_phdr
 }
diff --git a/ld/eagle.app.v6.new.1024.app1.ld b/ld/eagle.app.v6.new.1024.app1.ld
index 41514ba2..ae78f761 100644
--- a/ld/eagle.app.v6.new.1024.app1.ld
+++ b/ld/eagle.app.v6.new.1024.app1.ld
@@ -188,7 +188,7 @@ SECTIONS
     *(.entry.text)
     *(.init.literal)
     *(.init)
-    *(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
+    *(.literal .text .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
     *(.fini.literal)
     *(.fini)
     *(.gnu.version)
@@ -209,6 +209,7 @@ SECTIONS
   {
     _irom0_text_start = ABSOLUTE(.);
     *(.irom0.literal .irom.literal .irom.text.literal .irom0.text .irom.text)
+    *(.literal.* .text.*)
     _irom0_text_end = ABSOLUTE(.);
   } >irom0_0_seg :irom0_0_phdr
 }
diff --git a/ld/eagle.app.v6.new.1024.app2.ld b/ld/eagle.app.v6.new.1024.app2.ld
index b7516537..8541f329 100644
--- a/ld/eagle.app.v6.new.1024.app2.ld
+++ b/ld/eagle.app.v6.new.1024.app2.ld
@@ -188,7 +188,7 @@ SECTIONS
     *(.entry.text)
     *(.init.literal)
     *(.init)
-    *(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
+    *(.literal .text .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
     *(.fini.literal)
     *(.fini)
     *(.gnu.version)
@@ -209,6 +209,7 @@ SECTIONS
   {
     _irom0_text_start = ABSOLUTE(.);
     *(.irom0.literal .irom.literal .irom.text.literal .irom0.text .irom.text)
+    *(.literal.* .text.*)
     _irom0_text_end = ABSOLUTE(.);
   } >irom0_0_seg :irom0_0_phdr
 }
diff --git a/ld/eagle.app.v6.new.2048.ld b/ld/eagle.app.v6.new.2048.ld
index 48f2e341..16fbb009 100644
--- a/ld/eagle.app.v6.new.2048.ld
+++ b/ld/eagle.app.v6.new.2048.ld
@@ -188,7 +188,7 @@ SECTIONS
     *(.entry.text)
     *(.init.literal)
     *(.init)
-    *(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
+    *(.literal .text .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
     *(.fini.literal)
     *(.fini)
     *(.gnu.version)
@@ -209,6 +209,7 @@ SECTIONS
   {
     _irom0_text_start = ABSOLUTE(.);
     *(.irom0.literal .irom.literal .irom.text.literal .irom0.text .irom.text)
+    *(.literal.* .text.*)
     _irom0_text_end = ABSOLUTE(.);
   } >irom0_0_seg :irom0_0_phdr
 }
diff --git a/ld/eagle.app.v6.new.512.app1.ld b/ld/eagle.app.v6.new.512.app1.ld
index 66e8c7bc..508322f9 100644
--- a/ld/eagle.app.v6.new.512.app1.ld
+++ b/ld/eagle.app.v6.new.512.app1.ld
@@ -188,7 +188,7 @@ SECTIONS
     *(.entry.text)
     *(.init.literal)
     *(.init)
-    *(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
+    *(.literal .text .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
     *(.fini.literal)
     *(.fini)
     *(.gnu.version)
@@ -209,6 +209,7 @@ SECTIONS
   {
     _irom0_text_start = ABSOLUTE(.);
     *(.irom0.literal .irom.literal .irom.text.literal .irom0.text .irom.text)
+    *(.literal.* .text.*)
     _irom0_text_end = ABSOLUTE(.);
   } >irom0_0_seg :irom0_0_phdr
 }
diff --git a/ld/eagle.app.v6.new.512.app2.ld b/ld/eagle.app.v6.new.512.app2.ld
index 89773ac4..a716b1bb 100644
--- a/ld/eagle.app.v6.new.512.app2.ld
+++ b/ld/eagle.app.v6.new.512.app2.ld
@@ -188,7 +188,7 @@ SECTIONS
     *(.entry.text)
     *(.init.literal)
     *(.init)
-    *(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
+    *(.literal .text .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
     *(.fini.literal)
     *(.fini)
     *(.gnu.version)
@@ -209,6 +209,7 @@ SECTIONS
   {
     _irom0_text_start = ABSOLUTE(.);
     *(.irom0.literal .irom.literal .irom.text.literal .irom0.text .irom.text)
+    *(.literal.* .text.*)
     _irom0_text_end = ABSOLUTE(.);
   } >irom0_0_seg :irom0_0_phdr
 }
diff --git a/ld/eagle.app.v6.old.1024.app1.ld b/ld/eagle.app.v6.old.1024.app1.ld
index e17350ea..e345f7ac 100644
--- a/ld/eagle.app.v6.old.1024.app1.ld
+++ b/ld/eagle.app.v6.old.1024.app1.ld
@@ -188,7 +188,7 @@ SECTIONS
     *(.entry.text)
     *(.init.literal)
     *(.init)
-    *(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
+    *(.literal .text .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
     *(.fini.literal)
     *(.fini)
     *(.gnu.version)
@@ -209,6 +209,7 @@ SECTIONS
   {
     _irom0_text_start = ABSOLUTE(.);
     *(.irom0.literal .irom.literal .irom.text.literal .irom0.text .irom.text)
+    *(.literal.* .text.*)
     _irom0_text_end = ABSOLUTE(.);
   } >irom0_0_seg :irom0_0_phdr
 }
diff --git a/ld/eagle.app.v6.old.1024.app2.ld b/ld/eagle.app.v6.old.1024.app2.ld
index 80d77cb8..5b4305b1 100644
--- a/ld/eagle.app.v6.old.1024.app2.ld
+++ b/ld/eagle.app.v6.old.1024.app2.ld
@@ -188,7 +188,7 @@ SECTIONS
     *(.entry.text)
     *(.init.literal)
     *(.init)
-    *(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
+    *(.literal .text .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
     *(.fini.literal)
     *(.fini)
     *(.gnu.version)
@@ -209,6 +209,7 @@ SECTIONS
   {
     _irom0_text_start = ABSOLUTE(.);
     *(.irom0.literal .irom.literal .irom.text.literal .irom0.text .irom.text)
+    *(.literal.* .text.*)
     _irom0_text_end = ABSOLUTE(.);
   } >irom0_0_seg :irom0_0_phdr
 }
diff --git a/ld/eagle.app.v6.old.512.app1.ld b/ld/eagle.app.v6.old.512.app1.ld
index 7b710837..97b57e3d 100644
--- a/ld/eagle.app.v6.old.512.app1.ld
+++ b/ld/eagle.app.v6.old.512.app1.ld
@@ -188,7 +188,7 @@ SECTIONS
     *(.entry.text)
     *(.init.literal)
     *(.init)
-    *(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
+    *(.literal .text .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
     *(.fini.literal)
     *(.fini)
     *(.gnu.version)
@@ -209,6 +209,7 @@ SECTIONS
   {
     _irom0_text_start = ABSOLUTE(.);
     *(.irom0.literal .irom.literal .irom.text.literal .irom0.text .irom.text)
+    *(.literal.* .text.*)
     _irom0_text_end = ABSOLUTE(.);
   } >irom0_0_seg :irom0_0_phdr
 }
diff --git a/ld/eagle.app.v6.old.512.app2.ld b/ld/eagle.app.v6.old.512.app2.ld
index 33959a45..80afe152 100644
--- a/ld/eagle.app.v6.old.512.app2.ld
+++ b/ld/eagle.app.v6.old.512.app2.ld
@@ -188,7 +188,7 @@ SECTIONS
     *(.entry.text)
     *(.init.literal)
     *(.init)
-    *(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
+    *(.literal .text .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
     *(.fini.literal)
     *(.fini)
     *(.gnu.version)
@@ -209,6 +209,7 @@ SECTIONS
   {
     _irom0_text_start = ABSOLUTE(.);
     *(.irom0.literal .irom.literal .irom.text.literal .irom0.text .irom.text)
+    *(.literal.* .text.*)
     _irom0_text_end = ABSOLUTE(.);
   } >irom0_0_seg :irom0_0_phdr
 }
diff --git a/lib/libcirom.a b/lib/libcirom.a
index ebf17ef4..bb8d786b 100644
Binary files a/lib/libcirom.a and b/lib/libcirom.a differ
diff --git a/lib/libfreertos.a b/lib/libfreertos.a
index da8f12aa..db78eab9 100644
Binary files a/lib/libfreertos.a and b/lib/libfreertos.a differ
diff --git a/lib/libjson.a b/lib/libjson.a
index d31a2ef4..5e59fdcd 100644
Binary files a/lib/libjson.a and b/lib/libjson.a differ
diff --git a/lib/liblwip.a b/lib/liblwip.a
index f6325745..f8ad0d89 100644
Binary files a/lib/liblwip.a and b/lib/liblwip.a differ
diff --git a/lib/libmain.a b/lib/libmain.a
index 34d73d39..ced21fa0 100644
Binary files a/lib/libmain.a and b/lib/libmain.a differ
diff --git a/lib/libminic.a b/lib/libminic.a
index 0179c877..e577e956 100644
Binary files a/lib/libminic.a and b/lib/libminic.a differ
diff --git a/lib/libmirom.a b/lib/libmirom.a
new file mode 100644
index 00000000..18e27afc
Binary files /dev/null and b/lib/libmirom.a differ
diff --git a/lib/libnet80211.a b/lib/libnet80211.a
index e9d7fd76..6179f4bd 100644
Binary files a/lib/libnet80211.a and b/lib/libnet80211.a differ
diff --git a/lib/libphy.a b/lib/libphy.a
index 5bbd7d0c..a90dd4e6 100644
Binary files a/lib/libphy.a and b/lib/libphy.a differ
diff --git a/lib/libpp.a b/lib/libpp.a
index f7db8737..20f26b28 100644
Binary files a/lib/libpp.a and b/lib/libpp.a differ
diff --git a/lib/libsmartconfig.a b/lib/libsmartconfig.a
index c596b720..3a2d0235 100644
Binary files a/lib/libsmartconfig.a and b/lib/libsmartconfig.a differ
diff --git a/lib/libssl.a b/lib/libssl.a
index db026bee..a85b5b0b 100644
Binary files a/lib/libssl.a and b/lib/libssl.a differ
diff --git a/lib/libwpa.a b/lib/libwpa.a
index e25686e4..1f3ca351 100644
Binary files a/lib/libwpa.a and b/lib/libwpa.a differ
diff --git a/third_party/freertos/port.c b/third_party/freertos/port.c
index 8b135d1e..64fdde9a 100644
--- a/third_party/freertos/port.c
+++ b/third_party/freertos/port.c
@@ -320,7 +320,7 @@ PortDisableInt_NoNest( void )
 void 
 PortEnableInt_NoNest( void )
 {
-	printf("ERRRRR\n");
+//	printf("ERRRRR\n");
 
 	if(NMIIrqIsOn == 0)
 	{		
@@ -335,6 +335,7 @@ PortEnableInt_NoNest( void )
 /*-----------------------------------------------------------*/
 
 _xt_isr_entry isr[16];
+char _xt_isr_status = 0;
 
 void ICACHE_FLASH_ATTR
 _xt_isr_attach(uint8 i, _xt_isr func, void *arg)
@@ -364,7 +365,9 @@ uint16 _xt_isr_handler(uint16 i)
 
     _xt_clear_ints(1<<index);
 
+    _xt_isr_status = 1;
     isr[index].handler(isr[index].arg);
+    _xt_isr_status = 0;
 
     return i & ~(1 << index);
 }
diff --git a/third_party/freertos/queue.c b/third_party/freertos/queue.c
index a241a8a9..4f026915 100644
--- a/third_party/freertos/queue.c
+++ b/third_party/freertos/queue.c
@@ -1350,7 +1350,7 @@ unsigned portBASE_TYPE uxReturn;
 } /*lint !e818 Pointer cannot be declared const as xQueue is a typedef not pointer. */
 /*-----------------------------------------------------------*/
 
-unsigned portBASE_TYPE ICACHE_FLASH_ATTR
+unsigned portBASE_TYPE
 uxQueueMessagesWaitingFromISR( const xQueueHandle xQueue )
 {
 unsigned portBASE_TYPE uxReturn;
@@ -1822,7 +1822,7 @@ PortEnableInt_NoNest();
 
 #if ( configUSE_CO_ROUTINES == 1 )
 
-	signed portBASE_TYPE 
+	signed portBASE_TYPE ICACHE_FLASH_ATTR
 	xQueueCRSendFromISR( xQueueHandle xQueue, const void *pvItemToQueue, signed portBASE_TYPE xCoRoutinePreviouslyWoken )
 	{
 	xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
@@ -1855,7 +1855,7 @@ PortEnableInt_NoNest();
 
 #if ( configUSE_CO_ROUTINES == 1 )
 
-	signed portBASE_TYPE 
+	signed portBASE_TYPE ICACHE_FLASH_ATTR
 	xQueueCRReceiveFromISR( xQueueHandle xQueue, void *pvBuffer, signed portBASE_TYPE *pxCoRoutineWoken )
 	{
 	signed portBASE_TYPE xReturn;
@@ -2081,7 +2081,7 @@ PortEnableInt_NoNest();
 
 #if ( configUSE_QUEUE_SETS == 1 )
 
-	xQueueSetMemberHandle 
+	xQueueSetMemberHandle ICACHE_FLASH_ATTR
 	xQueueSelectFromSetFromISR( xQueueSetHandle xQueueSet )
 	{
 	xQueueSetMemberHandle xReturn = NULL;
diff --git a/third_party/ssl/crypto/ssl_crypto_misc.c b/third_party/ssl/crypto/ssl_crypto_misc.c
index dfa0c9c5..cdaaf5d3 100644
--- a/third_party/ssl/crypto/ssl_crypto_misc.c
+++ b/third_party/ssl/crypto/ssl_crypto_misc.c
@@ -217,7 +217,7 @@ void ICACHE_FLASH_ATTR get_random_NZ(int num_rand_bytes, uint8_t *rand_data)
     for (i = 0; i < num_rand_bytes; i++)
     {
         while (rand_data[i] == 0)  /* can't be 0 */
-            rand_data[i] = (uint8_t)(rand());
+            rand_data[i] = (uint8_t)(os_random());
     }
 }