From 760fb395808f2ab9496212fe2c1a29775293283d Mon Sep 17 00:00:00 2001 From: Piers Finlayson Date: Sun, 28 Oct 2018 16:34:29 +0000 Subject: [PATCH 1/2] Add vendor SDK 2.2.0 --- Makefile | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9ad6f9531..fca1f1724 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ TOOLCHAIN = $(TOP)/xtensa-lx106-elf # Vendor SDK version to install, see VENDOR_SDK_ZIP_* vars below # for supported versions. -VENDOR_SDK = 2.1.0-18-g61248df +VENDOR_SDK = 2.2.0 .PHONY: crosstool-NG toolchain libhal libcirom sdk @@ -23,6 +23,8 @@ UNZIP = unzip -q -o VENDOR_SDK_ZIP = $(VENDOR_SDK_ZIP_$(VENDOR_SDK)) VENDOR_SDK_DIR = $(VENDOR_SDK_DIR_$(VENDOR_SDK)) +VENDOR_SDK_ZIP_2.2.0 = ESP8266_NONOS_SDK-2.2.0.zip +VENDOR_SDK_DIR_2.2.0 = ESP8266_NONOS_SDK-2.2.0 VENDOR_SDK_DIR_2.1.0-18-g61248df = ESP8266_NONOS_SDK-2.1.0-18-g61248df VENDOR_SDK_ZIP_2.1.0 = ESP8266_NONOS_SDK-2.1.0.zip VENDOR_SDK_DIR_2.1.0 = ESP8266_NONOS_SDK-2.1.0 @@ -180,6 +182,10 @@ $(VENDOR_SDK_DIR)/.dir: $(VENDOR_SDK_ZIP) -mv License $(VENDOR_SDK_DIR) touch $@ +$(VENDOR_SDK_DIR_2.2.0)/.dir: $(VENDOR_SDK_ZIP_2.2.0) + $(UNZIP) $^ + touch $@ + $(VENDOR_SDK_DIR_2.1.0-18-g61248df)/.dir: echo $(VENDOR_SDK_DIR_2.1.0-18-g61248df) git clone https://github.com/espressif/ESP8266_NONOS_SDK $(VENDOR_SDK_DIR_2.1.0-18-g61248df) @@ -204,6 +210,13 @@ $(VENDOR_SDK_DIR_1.5.4)/.dir: $(VENDOR_SDK_ZIP_1.5.4) sdk_patch: $(VENDOR_SDK_DIR)/.dir .sdk_patch_$(VENDOR_SDK) +.sdk_patch_2.2.0: user_rf_cal_sector_set.o + echo -e "#undef ESP_SDK_VERSION\n#define ESP_SDK_VERSION 020200" >>$(VENDOR_SDK_DIR)/include/esp_sdk_ver.h + $(PATCH) -d $(VENDOR_SDK_DIR) -p1 < c_types-c99_sdk_2.patch + cd $(VENDOR_SDK_DIR)/lib; mkdir -p tmp; cd tmp; $(TOOLCHAIN)/bin/xtensa-lx106-elf-ar x ../libcrypto.a; cd ..; $(TOOLCHAIN)/bin/xtensa-lx106-elf-ar rs libwpa.a tmp/*.o + $(TOOLCHAIN)/bin/xtensa-lx106-elf-ar r $(VENDOR_SDK_DIR)/lib/libmain.a user_rf_cal_sector_set.o + @touch $@ + .sdk_patch_2.1.0-18-g61248df .sdk_patch_2.1.0: user_rf_cal_sector_set.o echo -e "#undef ESP_SDK_VERSION\n#define ESP_SDK_VERSION 020100" >>$(VENDOR_SDK_DIR)/include/esp_sdk_ver.h $(PATCH) -d $(VENDOR_SDK_DIR) -p1 < c_types-c99_sdk_2.patch @@ -365,6 +378,8 @@ ifeq ($(STANDALONE),y) endif +ESP8266_NONOS_SDK-2.2.0.zip: + wget --content-disposition "https://github.com/espressif/ESP8266_NONOS_SDK/archive/v2.2.0.zip" ESP8266_NONOS_SDK-2.1.0.zip: wget --content-disposition "https://github.com/espressif/ESP8266_NONOS_SDK/archive/v2.1.0.zip" # The only change wrt to ESP8266_NONOS_SDK_V2.0.0_16_07_19.zip is licensing blurb in source/ From 95332391ed975b272b816135daa7a77ad70c7b43 Mon Sep 17 00:00:00 2001 From: Piers Finlayson Date: Thu, 1 Nov 2018 21:01:20 +0000 Subject: [PATCH 2/2] Add support for SDK version 3.0.0 --- Makefile | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fca1f1724..97dd40cf3 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ TOOLCHAIN = $(TOP)/xtensa-lx106-elf # Vendor SDK version to install, see VENDOR_SDK_ZIP_* vars below # for supported versions. -VENDOR_SDK = 2.2.0 +VENDOR_SDK = 3.0.0 .PHONY: crosstool-NG toolchain libhal libcirom sdk @@ -23,6 +23,8 @@ UNZIP = unzip -q -o VENDOR_SDK_ZIP = $(VENDOR_SDK_ZIP_$(VENDOR_SDK)) VENDOR_SDK_DIR = $(VENDOR_SDK_DIR_$(VENDOR_SDK)) +VENDOR_SDK_ZIP_3.0.0 = ESP8266_NONOS_SDK-3.0.zip +VENDOR_SDK_DIR_3.0.0 = ESP8266_NONOS_SDK-3.0 VENDOR_SDK_ZIP_2.2.0 = ESP8266_NONOS_SDK-2.2.0.zip VENDOR_SDK_DIR_2.2.0 = ESP8266_NONOS_SDK-2.2.0 VENDOR_SDK_DIR_2.1.0-18-g61248df = ESP8266_NONOS_SDK-2.1.0-18-g61248df @@ -182,6 +184,10 @@ $(VENDOR_SDK_DIR)/.dir: $(VENDOR_SDK_ZIP) -mv License $(VENDOR_SDK_DIR) touch $@ +$(VENDOR_SDK_DIR_3.0.0)/.dir: $(VENDOR_SDK_ZIP_3.0.0) + $(UNZIP) $^ + touch $@ + $(VENDOR_SDK_DIR_2.2.0)/.dir: $(VENDOR_SDK_ZIP_2.2.0) $(UNZIP) $^ touch $@ @@ -210,6 +216,13 @@ $(VENDOR_SDK_DIR_1.5.4)/.dir: $(VENDOR_SDK_ZIP_1.5.4) sdk_patch: $(VENDOR_SDK_DIR)/.dir .sdk_patch_$(VENDOR_SDK) +.sdk_patch_3.0.0: user_rf_cal_sector_set.o + echo -e "#undef ESP_SDK_VERSION\n#define ESP_SDK_VERSION 030000" >>$(VENDOR_SDK_DIR)/include/esp_sdk_ver.h + $(PATCH) -d $(VENDOR_SDK_DIR) -p1 < c_types-c99_sdk_2.patch + cd $(VENDOR_SDK_DIR)/lib; mkdir -p tmp; cd tmp; $(TOOLCHAIN)/bin/xtensa-lx106-elf-ar x ../libcrypto.a; cd ..; $(TOOLCHAIN)/bin/xtensa-lx106-elf-ar rs libwpa.a tmp/*.o + $(TOOLCHAIN)/bin/xtensa-lx106-elf-ar r $(VENDOR_SDK_DIR)/lib/libmain.a user_rf_cal_sector_set.o + @touch $@ + .sdk_patch_2.2.0: user_rf_cal_sector_set.o echo -e "#undef ESP_SDK_VERSION\n#define ESP_SDK_VERSION 020200" >>$(VENDOR_SDK_DIR)/include/esp_sdk_ver.h $(PATCH) -d $(VENDOR_SDK_DIR) -p1 < c_types-c99_sdk_2.patch @@ -378,6 +391,8 @@ ifeq ($(STANDALONE),y) endif +ESP8266_NONOS_SDK-3.0.zip: + wget --content-disposition "https://github.com/espressif/ESP8266_NONOS_SDK/archive/v3.0.zip" ESP8266_NONOS_SDK-2.2.0.zip: wget --content-disposition "https://github.com/espressif/ESP8266_NONOS_SDK/archive/v2.2.0.zip" ESP8266_NONOS_SDK-2.1.0.zip: