Browse Source

🔨 Fix FYSETC S6 envs (#22421)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
George Fu 3 years ago
parent
commit
91db603893
No account linked to committer's email address

+ 1
- 1
buildroot/share/PlatformIO/boards/marlin_fysetc_s6.json View File

@@ -21,7 +21,7 @@
21 21
   "name": "3D Printer control board",
22 22
   "upload": {
23 23
     "maximum_ram_size": 131072,
24
-    "maximum_size": 458752,
24
+    "maximum_size": 524288,
25 25
     "protocol": "stlink",
26 26
     "protocols": [
27 27
       "jlink",

+ 0
- 35
buildroot/share/PlatformIO/boards/marlin_fysetc_s6_8000.json View File

@@ -1,35 +0,0 @@
1
-{
2
-  "build": {
3
-    "cpu": "cortex-m4",
4
-    "extra_flags": "-DSTM32F446xx",
5
-    "f_cpu": "180000000L",
6
-    "mcu": "stm32f446ret6",
7
-    "variant": "MARLIN_FYSETC_S6"
8
-  },
9
-  "connectivity": [
10
-    "can"
11
-  ],
12
-  "debug": {
13
-    "jlink_device": "STM32F446RE",
14
-    "openocd_target": "stm32f4x",
15
-    "svd_path": "STM32F446x.svd"
16
-  },
17
-  "frameworks": [
18
-    "arduino",
19
-    "stm32cube"
20
-  ],
21
-  "name": "3D Printer control board",
22
-  "upload": {
23
-    "maximum_ram_size": 131072,
24
-    "maximum_size": 491520,
25
-    "protocol": "stlink",
26
-    "protocols": [
27
-      "jlink",
28
-      "stlink",
29
-      "blackmagic",
30
-      "serial"
31
-    ]
32
-  },
33
-  "url": "https://www.st.com/en/microcontrollers-microprocessors/stm32f446.html",
34
-  "vendor": "FYSETC"
35
-}

+ 2
- 2
buildroot/share/PlatformIO/variants/MARLIN_FYSETC_S6/ldscript.ld View File

@@ -60,8 +60,8 @@ _Min_Stack_Size = 0x400;; /* required amount of stack */
60 60
 /* Specify the memory areas */
61 61
 MEMORY
62 62
 {
63
-FLASH (rx)      : ORIGIN = 0x8010000, LENGTH = 512K
64
-RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = 128K
63
+RAM (xrw) : ORIGIN = 0x20000000,  LENGTH = LD_MAX_DATA_SIZE
64
+FLASH (rx)  : ORIGIN = 0x8000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
65 65
 }
66 66
 
67 67
 /* Define output sections */

+ 1
- 1
ini/stm32f4.ini View File

@@ -82,7 +82,7 @@ upload_command              = dfu-util -a 0 -s 0x08010000:leave -D "$SOURCE"
82 82
 [env:FYSETC_S6_8000]
83 83
 platform                    = ${common_stm32.platform}
84 84
 extends                     = env:FYSETC_S6
85
-board                       = marlin_fysetc_s6_8000
85
+board                       = marlin_fysetc_s6
86 86
 board_build.offset          = 0x8000
87 87
 board_upload.offset_address = 0x08008000
88 88
 upload_command              = dfu-util -a 0 -s 0x08008000:leave -D "$SOURCE"

Loading…
Cancel
Save