From a3a3c9d90bb3062fd1d43c50b9936085ebe0df9d Mon Sep 17 00:00:00 2001 From: rogerclarkmelbourne Date: Fri, 5 Jun 2015 16:42:25 +1000 Subject: [PATCH] Changed boards.txt so that Maple DFU upload is now called STM32duino bootloader --- STM32F1/boards.txt | 85 +++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 43 deletions(-) diff --git a/STM32F1/boards.txt b/STM32F1/boards.txt index 77cd480..59e476e 100644 --- a/STM32F1/boards.txt +++ b/STM32F1/boards.txt @@ -146,7 +146,7 @@ nucleo_f103rb.build.vect=VECT_TAB_ADDR=0x8000000 ###################### Generic STM32F103C ######################################## -genericSTM32F103C.name= Generic STM32F103C series +genericSTM32F103C.name=Generic STM32F103C series genericSTM32F103C.build.variant=generic_stm32f103c genericSTM32F103C.build.vect=VECT_TAB_ADDR=0x8000000 genericSTM32F103C.build.core=maple @@ -173,6 +173,16 @@ genericSTM32F103C.menu.device_variant.STM32F103C8.upload.ram.maximum_size=20480 genericSTM32F103C.menu.device_variant.STM32F103C8.upload.flash.maximum_size=65536 #---------------------------- UPLOAD METHODS --------------------------- + +genericSTM32F103C.menu.upload_method.DFUUploadMethod=STM32duino bootloader +genericSTM32F103C.menu.upload_method.DFUUploadMethod.upload.protocol=maple_dfu +genericSTM32F103C.menu.upload_method.DFUUploadMethod.upload.tool=maple_upload +genericSTM32F103C.menu.upload_method.DFUUploadMethod.build.upload_flags=-DSERIAL_USB -DGENERIC_BOOTLOADER +genericSTM32F103C.menu.upload_method.DFUUploadMethod.build.vect=VECT_TAB_ADDR=0x8002000 +genericSTM32F103C.menu.upload_method.DFUUploadMethod.build.ldscript=ld/bootloader_20.ld +genericSTM32F103C.menu.upload_method.DFUUploadMethod.upload.usbID=1EAF:0003 +genericSTM32F103C.menu.upload_method.DFUUploadMethod.upload.altID=2 + genericSTM32F103C.menu.upload_method.serialMethod=Serial genericSTM32F103C.menu.upload_method.serialMethod.upload.protocol=maple_serial genericSTM32F103C.menu.upload_method.serialMethod.upload.tool=serial_upload @@ -189,20 +199,10 @@ genericSTM32F103C.menu.upload_method.BMPMethod.upload.protocol=gdb_bmp genericSTM32F103C.menu.upload_method.BMPMethod.upload.tool=bmp_upload genericSTM32F103C.menu.upload_method.BMPMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG -genericSTM32F103C.menu.upload_method.DFUUploadMethod=Maple DFU -genericSTM32F103C.menu.upload_method.DFUUploadMethod.upload.protocol=maple_dfu -genericSTM32F103C.menu.upload_method.DFUUploadMethod.upload.tool=maple_upload -genericSTM32F103C.menu.upload_method.DFUUploadMethod.build.upload_flags=-DSERIAL_USB -DGENERIC_BOOTLOADER -genericSTM32F103C.menu.upload_method.DFUUploadMethod.build.vect=VECT_TAB_ADDR=0x8002000 -genericSTM32F103C.menu.upload_method.DFUUploadMethod.build.ldscript=ld/bootloader_20.ld -genericSTM32F103C.menu.upload_method.DFUUploadMethod.upload.usbID=1EAF:0003 -genericSTM32F103C.menu.upload_method.DFUUploadMethod.upload.altID=2 - - ########################### Generic STM32F103R ########################### -genericSTM32F103R.name= Generic STM32F103R series +genericSTM32F103R.name=Generic STM32F103R series genericSTM32F103R.build.variant=generic_stm32f103r genericSTM32F103R.build.vect=VECT_TAB_ADDR=0x8000000 genericSTM32F103R.build.core=maple @@ -235,6 +235,16 @@ genericSTM32F103R.menu.device_variant.STM32F103RE.build.ldscript=ld/stm32f103re. #---------------------------- UPLOAD METHODS --------------------------- + +genericSTM32F103R.menu.upload_method.DFUUploadMethod=STM32duino bootloader +genericSTM32F103R.menu.upload_method.DFUUploadMethod.upload.protocol=maple_dfu +genericSTM32F103R.menu.upload_method.DFUUploadMethod.upload.tool=maple_upload +genericSTM32F103R.menu.upload_method.DFUUploadMethod.build.upload_flags=-DSERIAL_USB -DGENERIC_BOOTLOADER +genericSTM32F103R.menu.upload_method.DFUUploadMethod.build.vect=VECT_TAB_ADDR=0x8002000 +genericSTM32F103R.menu.upload_method.DFUUploadMethod.build.ldscript=ld/stm32f103re-bootloader.ld +genericSTM32F103R.menu.upload_method.DFUUploadMethod.upload.usbID=1EAF:0003 +genericSTM32F103R.menu.upload_method.DFUUploadMethod.upload.altID=2 + genericSTM32F103R.menu.upload_method.serialMethod=Serial genericSTM32F103R.menu.upload_method.serialMethod.upload.protocol=maple_serial genericSTM32F103R.menu.upload_method.serialMethod.upload.tool=serial_upload @@ -250,19 +260,9 @@ genericSTM32F103R.menu.upload_method.BMPMethod.upload.protocol=gdb_bmp genericSTM32F103R.menu.upload_method.BMPMethod.upload.tool=bmp_upload genericSTM32F103R.menu.upload_method.BMPMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG -genericSTM32F103R.menu.upload_method.DFUUploadMethod=Maple DFU -genericSTM32F103R.menu.upload_method.DFUUploadMethod.upload.protocol=maple_dfu -genericSTM32F103R.menu.upload_method.DFUUploadMethod.upload.tool=maple_upload -genericSTM32F103R.menu.upload_method.DFUUploadMethod.build.upload_flags=-DSERIAL_USB -DGENERIC_BOOTLOADER -genericSTM32F103R.menu.upload_method.DFUUploadMethod.build.vect=VECT_TAB_ADDR=0x8002000 -genericSTM32F103R.menu.upload_method.DFUUploadMethod.build.ldscript=ld/stm32f103re-bootloader.ld -genericSTM32F103R.menu.upload_method.DFUUploadMethod.upload.usbID=1EAF:0003 -genericSTM32F103R.menu.upload_method.DFUUploadMethod.upload.altID=2 - ########################### Generic STM32F103V ########################### - genericSTM32F103V.name=Generic STM32F103V series genericSTM32F103V.build.variant=generic_stm32f103v genericSTM32F103V.build.vect=VECT_TAB_ADDR=0x8000000 @@ -300,11 +300,20 @@ genericSTM32F103V.menu.device_variant.STM32F103VE.upload.flash.maximum_size=5242 genericSTM32F103V.menu.device_variant.STM32F103VE.build.ldscript=ld/stm32f103ve.ld #---------------------------- UPLOAD METHODS --------------------------- + +genericSTM32F103V.menu.upload_method.DFUUploadMethod=STM32duino bootloader +genericSTM32F103V.menu.upload_method.DFUUploadMethod.upload.protocol=maple_dfu +genericSTM32F103V.menu.upload_method.DFUUploadMethod.upload.tool=maple_upload +genericSTM32F103V.menu.upload_method.DFUUploadMethod.build.upload_flags=-DSERIAL_USB -DGENERIC_BOOTLOADER +genericSTM32F103V.menu.upload_method.DFUUploadMethod.build.vect=VECT_TAB_ADDR=0x8002000 +genericSTM32F103V.menu.upload_method.DFUUploadMethod.build.ldscript=ld/stm32f103veDFU.ld +genericSTM32F103V.menu.upload_method.DFUUploadMethod.upload.usbID=1EAF:0003 +genericSTM32F103V.menu.upload_method.DFUUploadMethod.upload.altID=2 + genericSTM32F103V.menu.upload_method.serialMethod=Serial genericSTM32F103V.menu.upload_method.serialMethod.upload.protocol=maple_serial genericSTM32F103V.menu.upload_method.serialMethod.upload.tool=serial_upload - genericSTM32F103V.menu.upload_method.STLinkMethod=STLink genericSTM32F103V.menu.upload_method.STLinkMethod.upload.protocol=STLink genericSTM32F103V.menu.upload_method.STLinkMethod.upload.tool=stlink_upload @@ -315,20 +324,9 @@ genericSTM32F103V.menu.upload_method.BMPMethod.upload.protocol=gdb_bmp genericSTM32F103V.menu.upload_method.BMPMethod.upload.tool=bmp_upload genericSTM32F103V.menu.upload_method.BMPMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG -genericSTM32F103V.menu.upload_method.DFUUploadMethod=Maple DFU -genericSTM32F103V.menu.upload_method.DFUUploadMethod.upload.protocol=maple_dfu -genericSTM32F103V.menu.upload_method.DFUUploadMethod.upload.tool=maple_upload -genericSTM32F103V.menu.upload_method.DFUUploadMethod.build.upload_flags=-DSERIAL_USB -DGENERIC_BOOTLOADER -genericSTM32F103V.menu.upload_method.DFUUploadMethod.build.vect=VECT_TAB_ADDR=0x8002000 -genericSTM32F103V.menu.upload_method.DFUUploadMethod.build.ldscript=ld/stm32f103veDFU.ld -genericSTM32F103V.menu.upload_method.DFUUploadMethod.upload.usbID=1EAF:0003 -genericSTM32F103V.menu.upload_method.DFUUploadMethod.upload.altID=2 - - ########################### Generic STM32F103Z ########################### - genericSTM32F103Z.name=Generic STM32F103Z series genericSTM32F103Z.build.variant=generic_stm32f103z genericSTM32F103Z.build.vect=VECT_TAB_ADDR=0x8000000 @@ -360,6 +358,16 @@ genericSTM32F103Z.menu.device_variant.STM32F103ZE.upload.flash.maximum_size=5242 genericSTM32F103Z.menu.device_variant.STM32F103ZE.build.ldscript=ld/stm32f103ze.ld #---------------------------- UPLOAD METHODS --------------------------- + +genericSTM32F103Z.menu.upload_method.DFUUploadMethod=STM32duino bootloader +genericSTM32F103Z.menu.upload_method.DFUUploadMethod.upload.protocol=maple_dfu +genericSTM32F103Z.menu.upload_method.DFUUploadMethod.upload.tool=maple_upload +genericSTM32F103Z.menu.upload_method.DFUUploadMethod.build.upload_flags=-DSERIAL_USB -DGENERIC_BOOTLOADER +genericSTM32F103Z.menu.upload_method.DFUUploadMethod.build.vect=VECT_TAB_ADDR=0x8002000 +genericSTM32F103Z.menu.upload_method.DFUUploadMethod.build.ldscript=ld/stm32f103z_dfu.ld +genericSTM32F103Z.menu.upload_method.DFUUploadMethod.upload.usbID=1EAF:0003 +genericSTM32F103Z.menu.upload_method.DFUUploadMethod.upload.altID=2 + genericSTM32F103Z.menu.upload_method.serialMethod=Serial genericSTM32F103Z.menu.upload_method.serialMethod.upload.protocol=maple_serial genericSTM32F103Z.menu.upload_method.serialMethod.upload.tool=serial_upload @@ -373,12 +381,3 @@ genericSTM32F103Z.menu.upload_method.BMPMethod=BMP (Black Magic Probe) genericSTM32F103Z.menu.upload_method.BMPMethod.upload.protocol=gdb_bmp genericSTM32F103Z.menu.upload_method.BMPMethod.upload.tool=bmp_upload genericSTM32F103Z.menu.upload_method.BMPMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG - -genericSTM32F103Z.menu.upload_method.DFUUploadMethod=Maple DFU -genericSTM32F103Z.menu.upload_method.DFUUploadMethod.upload.protocol=maple_dfu -genericSTM32F103Z.menu.upload_method.DFUUploadMethod.upload.tool=maple_upload -genericSTM32F103Z.menu.upload_method.DFUUploadMethod.build.upload_flags=-DSERIAL_USB -DGENERIC_BOOTLOADER -genericSTM32F103Z.menu.upload_method.DFUUploadMethod.build.vect=VECT_TAB_ADDR=0x8002000 -genericSTM32F103Z.menu.upload_method.DFUUploadMethod.build.ldscript=ld/stm32f103z_dfu.ld -genericSTM32F103Z.menu.upload_method.DFUUploadMethod.upload.usbID=1EAF:0003 -genericSTM32F103Z.menu.upload_method.DFUUploadMethod.upload.altID=2