delete unused board json

MarlinFirmware · Jul 23, 2021 · f5e3a7b · f5e3a7b
1 parent 8b570e7
commit f5e3a7b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 44 deletions.
diff --git 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": 491520,
     "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
diff --git 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 = 0x8008000, 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
@@ -69,9 +69,7 @@ upload_protocol     = dfu
 platform                    = ${common_stm32.platform}
 extends                     = common_stm32
 board                       = fysetc_s6
-board_build.offset          = 0x10000
-board_upload.offset_address = 0x08010000
-build_flags                 = ${stm32_variant.build_flags} -DHAL_PCD_MODULE_ENABLED
+build_flags                 = ${common_stm32.build_flags} -DHAL_PCD_MODULE_ENABLED
 debug_tool                  = stlink
 upload_protocol             = dfu
 upload_command              = dfu-util -a 0 -s 0x08010000:leave -D "$SOURCE"
@@ -80,11 +78,14 @@ upload_command              = dfu-util -a 0 -s 0x08010000:leave -D "$SOURCE"
 # FYSETC S6 new bootloader
 #
 [env:FYSETC_S6_8000]
-platform                    = ${common_stm32.platform}
-extends                     = env:FYSETC_S6
-board                       = marlin_fysetc_s6_8000
+platform                    = ${stm32_variant.platform}
+extends                     = stm32_variant
+board                       = marlin_fysetc_s6
 board_build.offset          = 0x8000
 board_upload.offset_address = 0x08008000
+build_flags                 = ${stm32_variant.build_flags} -DHAL_PCD_MODULE_ENABLED
+debug_tool                  = stlink
+upload_protocol             = dfu
 upload_command              = dfu-util -a 0 -s 0x08008000:leave -D "$SOURCE"
 
 #