add ARDUINO_LD_SCRIPT var to override linker script

Author: mean

Platform/Core/Targets/ArduinoFirmwareTargetCreatorStm32.cmake

@@ -56,22 +56,26 @@ function(create_arduino_firmware_target TARGET_NAME BOARD_ID ALL_SRCS ALL_LIBS
     # let's hardcode to bootloader for now 
     #dump_all()
     # Check for blackMagic
-    IF(ARDUINO_UPLOAD_METHOD MATCHES "BMP")
+    IF(NOT DEFINED ARDUINO_LD_SCRIPT)
+        IF(ARDUINO_UPLOAD_METHOD MATCHES "BMP")
             IF(NOT DEFINED ARDUINO_LD_FILE)
                 SET(BOOTLOADER_LINK_OPT  "-T${RUNTIME_FILES_PATH}/ld/jtag_c8.ld ") # Hack
             ELSE(NOT DEFINED ARDUINO_LD_FILE)
                 SET(BOOTLOADER_LINK_OPT  "-T${RUNTIME_FILES_PATH}/ld/${ARDUINO_LD_FILE}.ld ") # Hack
             ENDIF(NOT DEFINED ARDUINO_LD_FILE)
+        ELSE()
+            if( DEFINED ${BOARD_ID}.menu.cpu.DFUUploadMethod.build.ldscript  )
+                SET(BOOTLOADER_LINK_OPT  "-T${RUNTIME_FILES_PATH}/${${BOARD_ID}.menu.cpu.DFUUploadMethod.build.ldscript} ") # Hack
+            else( DEFINED ${BOARD_ID}.menu.cpu.DFUUploadMethod.build.ldscript  )
+                SET(BOOTLOADER_LINK_OPT  "-T${RUNTIME_FILES_PATH}/${${BOARD_ID}.menu.cpu.bootloader20.build.ldscript} ") # Hack
+            endif( DEFINED ${BOARD_ID}.menu.cpu.DFUUploadMethod.build.ldscript  )
+        ENDIF()
+        SET(BOOTLOADER_LINK_OPT  "${BOOTLOADER_LINK_OPT} -L${RUNTIME_FILES_PATH}/ld") # Hack
     ELSE()
-        if( DEFINED ${BOARD_ID}.menu.cpu.DFUUploadMethod.build.ldscript  )
-            SET(BOOTLOADER_LINK_OPT  "-T${RUNTIME_FILES_PATH}/${${BOARD_ID}.menu.cpu.DFUUploadMethod.build.ldscript} ") # Hack
-        else( DEFINED ${BOARD_ID}.menu.cpu.DFUUploadMethod.build.ldscript  )
-            SET(BOOTLOADER_LINK_OPT  "-T${RUNTIME_FILES_PATH}/${${BOARD_ID}.menu.cpu.bootloader20.build.ldscript} ") # Hack
-        endif( DEFINED ${BOARD_ID}.menu.cpu.DFUUploadMethod.build.ldscript  )
+                SET(BOOTLOADER_LINK_OPT  "${ARDUINO_LD_SCRIPT} ") 
     ENDIF()
 
-    SET(BOOTLOADER_LINK_OPT  "${BOOTLOADER_LINK_OPT} -L${RUNTIME_FILES_PATH}/ld") # Hack
-    MESSAGE(STATUS "Bootloader : <${BOOTLOADER_LINK_OPT}>")
+    MESSAGE(STATUS "Bootloader : <${BOOTLOADER_LINK_OPT}> , ARDUINO_LD_SCRIPT=${ARDUINO_LD_SCRIPT}")
     SET(MAP_OPT  "-Wl,-Map,${TARGET_NAME}.map")
 
     #

README.stm32

@@ -0,0 +1,4 @@
+Some settings :
+
+ARDUINO_MCU_FLAGS : To override the default (i.e. -mcpu=cortex-m3 -march=armv6xx)
+ARDUINO_LD_SCRIPT : To override the linker file

select_mcu_stm32.cmake

@@ -13,6 +13,7 @@ IF(USE_GD32F103)
     set(X_ARDUINO_CPU           GD32F103C8)
     ADD_DEFINITIONS("-DHIGH_SPEED_ADC")
     SET(X_ARDUINO_UPLOAD_METHOD BMP) # Use blackmagic link, if you comment it out you'll use DFU => 8kB flash
+    SET(ARDUINO_LD_SCRIPT "-T${CMAKE_CURRENT_SOURCE_DIR}/ldScript/GD32F1/gd32f1.ld -L${CMAKE_CURRENT_SOURCE_DIR}/ldScript/common ")
 ELSEIF(USE_GD32F303)
     SET(EXTENSION             "GD32F303")
     set(X_ARDUINO_DEFAULT_BOARD genericGD32F303C)        # Default Board ID, when not specified
@@ -21,10 +22,12 @@ ELSEIF(USE_GD32F303)
     SET(ARDUINO_MCU_FLAGS               "  -mcpu=cortex-m4 -mfloat-abi=softfp -march=armv7 -mthumb")# -mfpu=fpv4-sp-d16")
     ADD_DEFINITIONS("-DHIGH_SPEED_ADC")
     SET(X_ARDUINO_UPLOAD_METHOD BMP) # Use blackmagic link, if you comment it out you'll use DFU => 8kB flash
+    SET(ARDUINO_LD_SCRIPT "-T${CMAKE_CURRENT_SOURCE_DIR}/ldScript/GD32F3/gd32f3.ld -L${CMAKE_CURRENT_SOURCE_DIR}/ldScript/common ")
 ELSE()
     SET(EXTENSION             "STM32F103")
     set(X_ARDUINO_LD_FILE      jtag)      # Use that instead of default jtag-c8 to get the full 128 kB
     set(X_ARDUINO_DEFAULT_BOARD genericSTM32F103C)        # Default Board ID, when not specified
     set(X_ARDUINO_CPU           STM32F103C8)
     SET(X_ARDUINO_UPLOAD_METHOD BMP) # Use blackmagic link, if you comment it out you'll use DFU => 8kB flash
+    SET(ARDUINO_LD_SCRIPT "-T${CMAKE_CURRENT_SOURCE_DIR}/ldScript/STM32F1/stm32f1.ld -L${CMAKE_CURRENT_SOURCE_DIR}/ldScript/common ")
 ENDIF(USE_GD32F103)