Merge branch 'release/v2.2.0'

platformio · May 21, 2019 · a0c0297 · a0c0297
2 parents 072704a + 75def36
commit a0c0297
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/builder/frameworks/esp8266-nonos-sdk.py b/builder/frameworks/esp8266-nonos-sdk.py
@@ -87,8 +87,7 @@
         join(FRAMEWORK_DIR, "include", "nopoll"),
         join(FRAMEWORK_DIR, "include", "ssl"),
         join(FRAMEWORK_DIR, "include", "json"),
-        join(FRAMEWORK_DIR, "include", "openssl"),
-        join("$SDK_ESP8266_DIR", "include"), "$PROJECTSRC_DIR"
+        join(FRAMEWORK_DIR, "include", "openssl")
     ],
 
     LIBPATH=[

diff --git a/builder/main.py b/builder/main.py
@@ -136,6 +136,7 @@ def _update_max_upload_size(env):
     CC="xtensa-lx106-elf-gcc",
     CXX="xtensa-lx106-elf-g++",
     GDB="xtensa-lx106-elf-gdb",
+    OBJCOPY="xtensa-lx106-elf-objcopy",
     RANLIB="xtensa-lx106-elf-ranlib",
     SIZETOOL="xtensa-lx106-elf-size",
 

diff --git a/platform.json b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-espressif8266.git"
   },
-  "version": "2.1.1",
+  "version": "2.2.0",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json",
@@ -41,12 +41,12 @@
   "packages": {
     "toolchain-xtensa": {
       "type": "toolchain",
-      "version": "~1.40802.0"
+      "version": "<3"
     },
     "framework-arduinoespressif8266": {
       "type": "framework",
       "optional": true,
-      "version": "~2.20501.0"
+      "version": "~2.20502.0"
     },
     "framework-esp8266-rtos-sdk": {
       "type": "framework",

diff --git a/platform.py b/platform.py
@@ -19,6 +19,8 @@ class Espressif8266Platform(PlatformBase):
 
     def configure_default_packages(self, variables, targets):
         framework = variables.get("pioframework")
+        if "arduino" not in framework:
+            self.packages['toolchain-xtensa']['version'] = "~1.40802.0"
         if "buildfs" in targets:
             self.packages['tool-mkspiffs']['optional'] = False
         return PlatformBase.configure_default_packages(