Mass rename old vidor2000

Author: facchinm

boards.txt

@@ -278,7 +278,7 @@ mkrwifi1010.build.pid=0x8054
 mkrwifi1010.bootloader.tool=openocd
 mkrwifi1010.bootloader.file=mkrwifi1010/samd21_sam_ba_arduino_mkrwifi1010.bin
 
-# Arduino MKR WiFi 1400
+# Arduino MKR Vidor 4000
 # --------------------
 mkrvidor.name=Arduino MKR Vidor 4000
 mkrvidor.vid.0=0x2341
@@ -288,13 +288,13 @@ mkrvidor.pid.1=0x0056
 
 mkrvidor.upload.tool=bossacI
 mkrvidor.upload.protocol=sam-ba
-mkrvidor.upload.maximum_size=1048576
+mkrvidor.upload.maximum_size=262144
 mkrvidor.upload.use_1200bps_touch=true
 mkrvidor.upload.wait_for_upload_port=true
 mkrvidor.upload.native_usb=true
 mkrvidor.build.mcu=cortex-m0plus
 mkrvidor.build.f_cpu=48000000L
-mkrvidor.build.usb_product="Arduino MKR Vidor 2000"
+mkrvidor.build.usb_product="Arduino MKR Vidor 4000"
 mkrvidor.build.usb_manufacturer="Arduino LLC"
 mkrvidor.build.board=SAMD_MKRVIDOR
 mkrvidor.build.core=arduino
@@ -305,7 +305,7 @@ mkrvidor.build.variant=mkrvidor
 mkrvidor.build.vid=0x2341
 mkrvidor.build.pid=0x8056
 mkrvidor.bootloader.tool=openocd
-mkrvidor.bootloader.file=mkrvidor2000/samd21_sam_ba_arduino_mkrvidor.bin
+mkrvidor.bootloader.file=mkrvidor4000/samd21_sam_ba_arduino_mkrvidor.bin
 
 # Adafruit Circuit Playground M0
 # ------------------------------

bootloaders/zero/Makefile

@@ -75,7 +75,7 @@ BIN=$(NAME).bin
 HEX=$(NAME).hex
 
 
-INCLUDES=-I"$(MODULE_PATH)/tools/CMSIS/4.5.0/CMSIS/Include/" -I"$(MODULE_PATH)/tools/CMSIS-Atmel/1.1.0/CMSIS/Device/ATMEL/"
+INCLUDES=-I"$(MODULE_PATH)/tools/CMSIS/4.5.0/CMSIS/Include/" -I"$(MODULE_PATH)/tools/CMSIS-Atmel/1.2.0/CMSIS/Device/ATMEL/"
 
 # -----------------------------------------------------------------------------
 # Linker options

bootloaders/zero/board_definitions.h

@@ -35,8 +35,8 @@
   #include "board_definitions_arduino_mkrwan1300.h"
 #elif defined(BOARD_ID_arduino_mkrwifi1010)
   #include "board_definitions_arduino_mkrwifi1010.h"
-#elif defined(BOARD_ID_arduino_mkrvidor2000)
-  #include "board_definitions_arduino_mkrvidor2000.h"
+#elif defined(BOARD_ID_arduino_mkrvidor4000)
+  #include "board_definitions_arduino_mkrvidor4000.h"
 #else
   #error You must define a BOARD_ID and add the corresponding definitions in board_definitions.h
 #endif

bootloaders/zero/board_definitions_arduino_mkrvidor2000.h renamed to bootloaders/zero/board_definitions_arduino_mkrvidor4000.h

@@ -22,7 +22,7 @@
 /*
  * USB device definitions
  */
-#define STRING_PRODUCT "Arduino MKR Vidor 2000"
+#define STRING_PRODUCT "Arduino MKR Vidor 4000"
 #define USB_VID_HIGH   0x23
 #define USB_VID_LOW    0x41
 #define USB_PID_HIGH   0x00
@@ -83,13 +83,15 @@
 #define TMS 14
 
 #define LAST_FLASH_PAGE   (0x200000 - 0x1000)
+#define SCRATCHPAD_FLASH_PAGE   (0x200000 - 0x2000)
 //#define LAST_FLASH_PAGE   (0x100000 - 0x1000)
 
