From 6445eb0950e2340e99a2517291fa8b72ed1820d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Izzo?= Date: Thu, 12 Nov 2020 22:10:13 +0100 Subject: [PATCH] Move selection of linker script in meson.build Now the linker script was moved from cross_arm.txt into meson.build, so that the same cross_arm.txt can be used for both the MD380 and the GD77. --- cross_arm.txt | 1 - meson.build | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cross_arm.txt b/cross_arm.txt index ffbe346f..fd8a0153 100644 --- a/cross_arm.txt +++ b/cross_arm.txt @@ -28,7 +28,6 @@ c_link_args = [ '-Wl,--gc-sections', '-Wl,-Map,main.map', '-nostdlib', - '-Wl,-T../platform/mcu/STM32F4xx/linker_script.ld', '-Wl,--start-group', '-lc', '-lgcc', diff --git a/meson.build b/meson.build index c1137dd9..25498bce 100644 --- a/meson.build +++ b/meson.build @@ -188,11 +188,13 @@ linux_opts = {'sources': linux_src, md380_opts = {'sources': md380_src, 'c_args': md380_args, + 'link_args' : '-Wl,-T../platform/mcu/STM32F4xx/linker_script.ld', 'include_directories': md380_inc} mduv380_opts = {'sources': mduv380_src, 'c_args': mduv380_args, + 'link_args' : '-Wl,-T../platform/mcu/STM32F4xx/linker_script.ld', 'include_directories': mduv380_inc} ##