|
@@ -3,10 +3,21 @@
|
|
|
.NOTPARALLEL:
|
|
|
|
|
|
# SDK version NodeMCU is locked to
|
|
|
-SDK_VER:=1.5.4
|
|
|
-SDK_FILE_VER:=$(SDK_VER)_16_05_20
|
|
|
+SDK_VER:=1.5.4.1
|
|
|
+
|
|
|
+# no patch: SDK_BASE_VER equals SDK_VER and sdk dir depends on sdk_extracted
|
|
|
+#SDK_BASE_VER:=SDK_VER
|
|
|
+#SDK_DIR_DEPENDS:=sdk_extracted
|
|
|
+# with patch: SDK_BASE_VER differs from SDK_VER and sdk dir depends on sdk_patched
|
|
|
+SDK_BASE_VER:=1.5.4
|
|
|
+SDK_DIR_DEPENDS:=sdk_patched
|
|
|
+
|
|
|
+SDK_FILE_VER:=$(SDK_BASE_VER)_16_05_20
|
|
|
SDK_FILE_ID:=1469
|
|
|
SDK_FILE_SHA1:=868784bd37d47f31d52b81f133aa1fb70c58e17d
|
|
|
+SDK_PATCH_VER:=$(SDK_VER)_patch_20160704
|
|
|
+SDK_PATCH_ID:=1572
|
|
|
+SDK_PATCH_SHA1:=388d9e91df74e3b49fca126da482cf822cf1ebf1
|
|
|
# Ensure we search "our" SDK before the tool-chain's SDK (if any)
|
|
|
TOP_DIR:=$(abspath $(dir $(lastword $(MAKEFILE_LIST))))
|
|
|
SDK_DIR:=$(TOP_DIR)/sdk/esp_iot_sdk_v$(SDK_VER)
|
|
@@ -179,24 +190,38 @@ $(BINODIR)/%.bin: $(IMAGEODIR)/%.out
|
|
|
# Should be done in top-level makefile only
|
|
|
#
|
|
|
|
|
|
-all: sdk_extracted pre_build .subdirs $(OBJS) $(OLIBS) $(OIMAGES) $(OBINS) $(SPECIAL_MKTARGETS)
|
|
|
+all: $(SDK_DIR_DEPENDS) pre_build .subdirs $(OBJS) $(OLIBS) $(OIMAGES) $(OBINS) $(SPECIAL_MKTARGETS)
|
|
|
|
|
|
.PHONY: sdk_extracted
|
|
|
+.PHONY: sdk_patched
|
|
|
|
|
|
-sdk_extracted: $(TOP_DIR)/sdk/.extracted-$(SDK_VER)
|
|
|
+sdk_extracted: $(TOP_DIR)/sdk/.extracted-$(SDK_BASE_VER)
|
|
|
+sdk_patched: sdk_extracted $(TOP_DIR)/sdk/.patched-$(SDK_VER)
|
|
|
|
|
|
-$(TOP_DIR)/sdk/.extracted-$(SDK_VER): $(TOP_DIR)/cache/esp_iot_sdk_v$(SDK_FILE_VER).zip
|
|
|
+$(TOP_DIR)/sdk/.extracted-$(SDK_BASE_VER): $(TOP_DIR)/cache/esp_iot_sdk_v$(SDK_FILE_VER).zip
|
|
|
mkdir -p "$(dir $@)"
|
|
|
- (cd "$(dir $@)" && rm -fr esp_iot_sdk_v$(SDK_VER) ESP8266_NONOS_SDK && unzip $(TOP_DIR)/cache/esp_iot_sdk_v$(SDK_VER)*.zip ESP8266_NONOS_SDK/lib/* ESP8266_NONOS_SDK/ld/eagle.rom.addr.v6.ld ESP8266_NONOS_SDK/include/* )
|
|
|
+ (cd "$(dir $@)" && rm -fr esp_iot_sdk_v$(SDK_VER) ESP8266_NONOS_SDK && unzip $(TOP_DIR)/cache/esp_iot_sdk_v$(SDK_FILE_VER).zip ESP8266_NONOS_SDK/lib/* ESP8266_NONOS_SDK/ld/eagle.rom.addr.v6.ld ESP8266_NONOS_SDK/include/* )
|
|
|
mv $(dir $@)/ESP8266_NONOS_SDK $(dir $@)/esp_iot_sdk_v$(SDK_VER)
|
|
|
rm -f $(SDK_DIR)/lib/liblwip.a
|
|
|
touch $@
|
|
|
|
|
|
+$(TOP_DIR)/sdk/.patched-$(SDK_VER): $(TOP_DIR)/cache/esp_iot_sdk_v$(SDK_PATCH_VER).zip
|
|
|
+ mkdir -p "$(dir $@)/patch"
|
|
|
+ (cd "$(dir $@)/patch" && unzip $(TOP_DIR)/cache/esp_iot_sdk_v$(SDK_PATCH_VER)*.zip *.a && mv *.a $(SDK_DIR)/lib/)
|
|
|
+ rmdir $(dir $@)/patch
|
|
|
+ rm -f $(SDK_DIR)/lib/liblwip.a
|
|
|
+ touch $@
|
|
|
+
|
|
|
$(TOP_DIR)/cache/esp_iot_sdk_v$(SDK_FILE_VER).zip:
|
|
|
mkdir -p "$(dir $@)"
|
|
|
wget --tries=10 --timeout=15 --waitretry=30 --read-timeout=20 --retry-connrefused http://bbs.espressif.com/download/file.php?id=$(SDK_FILE_ID) -O $@ || { rm -f "$@"; exit 1; }
|
|
|
(echo "$(SDK_FILE_SHA1) $@" | sha1sum -c -) || { rm -f "$@"; exit 1; }
|
|
|
|
|
|
+$(TOP_DIR)/cache/esp_iot_sdk_v$(SDK_PATCH_VER).zip:
|
|
|
+ mkdir -p "$(dir $@)"
|
|
|
+ wget --tries=10 --timeout=15 --waitretry=30 --read-timeout=20 --retry-connrefused http://bbs.espressif.com/download/file.php?id=$(SDK_PATCH_ID) -O $@ || { rm -f "$@"; exit 1; }
|
|
|
+ (echo "$(SDK_PATCH_SHA1) $@" | sha1sum -c -) || { rm -f "$@"; exit 1; }
|
|
|
+
|
|
|
clean:
|
|
|
$(foreach d, $(SUBDIRS), $(MAKE) -C $(d) clean;)
|
|
|
$(RM) -r $(ODIR)/$(TARGET)/$(FLAVOR)
|