zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

[2.0.x][LPC176x] Fix binary linking broken by pio update (#11026)

Browse source
This commit is contained in:
Chris Pepper 2018-06-15 21:32:51 +01:00 committed by Scott Lahteine
parent fdd97e649d
commit f88adcbfd5
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/HAL/HAL_LPC1768/lpc1768_flag_script.py
View file

@ -22,6 +22,7 @@ if __name__ == "__main__":
# For MarlinFirmware/U8glib-HAL # For MarlinFirmware/U8glib-HAL
"-IMarlin/src/HAL/HAL_LPC1768/u8g", "-IMarlin/src/HAL/HAL_LPC1768/u8g",
"-DU8G_HAL_LINKS",
"-MMD", "-MMD",
"-MP", "-MP",
@ -48,11 +49,12 @@ else:
"-fno-threadsafe-statics" "-fno-threadsafe-statics"
], ],
LINKFLAGS=[ LINKFLAGS=[
"-Wl,-Tframeworks/CMSIS/LPC1768/Re-ARM/LPC1768.ld,--gc-sections",
"-Os", "-Os",
"-mcpu=cortex-m3", "-mcpu=cortex-m3",
"-mthumb", "-mthumb",
"--specs=nano.specs", "--specs=nano.specs",
"--specs=nosys.specs", "--specs=nosys.specs",
"-u_printf_float", "-u_printf_float"
], ],
) )

3
frameworks/CMSIS/library.json
View file

@ -11,8 +11,7 @@
"src_filter": "+<LPC1768/*>", "src_filter": "+<LPC1768/*>",
"flags": [ "flags": [
"-ILPC1768/include", "-ILPC1768/include",
"-ILPC1768/lib", "-ILPC1768/lib"
"-Wl,-Tframeworks/CMSIS/LPC1768/Re-ARM/LPC1768.ld,--gc-sections"
] ]
} }
} }

8
platformio.ini
View file

@ -150,10 +150,10 @@ monitor_speed = 250000
platform = nxplpc platform = nxplpc
board = lpc1768 board = lpc1768
board_build.f_cpu = 100000000L board_build.f_cpu = 100000000L
build_flags = !python Marlin/src/HAL/HAL_LPC1768/lpc1768_flag_script.py # Override default maximum RAM. LPC1768/9 do have 64k, but in 3 blocks (32K, 16K, 16K).
${common.build_flags} # The first 32k block is used by default, while the others must be specifically targeted.
-DU8G_HAL_LINKS board_upload.maximum_ram_size = 32768
src_build_flags = -Wall build_flags = !python Marlin/src/HAL/HAL_LPC1768/lpc1768_flag_script.py ${common.build_flags}
build_unflags = -Wall build_unflags = -Wall
lib_ldf_mode = off lib_ldf_mode = off
lib_extra_dirs = frameworks lib_extra_dirs = frameworks