Third-party: LWIP & rBoot updates.

SmingHub · Feb 16, 2017 · b0568b5 · b0568b5
1 parent 288cf15
commit b0568b5
Show file tree

Hide file tree

Showing 32 changed files with 24 additions and 19 deletions.
diff --git a/Sming/third-party/esp-open-lwip/espconn_dummy.o b/Sming/third-party/esp-open-lwip/espconn_dummy.o
diff --git a/Sming/third-party/esp-open-lwip/include/user_config.h b/Sming/third-party/esp-open-lwip/include/user_config.h
@@ -13,25 +13,6 @@ void ets_task(ETSTask task, uint32_t prio, ETSEvent * queue, uint8 qlen);
 
 void system_pp_recycle_rx_pkt(void *eb);
 
-#ifndef MEMLEAK_DEBUG
-	extern void *pvPortMalloc( size_t xWantedSize );
-	extern void vPortFree( void *pv );
-	extern void *pvPortZalloc(size_t size);
-#else
-	extern void *pvPortMalloc(size_t xWantedSize, const char *file, uint32 line);
-	extern void *pvPortZalloc(size_t xWantedSize, const char *file, uint32 line);
-	extern void vPortFree(void *ptr, const char *file, uint32 line);
-
-	extern void pvPortFree(void *ptr);
-	extern void *vPortMalloc(size_t xWantedSize);
-#endif /*MEMLEAK_DEBUG*/
-
-
-	extern void *pvPortCalloc(unsigned int n, unsigned int count);
-	extern void *pvPortRealloc(void * p, size_t size);
-	extern size_t xPortGetFreeHeapSize(void);
-//	extern void prvHeapInit(void) ICACHE_FLASH_ATTR ;
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/Sming/third-party/esp-open-lwip/lwip/app/dhcpserver.o b/Sming/third-party/esp-open-lwip/lwip/app/dhcpserver.o
diff --git a/Sming/third-party/esp-open-lwip/lwip/core/def.o b/Sming/third-party/esp-open-lwip/lwip/core/def.o
diff --git a/Sming/third-party/esp-open-lwip/lwip/core/dhcp.o b/Sming/third-party/esp-open-lwip/lwip/core/dhcp.o
diff --git a/Sming/third-party/esp-open-lwip/lwip/core/dns.o b/Sming/third-party/esp-open-lwip/lwip/core/dns.o
diff --git a/Sming/third-party/esp-open-lwip/lwip/core/init.o b/Sming/third-party/esp-open-lwip/lwip/core/init.o
diff --git a/Sming/third-party/esp-open-lwip/lwip/core/ipv4/autoip.o b/Sming/third-party/esp-open-lwip/lwip/core/ipv4/autoip.o
diff --git a/Sming/third-party/esp-open-lwip/lwip/core/ipv4/icmp.o b/Sming/third-party/esp-open-lwip/lwip/core/ipv4/icmp.o
diff --git a/Sming/third-party/esp-open-lwip/lwip/core/ipv4/igmp.o b/Sming/third-party/esp-open-lwip/lwip/core/ipv4/igmp.o
diff --git a/Sming/third-party/esp-open-lwip/lwip/core/ipv4/inet.o b/Sming/third-party/esp-open-lwip/lwip/core/ipv4/inet.o
diff --git a/Sming/third-party/esp-open-lwip/lwip/core/ipv4/inet_chksum.o b/Sming/third-party/esp-open-lwip/lwip/core/ipv4/inet_chksum.o
diff --git a/Sming/third-party/esp-open-lwip/lwip/core/ipv4/ip.o b/Sming/third-party/esp-open-lwip/lwip/core/ipv4/ip.o
diff --git a/Sming/third-party/esp-open-lwip/lwip/core/ipv4/ip_addr.o b/Sming/third-party/esp-open-lwip/lwip/core/ipv4/ip_addr.o
diff --git a/Sming/third-party/esp-open-lwip/lwip/core/ipv4/ip_frag.o b/Sming/third-party/esp-open-lwip/lwip/core/ipv4/ip_frag.o
diff --git a/Sming/third-party/esp-open-lwip/lwip/core/mem.o b/Sming/third-party/esp-open-lwip/lwip/core/mem.o
diff --git a/Sming/third-party/esp-open-lwip/lwip/core/memp.o b/Sming/third-party/esp-open-lwip/lwip/core/memp.o
diff --git a/Sming/third-party/esp-open-lwip/lwip/core/netif.o b/Sming/third-party/esp-open-lwip/lwip/core/netif.o
diff --git a/Sming/third-party/esp-open-lwip/lwip/core/pbuf.o b/Sming/third-party/esp-open-lwip/lwip/core/pbuf.o
diff --git a/Sming/third-party/esp-open-lwip/lwip/core/raw.o b/Sming/third-party/esp-open-lwip/lwip/core/raw.o
diff --git a/Sming/third-party/esp-open-lwip/lwip/core/sntp.o b/Sming/third-party/esp-open-lwip/lwip/core/sntp.o
diff --git a/Sming/third-party/esp-open-lwip/lwip/core/stats.o b/Sming/third-party/esp-open-lwip/lwip/core/stats.o
diff --git a/Sming/third-party/esp-open-lwip/lwip/core/sys.o b/Sming/third-party/esp-open-lwip/lwip/core/sys.o
diff --git a/Sming/third-party/esp-open-lwip/lwip/core/sys_arch.o b/Sming/third-party/esp-open-lwip/lwip/core/sys_arch.o
diff --git a/Sming/third-party/esp-open-lwip/lwip/core/tcp.o b/Sming/third-party/esp-open-lwip/lwip/core/tcp.o
diff --git a/Sming/third-party/esp-open-lwip/lwip/core/tcp_in.o b/Sming/third-party/esp-open-lwip/lwip/core/tcp_in.o
diff --git a/Sming/third-party/esp-open-lwip/lwip/core/tcp_out.o b/Sming/third-party/esp-open-lwip/lwip/core/tcp_out.o
diff --git a/Sming/third-party/esp-open-lwip/lwip/core/timers.o b/Sming/third-party/esp-open-lwip/lwip/core/timers.o
diff --git a/Sming/third-party/esp-open-lwip/lwip/core/udp.o b/Sming/third-party/esp-open-lwip/lwip/core/udp.o
diff --git a/Sming/third-party/esp-open-lwip/lwip/netif/etharp.o b/Sming/third-party/esp-open-lwip/lwip/netif/etharp.o
diff --git a/Sming/third-party/rboot/Makefile b/Sming/third-party/rboot/Makefile
@@ -55,6 +55,12 @@ endif
 ifeq ($(RBOOT_IROM_CHKSUM),1)
 	CFLAGS += -DBOOT_IROM_CHKSUM
 endif
