Merge branch 'master' into feature/mbedtls

2016-09-09 17:09:56 +10:00 · 2016-09-09 17:09:56 +10:00 · 9c51f8a7a3
commit 9c51f8a7a3
--- a/components/lwip/component.mk
+++ b/components/lwip/component.mk
@ -6,6 +6,6 @@ COMPONENT_ADD_INCLUDEDIRS := include/lwip include/lwip/port include/lwip/posix

 COMPONENT_SRCDIRS := api apps/sntp apps core/ipv4 core/ipv6 core netif port/freertos port/netif port

-CFLAGS += -Wno-error=address -Waddress -DLWIP_ESP8266
+CFLAGS += -Wno-error=address -Waddress

 include $(IDF_PATH)/make/component_common.mk
--- a/components/lwip/include/lwip/port/lwipopts.h
+++ b/components/lwip/include/lwip/port/lwipopts.h
@ -34,6 +34,8 @@

 #include <stdlib.h>

+/* Enable all Espressif-only options */
+#define LWIP_ESP8266

 /*
   -----------------------------------------------
--- a/components/tcpip_adapter/component.mk
+++ b/components/tcpip_adapter/component.mk
@ -2,6 +2,4 @@
 # Component Makefile
 #

-CFLAGS += -DLWIP_ESP8266
-
 include $(IDF_PATH)/make/component_common.mk