From 91db6038930528b06913a40884355d85c7550d70 Mon Sep 17 00:00:00 2001
From: George Fu <nailao_5918@163.com>
Date: Sun, 25 Jul 2021 16:40:43 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20Fix=20FYSETC=20S6=20envs=20(#224?=
 =?UTF-8?q?21)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 .../PlatformIO/boards/marlin_fysetc_s6.json   |  2 +-
 .../boards/marlin_fysetc_s6_8000.json         | 35 -------------------
 .../variants/MARLIN_FYSETC_S6/ldscript.ld     |  4 +--
 ini/stm32f4.ini                               |  2 +-
 4 files changed, 4 insertions(+), 39 deletions(-)
 delete mode 100644 buildroot/share/PlatformIO/boards/marlin_fysetc_s6_8000.json

diff --git a/buildroot/share/PlatformIO/boards/marlin_fysetc_s6.json b/buildroot/share/PlatformIO/boards/marlin_fysetc_s6.json
index 42a203786d..286e46ffbd 100644
--- a/buildroot/share/PlatformIO/boards/marlin_fysetc_s6.json
+++ b/buildroot/share/PlatformIO/boards/marlin_fysetc_s6.json
@@ -21,7 +21,7 @@
   "name": "3D Printer control board",
   "upload": {
     "maximum_ram_size": 131072,
-    "maximum_size": 458752,
+    "maximum_size": 524288,
     "protocol": "stlink",
     "protocols": [
       "jlink",
diff --git a/buildroot/share/PlatformIO/boards/marlin_fysetc_s6_8000.json b/buildroot/share/PlatformIO/boards/marlin_fysetc_s6_8000.json
deleted file mode 100644
index 1d808a23d7..0000000000
--- a/buildroot/share/PlatformIO/boards/marlin_fysetc_s6_8000.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "build": {
-    "cpu": "cortex-m4",
-    "extra_flags": "-DSTM32F446xx",
-    "f_cpu": "180000000L",
-    "mcu": "stm32f446ret6",
-    "variant": "MARLIN_FYSETC_S6"
-  },
-  "connectivity": [
-    "can"
-  ],
-  "debug": {
-    "jlink_device": "STM32F446RE",
-    "openocd_target": "stm32f4x",
-    "svd_path": "STM32F446x.svd"
-  },
-  "frameworks": [
-    "arduino",
-    "stm32cube"
-  ],
-  "name": "3D Printer control board",
-  "upload": {
-    "maximum_ram_size": 131072,
-    "maximum_size": 491520,
-    "protocol": "stlink",
-    "protocols": [
-      "jlink",
-      "stlink",
-      "blackmagic",
-      "serial"
-    ]
-  },
-  "url": "https://www.st.com/en/microcontrollers-microprocessors/stm32f446.html",
-  "vendor": "FYSETC"
-}
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/ldscript.ld
index 2a61072cb1..fee7418b04 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/ldscript.ld
@@ -60,8 +60,8 @@ _Min_Stack_Size = 0x400;; /* required amount of stack */
 /* Specify the memory areas */
 MEMORY
 {
-FLASH (rx)      : ORIGIN = 0x8010000, LENGTH = 512K
-RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = 128K
+RAM (xrw) : ORIGIN = 0x20000000,  LENGTH = LD_MAX_DATA_SIZE
+FLASH (rx)  : ORIGIN = 0x8000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
 }
 
 /* Define output sections */
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index 901f145113..04fd03bf72 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -82,7 +82,7 @@ upload_command              = dfu-util -a 0 -s 0x08010000:leave -D "$SOURCE"
 [env:FYSETC_S6_8000]
 platform                    = ${common_stm32.platform}
 extends                     = env:FYSETC_S6
-board                       = marlin_fysetc_s6_8000
+board                       = marlin_fysetc_s6
 board_build.offset          = 0x8000
 board_upload.offset_address = 0x08008000
 upload_command              = dfu-util -a 0 -s 0x08008000:leave -D "$SOURCE"