From 5f7ed8ce4a0779038656f24f1f34a25f241dc865 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 17 Apr 2021 19:47:42 +0200
Subject: [PATCH] Refactor Platformio

---
 platformio.ini               | 4 +---
 platformio_tasmota32.ini     | 2 +-
 platformio_tasmota_env.ini   | 3 +--
 platformio_tasmota_env32.ini | 1 -
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 9468f5102..97e8fe901 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -26,12 +26,9 @@ extra_configs               = platformio_tasmota32.ini
 
 [common]
 framework                   = arduino
-board                       = esp01_1m
 board_build.filesystem      = littlefs
 custom_unpack_dir           = unpacked_littlefs
 board_build.flash_mode      = dout
-board_build.ldscript        = eagle.flash.1m.ld
-
 platform                    = ${core.platform}
 platform_packages           = ${core.platform_packages}
 build_unflags               = ${core.build_unflags}
@@ -89,6 +86,7 @@ build_flags                 = -DCORE_DEBUG_LEVEL=0
 
 
 [esp82xx_defaults]
+board                       = esp8266_1M
 build_flags                 = ${esp_defaults.build_flags}
                               -DNDEBUG
                               -DFP_IN_IROM
diff --git a/platformio_tasmota32.ini b/platformio_tasmota32.ini
index 3a8c42192..0391e8c85 100644
--- a/platformio_tasmota32.ini
+++ b/platformio_tasmota32.ini
@@ -2,6 +2,7 @@
 ; ***  expect the unexpected. Some features not working!!!    ***
 
 [common32]
+framework                   = ${common.framework}
 platform                    = ${core32.platform}
 platform_packages           = ${core32.platform_packages}
 build_unflags               = ${core32.build_unflags}
@@ -9,7 +10,6 @@ build_flags                 = ${core32.build_flags}
 board                       = esp32dev
 board_build.filesystem      = ${common.board_build.filesystem}
 custom_unpack_dir           = ${common.custom_unpack_dir}
-board_build.ldscript        = esp32_out.ld
 board_build.partitions      = esp32_partition_app1856k_spiffs320k.csv
 board_build.flash_mode      = ${common.board_build.flash_mode}
 board_build.f_flash         = ${common.board_build.f_flash}
diff --git a/platformio_tasmota_env.ini b/platformio_tasmota_env.ini
index cd468af55..c0b3e7294 100644
--- a/platformio_tasmota_env.ini
+++ b/platformio_tasmota_env.ini
@@ -2,9 +2,8 @@
 platform                = ${common.platform}
 platform_packages       = ${common.platform_packages}
 framework               = ${common.framework}
-board                   = ${common.board}
+board                   = ${esp82xx_defaults.board}
 board_build.filesystem  = ${common.board_build.filesystem}
-board_build.ldscript    = ${common.board_build.ldscript}
 board_build.flash_mode  = ${common.board_build.flash_mode}
 board_build.f_flash     = ${common.board_build.f_flash}
 board_build.f_cpu       = ${common.board_build.f_cpu}
diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index 54722290c..3a44b2675 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -3,7 +3,6 @@ framework               = ${common.framework}
 platform                = ${common32.platform}
 platform_packages       = ${common32.platform_packages}
 board                   = ${common32.board}
-board_build.ldscript    = ${common32.board_build.ldscript}
 board_build.partitions  = ${common32.board_build.partitions}
 board_build.flash_mode  = ${common32.board_build.flash_mode}
 board_build.f_flash     = ${common32.board_build.f_flash}