From 9bd1f99b69c667b22721accafdb06e9a20bbaa3a Mon Sep 17 00:00:00 2001 From: Valeriy Koval Date: Thu, 26 Nov 2015 20:19:36 +0200 Subject: [PATCH 1/2] Improve espressif platform for RC version of framework --- platformio/boards/espressif.json | 2 +- platformio/builder/scripts/espressif.py | 5 ++++- platformio/builder/scripts/frameworks/arduino.py | 6 +++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/platformio/boards/espressif.json b/platformio/boards/espressif.json index 249733d2..f2c4e3f5 100644 --- a/platformio/boards/espressif.json +++ b/platformio/boards/espressif.json @@ -3,7 +3,7 @@ "build": { "core": "esp8266", "extra_flags": "-DARDUINO_ESP8266_ESP01 -DARDUINO_ARCH_ESP8266 -DESP8266", - "f_cpu": "40000000L", + "f_cpu": "80000000L", "ldscript": "esp8266.flash.512k.ld", "mcu": "esp8266", "variant": "generic" diff --git a/platformio/builder/scripts/espressif.py b/platformio/builder/scripts/espressif.py index 2496111c..8515cabd 100644 --- a/platformio/builder/scripts/espressif.py +++ b/platformio/builder/scripts/espressif.py @@ -75,7 +75,10 @@ env.Replace( "-nostdlib", "-Wl,--no-check-sections", "-u", "call_user_start", - "-Wl,-static" + "-Wl,-static", + "-Wl,--gc-sections", + "-Wl,-wrap,system_restart_local", + "-Wl,-wrap,register_chipv6_phy" ], SIZEPRINTCMD='"$SIZETOOL" -B -d $SOURCES', diff --git a/platformio/builder/scripts/frameworks/arduino.py b/platformio/builder/scripts/frameworks/arduino.py index b534f8ac..f6637e36 100644 --- a/platformio/builder/scripts/frameworks/arduino.py +++ b/platformio/builder/scripts/frameworks/arduino.py @@ -55,10 +55,10 @@ elif env.get("PLATFORM") == "timsp430": ) elif env.get("PLATFORM") == "espressif": env.Prepend( - CPPPATH=[join("$PLATFORMFW_DIR", "sdk", "include")], - LIBPATH=[join("$PLATFORMFW_DIR", "sdk", "lib")], + CPPPATH=[join("$PLATFORMFW_DIR", "tools", "sdk", "include")], + LIBPATH=[join("$PLATFORMFW_DIR", "tools", "sdk", "lib")], LIBS=["smartconfig", "pp", "main", "wpa", "lwip", - "net80211", "wps", "crypto", "phy", "hal", "gcc", "m"] + "net80211", "wps", "crypto", "phy", "hal", "axtls", "gcc", "m"] ) env.Replace(PLATFORMFW_DIR=PLATFORMFW_DIR) From db42863f54930b132d0507671976bfc33d41a51e Mon Sep 17 00:00:00 2001 From: Valeriy Koval Date: Tue, 1 Dec 2015 11:21:23 +0200 Subject: [PATCH 2/2] Update build flags for espressif platform. --- platformio/builder/scripts/espressif.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platformio/builder/scripts/espressif.py b/platformio/builder/scripts/espressif.py index 8515cabd..49feea70 100644 --- a/platformio/builder/scripts/espressif.py +++ b/platformio/builder/scripts/espressif.py @@ -56,6 +56,8 @@ env.Replace( "-mtext-section-literals", "-falign-functions=4", "-U__STRICT_ANSI__", + "-ffunction-sections", + "-fdata-sections", "-MMD" # output dependancy info ], @@ -76,9 +78,7 @@ env.Replace( "-Wl,--no-check-sections", "-u", "call_user_start", "-Wl,-static", - "-Wl,--gc-sections", - "-Wl,-wrap,system_restart_local", - "-Wl,-wrap,register_chipv6_phy" + "-Wl,--gc-sections" ], SIZEPRINTCMD='"$SIZETOOL" -B -d $SOURCES',