Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix FYSETC S6/Spider boot issue #22421

Merged
merged 5 commits into from
Jul 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildroot/share/PlatformIO/boards/marlin_fysetc_s6.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"name": "3D Printer control board",
"upload": {
"maximum_ram_size": 131072,
"maximum_size": 458752,
"maximum_size": 524288,
"protocol": "stlink",
"protocols": [
"jlink",
Expand Down
35 changes: 0 additions & 35 deletions buildroot/share/PlatformIO/boards/marlin_fysetc_s6_8000.json

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion ini/stm32f4.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down