From eed83caf1d4b4714989a5d47df91521c822707e6 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Wed, 5 Sep 2018 14:11:55 +1000
Subject: [PATCH] esp8266/Makefile: Remove build of libaxtls.a and add back
 tuned config.

---
 ports/esp8266/Makefile          | 12 ++----------
 ports/esp8266/esp8266_common.ld |  2 +-
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index 716f18d6a1..8dc20626bc 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -5,6 +5,7 @@ QSTR_DEFS = qstrdefsport.h #$(BUILD)/pins_qstr.h
 
 MICROPY_PY_USSL = 1
 MICROPY_SSL_AXTLS = 1
+AXTLS_DEFS_EXTRA = -Dabort=abort_ -DRT_MAX_PLAIN_LENGTH=1024 -DRT_EXTRA=4096 -Wno-implicit-function-declaration
 MICROPY_FATFS = 1
 MICROPY_PY_BTREE = 1
 BTREE_DEFS_EXTRA = -DDEFPSIZE=1024 -DMINCACHE=3
@@ -150,7 +151,7 @@ SRC_QSTR += $(SRC_C) $(EXTMOD_SRC_C) $(LIB_SRC_C) $(DRIVERS_SRC_C)
 # Append any auto-generated sources that are needed by sources listed in SRC_QSTR
 SRC_QSTR_AUTO_DEPS +=
 
-all: $(BUILD)/libaxtls.a $(FWBIN)
+all: $(FWBIN)
 
 CONFVARS_FILE = $(BUILD)/confvars
 
@@ -197,15 +198,6 @@ ota:
 
 include $(TOP)/py/mkrules.mk
 
-axtls: $(BUILD)/libaxtls.a
-
-$(BUILD)/libaxtls.a:
-	cd $(TOP)/lib/axtls; cp config/upyconfig config/.config
-	cd $(TOP)/lib/axtls; $(MAKE) oldconfig -B
-	cd $(TOP)/lib/axtls; $(MAKE) clean
-	cd $(TOP)/lib/axtls; $(MAKE) all CC="$(CC)" LD="$(LD)" AR="$(AR)" CFLAGS_EXTRA="$(CFLAGS_XTENSA) -Dabort=abort_ -DRT_MAX_PLAIN_LENGTH=1024 -DRT_EXTRA=4096"
-	cp $(TOP)/lib/axtls/_stage/libaxtls.a $@
-
 clean-modules:
 	git clean -f -d modules
 	rm -f build/frozen*.c
diff --git a/ports/esp8266/esp8266_common.ld b/ports/esp8266/esp8266_common.ld
index addceb4ccf..f4b4207f27 100644
--- a/ports/esp8266/esp8266_common.ld
+++ b/ports/esp8266/esp8266_common.ld
@@ -128,7 +128,7 @@ SECTIONS
         *extmod/*.o*(.literal* .text*)
 
         *lib/oofatfs/*.o*(.literal*, .text*)
-        */libaxtls.a:(.literal*, .text*)
+        *lib/axtls/*.o(.literal*, .text*)
         *lib/berkeley-db-1.xx/*.o(.literal*, .text*)
         *lib/libm/*.o*(.literal*, .text*)
         *lib/mp-readline/*.o(.literal*, .text*)