From 5f100657188c3f6e53db9d90f7ceebc4753bf44b Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Fri, 28 Nov 2014 10:22:01 +0000
Subject: [PATCH] esp8266: Provide sensible default ESP_SDK; deploy 2 the
 images together.

---
 esp8266/Makefile | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/esp8266/Makefile b/esp8266/Makefile
index 28f5ce13d..1e5555a3a 100644
--- a/esp8266/Makefile
+++ b/esp8266/Makefile
@@ -6,12 +6,9 @@ QSTR_DEFS = qstrdefsport.h #$(BUILD)/pins_qstr.h
 # include py core make definitions
 include ../py/py.mk
 
-ifeq ($(ESP_SDK),)
-$(error ESP_SDK must be set)
-endif
-
 PORT = /dev/ttyACM0
 CROSS_COMPILE = xtensa-lx106-elf-
+ESP_SDK = $(shell $(CC) -print-sysroot)/..
 
 INC =  -I.
 INC += -I$(PY_SRC)
@@ -73,9 +70,8 @@ all: $(BUILD)/firmware-combined.bin
 
 deploy: $(BUILD)/firmware-combined.bin
 	$(ECHO) "Writing $< to the board"
-	$(Q)esptool.py --port $(PORT) write_flash 0 $<
-	#$(Q)esptool.py --port $(PORT) write_flash 0 $(BUILD)/firmware.elf-0x00000.bin
-	#$(Q)esptool.py --port $(PORT) write_flash 0x10000 $(BUILD)/firmware.elf-0x10000.bin
+	#$(Q)esptool.py --port $(PORT) write_flash 0 $<
+	$(Q)esptool.py --port $(PORT) write_flash 0 $(BUILD)/firmware.elf-0x00000.bin 0x10000 $(BUILD)/firmware.elf-0x10000.bin
 
 $(BUILD)/firmware-combined.bin: $(BUILD)/firmware.elf
 	$(ECHO) "Create $@"
-- 
GitLab