Merge branch 'feature/issue-339-espressif-rc-framework' into develop

This commit is contained in:
Valeriy Koval
2015-12-01 11:51:50 +02:00
3 changed files with 8 additions and 5 deletions

View File

@ -3,7 +3,7 @@
"build": { "build": {
"core": "esp8266", "core": "esp8266",
"extra_flags": "-DARDUINO_ESP8266_ESP01 -DARDUINO_ARCH_ESP8266 -DESP8266", "extra_flags": "-DARDUINO_ESP8266_ESP01 -DARDUINO_ARCH_ESP8266 -DESP8266",
"f_cpu": "40000000L", "f_cpu": "80000000L",
"ldscript": "esp8266.flash.512k.ld", "ldscript": "esp8266.flash.512k.ld",
"mcu": "esp8266", "mcu": "esp8266",
"variant": "generic" "variant": "generic"

View File

@ -56,6 +56,8 @@ env.Replace(
"-mtext-section-literals", "-mtext-section-literals",
"-falign-functions=4", "-falign-functions=4",
"-U__STRICT_ANSI__", "-U__STRICT_ANSI__",
"-ffunction-sections",
"-fdata-sections",
"-MMD" # output dependancy info "-MMD" # output dependancy info
], ],
@ -75,7 +77,8 @@ env.Replace(
"-nostdlib", "-nostdlib",
"-Wl,--no-check-sections", "-Wl,--no-check-sections",
"-u", "call_user_start", "-u", "call_user_start",
"-Wl,-static" "-Wl,-static",
"-Wl,--gc-sections"
], ],
SIZEPRINTCMD='"$SIZETOOL" -B -d $SOURCES', SIZEPRINTCMD='"$SIZETOOL" -B -d $SOURCES',

View File

@ -55,10 +55,10 @@ elif env.get("PLATFORM") == "timsp430":
) )
elif env.get("PLATFORM") == "espressif": elif env.get("PLATFORM") == "espressif":
env.Prepend( env.Prepend(
CPPPATH=[join("$PLATFORMFW_DIR", "sdk", "include")], CPPPATH=[join("$PLATFORMFW_DIR", "tools", "sdk", "include")],
LIBPATH=[join("$PLATFORMFW_DIR", "sdk", "lib")], LIBPATH=[join("$PLATFORMFW_DIR", "tools", "sdk", "lib")],
LIBS=["smartconfig", "pp", "main", "wpa", "lwip", 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) env.Replace(PLATFORMFW_DIR=PLATFORMFW_DIR)