+ifneq ($(RBOOT_ROM1_ADDR),)
+	CFLAGS += -DBOOT_ROM1_ADDR=$(RBOOT_ROM1_ADDR)
+endif
+ifneq ($(RBOOT_ROM2_ADDR),)
+	CFLAGS += -DBOOT_ROM2_ADDR=$(RBOOT_ROM2_ADDR)
+endif
 ifneq ($(RBOOT_EXTRA_INCDIR),)
 	CFLAGS += $(addprefix -I,$(RBOOT_EXTRA_INCDIR))
 endif

diff --git a/Sming/third-party/rboot/rboot.c b/Sming/third-party/rboot/rboot.c
@@ -250,7 +250,25 @@ static uint8 calc_chksum(uint8 *start, uint8 *end) {
 static uint8 default_config(rboot_config *romconf, uint32 flashsize) {
 	romconf->count = 2;
 	romconf->roms[0] = SECTOR_SIZE * (BOOT_CONFIG_SECTOR + 1);
+
+#ifdef BOOT_ROM1_ADDR
+	romconf->roms[1] = BOOT_ROM1_ADDR;
+#else
 	romconf->roms[1] = (flashsize / 2) + (SECTOR_SIZE * (BOOT_CONFIG_SECTOR + 1));
+#endif
+
+#if defined(BOOT_BIG_FLASH) && defined(BOOT_GPIO_ENABLED)
+	if(flashsize > 0x200000) {
+		romconf->count += 1;
+#ifdef BOOT_ROM2_ADDR
+		romconf->roms[2] = BOOT_ROM2_ADDR;
+#else
+		romconf->roms[2] = 0x310000;
+#endif
+		romconf->gpio_rom = 2;
+	}
+#endif
+
 #ifdef BOOT_GPIO_ENABLED
 	romconf->mode = MODE_GPIO_ROM;
 #endif