mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7783 from Jason2866/patch-1 

Fixing use of new syntax for custom LD script (PlatformIO)
This commit is contained in:
Theo Arends 2020-02-24 10:39:40 +01:00 committed by GitHub
parent 8969877502 25301b8cdc
commit 86515b0714
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platformio.ini
View File

@ -56,6 +56,7 @@ default_envs =
framework = arduino framework = arduino
board = esp01_1m board = esp01_1m
board_build.flash_mode = dout board_build.flash_mode = dout
board_build.ldscript = eagle.flash.1m.ld
platform = ${core_active.platform} platform = ${core_active.platform}
platform_packages = ${core_active.platform_packages} platform_packages = ${core_active.platform_packages}

11
platformio_override_sample.ini
View File

@ -135,10 +135,9 @@ build_flags = ${esp82xx_defaults.build_flags}
[core_2_6_3] [core_2_6_3]
; *** Esp8266 core for Arduino version 2.6.3 ; *** Esp8266 core for Arduino version 2.6.3
platform = espressif8266@2.3.2 platform = espressif8266@2.3.3
platform_packages = platform_packages =
build_flags = ${esp82xx_defaults.build_flags} build_flags = ${esp82xx_defaults.build_flags}
-Wl,-Teagle.flash.1m.ld
-DBEARSSL_SSL_BASIC -DBEARSSL_SSL_BASIC
; NONOSDK221 ; NONOSDK221
; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 ; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221
@ -180,12 +179,10 @@ build_flags = ${esp82xx_defaults.build_flags}
[tasmota_core_stage] [tasmota_core_stage]
; *** Esp8266 core for Arduino version stable beta ; *** Esp8266 core for Arduino version stable beta
platform = espressif8266@2.3.2 platform = espressif8266@2.3.3
platform_packages = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#6be561617f645f6a2ae82b8211f6af8c43e834cf platform_packages = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#6be561617f645f6a2ae82b8211f6af8c43e834cf
build_flags = ${esp82xx_defaults.build_flags} build_flags = ${esp82xx_defaults.build_flags}
-Wl,-Teagle.flash.1m.ld
-DBEARSSL_SSL_BASIC -DBEARSSL_SSL_BASIC
-DNOPRINTFLOAT
; NONOSDK221 ; NONOSDK221
; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 ; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221
; NONOSDK22x_190313 ; NONOSDK22x_190313
@ -226,12 +223,10 @@ build_flags = ${esp82xx_defaults.build_flags}
[core_stage] [core_stage]
; *** Esp8266 core for Arduino version latest beta ; *** Esp8266 core for Arduino version latest beta
platform = espressif8266@2.3.2 platform = espressif8266@2.3.3
platform_packages = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git platform_packages = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git
board_build.ldscript = eagle.flash.1m.ld
build_flags = ${esp82xx_defaults.build_flags} build_flags = ${esp82xx_defaults.build_flags}
-DBEARSSL_SSL_BASIC -DBEARSSL_SSL_BASIC
-DNOPRINTFLOAT
; NONOSDK221 ; NONOSDK221
; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 ; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221
; NONOSDK22x_190313 ; NONOSDK22x_190313

1
platformio_tasmota_env.ini
View File

@ -3,6 +3,7 @@ platform = ${common.platform}
platform_packages = ${common.platform_packages} platform_packages = ${common.platform_packages}
framework = ${common.framework} framework = ${common.framework}
board = ${common.board} board = ${common.board}
board_build.ldscript = ${common.board_build.ldscript}
board_build.flash_mode = ${common.board_build.flash_mode} board_build.flash_mode = ${common.board_build.flash_mode}
board_build.f_cpu = ${common.board_build.f_cpu} board_build.f_cpu = ${common.board_build.f_cpu}
build_unflags = ${common.build_unflags} build_unflags = ${common.build_unflags}