Rework to be aligned with tools package.

Signed-off-by: Frederic.Pillon <[email protected]>

Author: fpistm

boards.txt

@@ -29,6 +29,15 @@ NUCLEO_F103RB.build.extra_flags=-mthumb -DSTM32F103xB
 
 NUCLEO_F103RB.build.vect-offset=
 
+#---------------------------- UPLOAD METHODS ---------------------------
+NUCLEO_F103RB.menu.upload_method.MassStorageMethod=Mass Storage
+NUCLEO_F103RB.menu.upload_method.MassStorageMethod.upload.protocol=
+NUCLEO_F103RB.menu.upload_method.MassStorageMethod.upload.tool=nucleoFlasher
+
+NUCLEO_F103RB.menu.upload_method.STLinkMethod=STLink
+NUCLEO_F103RB.menu.upload_method.STLinkMethod.upload.protocol=STLink
+NUCLEO_F103RB.menu.upload_method.STLinkMethod.upload.tool=stlink_upload
+
 ################################################################################
 # STM32VLDISCOVERY board
 

platform.txt

@@ -94,10 +94,9 @@ recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
 # -------------------
 
 #Upload to Nucleo via mass storage
-//tools.nucleoFlasher.path={runtime.tools.nucleoFlasher.path}
-tools.nucleoFlasher.path={runtime.hardware.path}/tools/win/nucleoFlasher
-tools.nucleoFlasher.path.macosx={runtime.hardware.path}/tools/macosx/nucleoFlasher
-tools.nucleoFlasher.path.linux={runtime.hardware.path}/tools/linux/nucleoFlasher
+tools.nucleoFlasher.path={runtime.tools.STM32Tools.path}/tools/win/nucleoFlasher
+tools.nucleoFlasher.path.macosx={runtime.tools.STM32Tools.path}/tools/macosx/nucleoFlasher
+tools.nucleoFlasher.path.linux={runtime.tools.STM32Tools.path}/tools/linux/nucleoFlasher
 
 tools.nucleoFlasher.cmd.linux=nucleoFlasher
 tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat
@@ -109,13 +108,15 @@ tools.nucleoFlasher.upload.params.quiet=
 tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "{build.path}/{build.project_name}.bin" -O "{node}"
 
 
+
+
 # Upload using Maple bootloader over DFU
 tools.maple_upload.cmd=maple_upload
 tools.maple_upload.cmd.windows=maple_upload.bat
-tools.maple_upload.path={runtime.hardware.path}/tools/win
-tools.maple_upload.path.macosx={runtime.hardware.path}/tools/macosx
-tools.maple_upload.path.linux={runtime.hardware.path}/tools/linux
-tools.maple_upload.path.linux64={runtime.hardware.path}/tools/linux64
+tools.maple_upload.path={runtime.tools.STM32Tools.path}/tools/win
+tools.maple_upload.path.macosx={runtime.tools.STM32Tools.path}/tools/macosx
+tools.maple_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux
+tools.maple_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64
 tools.maple_upload.upload.params.verbose=-d
 tools.maple_upload.upload.params.quiet=
 tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "{build.path}/{build.project_name}.bin"
@@ -126,21 +127,21 @@ tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altI
 tools.serial_upload.cmd=serial_upload
 tools.serial_upload.cmd.windows=serial_upload.bat
 tools.serial_upload.cmd.macosx=serial_upload
-tools.serial_upload.path={runtime.hardware.path}/tools/win
-tools.serial_upload.path.macosx={runtime.hardware.path}/tools/macosx
-tools.serial_upload.path.linux={runtime.hardware.path}/tools/linux
-tools.serial_upload.path.linux64={runtime.hardware.path}/tools/linux64
+tools.serial_upload.path={runtime.tools.STM32Tools.path}/tools/win
+tools.serial_upload.path.macosx={runtime.tools.STM32Tools.path}/tools/macosx
+tools.serial_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux
+tools.serial_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64
 tools.serial_upload.upload.params.verbose=-d
 tools.serial_upload.upload.params.quiet=n
 tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "{build.path}/{build.project_name}.bin"
 
 # stlink upload
 tools.stlink_upload.cmd=stlink_upload
 tools.stlink_upload.cmd.windows=stlink_upload.bat
-tools.stlink_upload.path.windows={runtime.hardware.path}/tools/win
-tools.stlink_upload.path.macosx={runtime.hardware.path}/tools/macosx
-tools.stlink_upload.path.linux={runtime.hardware.path}/tools/linux
-tools.stlink_upload.path.linux64={runtime.hardware.path}/tools/linux64
+tools.stlink_upload.path.windows={runtime.tools.STM32Tools.path}/tools/win
+tools.stlink_upload.path.macosx={runtime.tools.STM32Tools.path}/tools/macosx
+tools.stlink_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux
+tools.stlink_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64
 tools.stlink_upload.upload.params.verbose=-d
 tools.stlink_upload.upload.params.quiet=
 tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "{build.path}/{build.project_name}.bin"