-typedef struct {
+typedef struct __attribute__((packed)) {
   uint32_t offset;
   uint32_t length;
   uint32_t sha256sum[8];
   uint32_t type;
+  uint32_t force;
 } externalFlashSignatures;
 
 #define  SAM_BA_INTERFACE  SAM_BA_USBCDC_ONLY

bootloaders/zero/build_all_bootloaders.sh

@@ -25,8 +25,8 @@ mv -v samd21_sam_ba_arduino_mkrwan1300.* ../mkrwan1300/
 BOARD_ID=arduino_mkrwifi1010 NAME=samd21_sam_ba_arduino_mkrwifi1010 make clean all
 mv -v samd21_sam_ba_arduino_mkrwifi1010.* ../mkrwifi1010/
 
-BOARD_ID=arduino_mkrvidor2000 NAME=samd21_sam_ba_arduino_mkrvidor make clean all
-mv -v samd21_sam_ba_arduino_mkrvidor.* ../mkrvidor2000/
+BOARD_ID=arduino_mkrvidor4000 NAME=samd21_sam_ba_arduino_mkrvidor make clean all
+mv -v samd21_sam_ba_arduino_mkrvidor.* ../mkrvidor4000/
 
 echo Done building bootloaders!
 

platform.txt

@@ -171,23 +171,23 @@ tools.openocd.cmd.windows=bin/openocd.exe
 
 tools.openocd.upload.params.verbose=-d2
 tools.openocd.upload.params.quiet=-d0
-tools.openocd.upload.pattern="{path}/{cmd}" {upload.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; program {{{build.path}/{build.project_name}.bin}} verify reset 0x2000; shutdown"
+tools.openocd.upload.pattern="{path}/{cmd}" {upload.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; program {build.path}/{build.project_name}.bin verify reset 0x2000; shutdown"
 
 tools.openocd.network_cmd={runtime.tools.arduinoOTA.path}/bin/arduinoOTA
 tools.openocd.upload.network_pattern={network_cmd} -address {serial.port} -port 65280 -username arduino -password "{network.password}" -sketch "{build.path}/{build.project_name}.bin" -upload /sketch -b
 
 # Program flashes the binary at 0x0000, so use the linker script without_bootloader
 tools.openocd.program.params.verbose=-d2
 tools.openocd.program.params.quiet=-d0
-tools.openocd.program.pattern="{path}/{cmd}" {program.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; program {{{build.path}/{build.project_name}.elf}} verify reset; shutdown"
+tools.openocd.program.pattern="{path}/{cmd}" {program.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; program {build.path}/{build.project_name}.elf verify reset; shutdown"
 
 tools.openocd.erase.params.verbose=-d3
 tools.openocd.erase.params.quiet=-d0
 tools.openocd.erase.pattern=
 
 tools.openocd.bootloader.params.verbose=-d2
 tools.openocd.bootloader.params.quiet=-d0
-tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; init; halt; at91samd bootloader 0; program {{{runtime.platform.path}/bootloaders/{bootloader.file}}} verify reset; shutdown"
+tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; init; halt; at91samd bootloader 0; program {runtime.platform.path}/bootloaders/{bootloader.file} verify reset; shutdown"
 
 #
 # OpenOCD sketch upload - version with configurable bootloader size
@@ -200,17 +200,17 @@ tools.openocd-withbootsize.cmd.windows=bin/openocd.exe
 
 tools.openocd-withbootsize.upload.params.verbose=-d2
 tools.openocd-withbootsize.upload.params.quiet=-d0
-tools.openocd-withbootsize.upload.pattern="{path}/{cmd}" {upload.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; program {{{build.path}/{build.project_name}.bin}} verify reset {bootloader.size}; shutdown"
+tools.openocd-withbootsize.upload.pattern="{path}/{cmd}" {upload.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; program {{build.path}/{build.project_name}.bin} verify reset {bootloader.size}; shutdown"
 
 # Program flashes the binary at 0x0000, so use the linker script without_bootloader
 tools.openocd-withbootsize.program.params.verbose=-d2
 tools.openocd-withbootsize.program.params.quiet=-d0
-tools.openocd-withbootsize.program.pattern="{path}/{cmd}" {program.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; program {{{build.path}/{build.project_name}.elf}} verify reset; shutdown"
+tools.openocd-withbootsize.program.pattern="{path}/{cmd}" {program.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; program {build.path}/{build.project_name}.elf verify reset; shutdown"
 
 tools.openocd-withbootsize.erase.params.verbose=-d3
 tools.openocd-withbootsize.erase.params.quiet=-d0
 tools.openocd-withbootsize.erase.pattern=
 
 tools.openocd-withbootsize.bootloader.params.verbose=-d2
 tools.openocd-withbootsize.bootloader.params.quiet=-d0
-tools.openocd-withbootsize.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; init; halt; at91samd bootloader 0; program {{{runtime.platform.path}/bootloaders/{bootloader.file}}} verify reset; shutdown"
+tools.openocd-withbootsize.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; init; halt; at91samd bootloader 0; program {runtime.platform.path}/bootloaders/{bootloader.file} verify reset; shutdown"