From f9a35fd714b889475e067d8c2c72c551ea3c0cba Mon Sep 17 00:00:00 2001 From: Frederic Pillon Date: Tue, 2 Jul 2024 16:11:42 +0200 Subject: [PATCH] fix(programmer): remove stlink programmer as it is not relevant and avoid upload using arduino-cli. Fixes #2415 Signed-off-by: Frederic Pillon --- boards.txt | 36 ------------------------------------ platform.txt | 4 ++-- programmers.txt | 9 --------- 3 files changed, 2 insertions(+), 47 deletions(-) diff --git a/boards.txt b/boards.txt index c37d3ad7d4..9f263b36c6 100644 --- a/boards.txt +++ b/boards.txt @@ -23,7 +23,6 @@ Nucleo_144.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build Nucleo_144.build.flash_offset=0x0 Nucleo_144.upload.maximum_size=0 Nucleo_144.upload.maximum_data_size=0 -Nucleo_144.programmer.default=stlink Nucleo_144.vid.0=0x0483 Nucleo_144.pid.0=0x5740 Nucleo_144.vid.1=0x0483 @@ -395,7 +394,6 @@ Nucleo_64.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build. Nucleo_64.build.flash_offset=0x0 Nucleo_64.upload.maximum_size=0 Nucleo_64.upload.maximum_data_size=0 -Nucleo_64.programmer.default=stlink Nucleo_64.vid.0=0x0483 Nucleo_64.pid.0=0x5740 # STlink V1/V2.1/V3 @@ -875,7 +873,6 @@ Nucleo_32.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build. Nucleo_32.build.flash_offset=0x0 Nucleo_32.upload.maximum_size=0 Nucleo_32.upload.maximum_data_size=0 -Nucleo_32.programmer.default=stlink Nucleo_32.vid.0=0x0483 Nucleo_32.pid.0=0x5740 # STlink V1/V2.1/V3 @@ -1038,7 +1035,6 @@ Disco.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSer Disco.build.flash_offset=0x0 Disco.upload.maximum_size=0 Disco.upload.maximum_data_size=0 -Disco.programmer.default=stlink Disco.vid.0=0x0483 Disco.pid.0=0x5740 # STlink V1/V2.1/V3 @@ -1359,7 +1355,6 @@ Eval.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSeri Eval.build.flash_offset=0x0 Eval.upload.maximum_size=0 Eval.upload.maximum_data_size=0 -Eval.programmer.default=stlink Eval.vid.0=0x0483 Eval.pid.0=0x5740 # STlink V1/V2.1/V3 @@ -1425,7 +1420,6 @@ STM32MP1.name=STM32MP1 series coprocessor STM32MP1.build.flash_offset=0x0 STM32MP1.upload.maximum_size=0 STM32MP1.upload.maximum_data_size=0 -STM32MP1.programmer.default=stlink STM32MP1.vid.0=0x0483 STM32MP1.pid.0=0x5740 @@ -1474,7 +1468,6 @@ GenC0.build.st_extra_flags=-D{build.product_line} {build.xSerial} -D__CORTEX_SC= GenC0.build.flash_offset=0x0 GenC0.upload.maximum_size=0 GenC0.upload.maximum_data_size=0 -GenC0.programmer.default=stlink GenC0.debug.server.openocd.scripts.2=target/stm32c0x.cfg GenC0.vid.0=0x0483 GenC0.pid.0=0x5740 @@ -1619,7 +1612,6 @@ GenF0.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSer GenF0.build.flash_offset=0x0 GenF0.upload.maximum_size=0 GenF0.upload.maximum_data_size=0 -GenF0.programmer.default=stlink GenF0.debug.server.openocd.scripts.2=target/stm32f0x.cfg GenF0.vid.0=0x0483 GenF0.pid.0=0x5740 @@ -2528,7 +2520,6 @@ GenF1.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSer GenF1.build.flash_offset=0x0 GenF1.upload.maximum_size=0 GenF1.upload.maximum_data_size=0 -GenF1.programmer.default=stlink GenF1.debug.server.openocd.scripts.2=target/stm32f1x.cfg GenF1.vid.0=0x0483 GenF1.pid.0=0x5740 @@ -3373,7 +3364,6 @@ GenF2.build.series=STM32F2xx GenF2.build.flash_offset=0x0 GenF2.upload.maximum_size=0 GenF2.upload.maximum_data_size=0 -GenF2.programmer.default=stlink GenF2.debug.server.openocd.scripts.2=target/stm32f2x.cfg GenF2.vid.0=0x0483 GenF2.pid.0=0x5740 @@ -3832,7 +3822,6 @@ GenF3.build.series=STM32F3xx GenF3.build.flash_offset=0x0 GenF3.upload.maximum_size=0 GenF3.upload.maximum_data_size=0 -GenF3.programmer.default=stlink GenF3.debug.server.openocd.scripts.2=target/stm32f3x.cfg GenF3.vid.0=0x0483 GenF3.pid.0=0x5740 @@ -4288,7 +4277,6 @@ GenF4.build.series=STM32F4xx GenF4.build.flash_offset=0x0 GenF4.upload.maximum_size=0 GenF4.upload.maximum_data_size=0 -GenF4.programmer.default=stlink GenF4.debug.server.openocd.scripts.2=target/stm32f4x.cfg GenF4.vid.0=0x0483 GenF4.pid.0=0x5740 @@ -5304,7 +5292,6 @@ GenF7.build.series=STM32F7xx GenF7.build.flash_offset=0x0 GenF7.upload.maximum_size=0 GenF7.upload.maximum_data_size=0 -GenF7.programmer.default=stlink GenF7.debug.server.openocd.scripts.2=target/stm32f7x.cfg GenF7.vid.0=0x0483 GenF7.pid.0=0x5740 @@ -5832,7 +5819,6 @@ GenG0.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSer GenG0.build.flash_offset=0x0 GenG0.upload.maximum_size=0 GenG0.upload.maximum_data_size=0 -GenG0.programmer.default=stlink GenG0.debug.server.openocd.scripts.2=target/stm32g0x.cfg GenG0.vid.0=0x0483 GenG0.pid.0=0x5740 @@ -7246,7 +7232,6 @@ GenG4.build.series=STM32G4xx GenG4.build.flash_offset=0x0 GenG4.upload.maximum_size=0 GenG4.upload.maximum_data_size=0 -GenG4.programmer.default=stlink GenG4.debug.server.openocd.scripts.2=target/stm32g4x.cfg GenG4.vid.0=0x0483 GenG4.pid.0=0x5740 @@ -8415,7 +8400,6 @@ GenH5.build.series=STM32H5xx GenH5.build.flash_offset=0x0 GenH5.upload.maximum_size=0 GenH5.upload.maximum_data_size=0 -GenH5.programmer.default=stlink # Current openocd version does not support H5 # GenH5.debug.server.openocd.scripts.2=target/stm32h5x.cfg GenH5.vid.0=0x0483 @@ -8505,7 +8489,6 @@ GenH7.build.mcu=cortex-m7 GenH7.build.flash_offset=0x0 GenH7.upload.maximum_size=0 GenH7.upload.maximum_data_size=0 -GenH7.programmer.default=stlink GenH7.debug.server.openocd.scripts.2=target/stm32h7x.cfg GenH7.vid.0=0x0483 GenH7.pid.0=0x5740 @@ -9140,7 +9123,6 @@ GenL0.build.series=STM32L0xx GenL0.build.flash_offset=0x0 GenL0.upload.maximum_size=0 GenL0.upload.maximum_data_size=0 -GenL0.programmer.default=stlink GenL0.debug.server.openocd.scripts.2=target/stm32l0x.cfg GenL0.vid.0=0x0483 GenL0.pid.0=0x5740 @@ -10423,7 +10405,6 @@ GenL1.build.series=STM32L1xx GenL1.build.flash_offset=0x0 GenL1.upload.maximum_size=0 GenL1.upload.maximum_data_size=0 -GenL1.programmer.default=stlink GenL1.debug.server.openocd.scripts.2=target/stm32l1x.cfg GenL1.vid.0=0x0483 GenL1.pid.0=0x5740 @@ -10746,7 +10727,6 @@ GenL4.build.series=STM32L4xx GenL4.build.flash_offset=0x0 GenL4.upload.maximum_size=0 GenL4.upload.maximum_data_size=0 -GenL4.programmer.default=stlink GenL4.debug.server.openocd.scripts.2=target/stm32l4x.cfg GenL4.vid.0=0x0483 GenL4.pid.0=0x5740 @@ -11511,7 +11491,6 @@ GenL5.build.series=STM32L5xx GenL5.build.flash_offset=0x0 GenL5.upload.maximum_size=0 GenL5.upload.maximum_data_size=0 -GenL5.programmer.default=stlink GenL5.debug.server.openocd.scripts.2=target/stm32l5x.cfg GenL5.vid.0=0x0483 GenL5.pid.0=0x5740 @@ -11573,7 +11552,6 @@ GenU5.build.series=STM32U5xx GenU5.build.flash_offset=0x0 GenU5.upload.maximum_size=0 GenU5.upload.maximum_data_size=0 -GenU5.programmer.default=stlink GenU5.debug.server.openocd.scripts.2=target/stm32u5x.cfg GenU5.vid.0=0x0483 GenU5.pid.0=0x5740 @@ -11698,7 +11676,6 @@ GenWB.build.series=STM32WBxx GenWB.build.flash_offset=0x0 GenWB.upload.maximum_size=0 GenWB.upload.maximum_data_size=0 -GenWB.programmer.default=stlink GenWB.debug.server.openocd.scripts.2=target/stm32wbx.cfg GenWB.vid.0=0x0483 GenWB.pid.0=0x5740 @@ -11805,7 +11782,6 @@ GenWBA.build.series=STM32WBAxx GenWBA.build.flash_offset=0x0 GenWBA.upload.maximum_size=0 GenWBA.upload.maximum_data_size=0 -GenWBA.programmer.default=stlink GenWBA.debug.server.openocd.scripts.2=target/stm32wbax.cfg GenWBA.vid.0=0x0483 GenWBA.pid.0=0x5740 @@ -11853,7 +11829,6 @@ GenWL.build.series=STM32WLxx GenWL.build.flash_offset=0x0 GenWL.upload.maximum_size=0 GenWL.upload.maximum_data_size=0 -GenWL.programmer.default=stlink GenWL.debug.server.openocd.scripts.2=target/stm32wlx.cfg GenWL.vid.0=0x0483 GenWL.pid.0=0x5740 @@ -12030,7 +12005,6 @@ GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg 3dprinter.build.flash_offset=0x0 3dprinter.upload.maximum_size=0 3dprinter.upload.maximum_data_size=0 -3dprinter.programmer.default=stlink 3dprinter.vid.0=0x0483 3dprinter.pid.0=0x5740 @@ -12262,7 +12236,6 @@ Blues.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSer Blues.build.flash_offset=0x0 Blues.upload.maximum_size=0 Blues.upload.maximum_data_size=0 -Blues.programmer.default=stlink Blues.vid.0=0x30A4 # Swan R5 board @@ -12325,7 +12298,6 @@ Elecgator.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build. Elecgator.build.flash_offset=0x0 Elecgator.upload.maximum_size=0 Elecgator.upload.maximum_data_size=0 -Elecgator.programmer.default=stlink Elecgator.vid.0=0x0483 Elecgator.pid.0=0x5740 @@ -12367,7 +12339,6 @@ ESC_board.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build. ESC_board.build.flash_offset=0x0 ESC_board.upload.maximum_size=0 ESC_board.upload.maximum_data_size=0 -ESC_board.programmer.default=stlink ESC_board.vid.0=0x0483 ESC_board.pid.0=0x5740 @@ -12425,7 +12396,6 @@ Garatronic.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build Garatronic.build.flash_offset=0x0 Garatronic.upload.maximum_size=0 Garatronic.upload.maximum_data_size=0 -Garatronic.programmer.default=stlink Garatronic.vid.0=0x0483 Garatronic.pid.0=0x5740 @@ -12505,7 +12475,6 @@ GenFlight.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build. GenFlight.build.flash_offset=0x0 GenFlight.upload.maximum_size=0 GenFlight.upload.maximum_data_size=0 -GenFlight.programmer.default=stlink GenFlight.vid.0=0x0483 GenFlight.pid.0=0x5740 @@ -12605,7 +12574,6 @@ IotContinuum.build.st_extra_flags=-D{build.product_line} {build.xSerial} IotContinuum.build.flash_offset=0x0 IotContinuum.upload.maximum_size=0 IotContinuum.upload.maximum_data_size=0 -IotContinuum.programmer.default=stlink IotContinuum.vid.0=0x0483 IotContinuum.pid.0=0x5740 @@ -12651,7 +12619,6 @@ LoRa.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSeri LoRa.build.flash_offset=0x0 LoRa.upload.maximum_size=0 LoRa.upload.maximum_data_size=0 -LoRa.programmer.default=stlink LoRa.vid.0=0x0483 LoRa.pid.0=0x5740 @@ -12807,7 +12774,6 @@ Midatronics.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {buil Midatronics.build.flash_offset=0x0 Midatronics.upload.maximum_size=0 Midatronics.upload.maximum_data_size=0 -Midatronics.programmer.default=stlink Midatronics.vid.0=0x0483 Midatronics.pid.0=0x5740 @@ -12858,7 +12824,6 @@ SparkFun.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.x SparkFun.build.flash_offset=0x0 SparkFun.upload.maximum_size=0 SparkFun.upload.maximum_data_size=0 -SparkFun.programmer.default=stlink SparkFun.vid.0=0x0483 SparkFun.pid.0=0x5740 @@ -12922,7 +12887,6 @@ ELV_Modular_System.build.board=ELV_Modular_System ELV_Modular_System.build.variant_h=variant_{build.board}.h ELV_Modular_System.upload.maximum_size=0 ELV_Modular_System.upload.maximum_data_size=0 -ELV_Modular_System.programmer.default=stlink ELV_Modular_System.vid.0=0x0483 ELV_Modular_System.pid.0=0x5740 diff --git a/platform.txt b/platform.txt index 0f64fc17a1..ab8df0b2e0 100644 --- a/platform.txt +++ b/platform.txt @@ -245,5 +245,5 @@ debug.server=openocd debug.server.openocd.path={openocd_dir}/bin/openocd debug.server.openocd.scripts_dir={openocd_dir}/openocd/scripts # Common config -debug.server.openocd.scripts.0=interface/{programmer.protocol}.cfg -debug.server.openocd.scripts.1={programmer.transport_script} +debug.server.openocd.scripts.0=interface/stlink.cfg +debug.server.openocd.scripts.1={runtime.platform.path}/debugger/select_hla.cfg diff --git a/programmers.txt b/programmers.txt index 405cf37cdd..e69de29bb2 100644 --- a/programmers.txt +++ b/programmers.txt @@ -1,9 +0,0 @@ -stlink.name=STMicroelectronics ST-LINK -stlink.communication=USB -stlink.protocol= -stlink.program.protocol= -stlink.program.tool=openocd -stlink.program.tool.default=openocd -stlink.program.extra_params= -stlink.programmer.protocol=stlink -stlink.programmer.transport_script={runtime.platform.path}/debugger/select_hla.cfg