DM: updates for rev B

Author: deanm1278

boards.txt

@@ -162,7 +162,7 @@ adafruit_metro_m4.vid.1=0x239A
 adafruit_metro_m4.pid.1=0x0020
 adafruit_metro_m4.upload.tool=bossac
 adafruit_metro_m4.upload.protocol=sam-ba
-adafruit_metro_m4.upload.maximum_size=1048576
+adafruit_metro_m4.upload.maximum_size=507904
 adafruit_metro_m4.upload.use_1200bps_touch=true
 adafruit_metro_m4.upload.wait_for_upload_port=true
 adafruit_metro_m4.upload.native_usb=true
@@ -172,15 +172,15 @@ adafruit_metro_m4.build.usb_product="Adafruit Metro M4"
 adafruit_metro_m4.build.usb_manufacturer="Adafruit LLC"
 adafruit_metro_m4.build.board=METRO_M4
 adafruit_metro_m4.build.core=arduino
-adafruit_metro_m4.build.extra_flags=-D__SAMD51J20A__ -D__SAMD51__ {build.usb_flags}
+adafruit_metro_m4.build.extra_flags=-D__SAMD51J19A__ -D__SAMD51__ {build.usb_flags}
 adafruit_metro_m4.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
 adafruit_metro_m4.build.openocdscript=openocd_scripts/arduino_zero.cfg
 adafruit_metro_m4.build.variant=metro_m4
 adafruit_metro_m4.build.variant_system_lib=
 adafruit_metro_m4.build.vid=0x239A
 adafruit_metro_m4.build.pid=0x8020
 adafruit_metro_m4.bootloader.tool=openocd
-adafruit_metro_m4.bootloader.file=metroM4/samd51_sam_ba.bin
+adafruit_metro_m4.bootloader.file=metroM4/METRO_M4_sam_ba.bin
 adafruit_metro_m4.compiler.c.elf.extra_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
 adafruit_metro_m4.compiler.c.extra_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
 adafruit_metro_m4.compiler.cpp.extra_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
@@ -194,7 +194,7 @@ adafruit_feather_m4.vid.1=0x239A
 adafruit_feather_m4.pid.1=0x0022
 adafruit_feather_m4.upload.tool=bossac
 adafruit_feather_m4.upload.protocol=sam-ba
-adafruit_feather_m4.upload.maximum_size=524288
+adafruit_feather_m4.upload.maximum_size=507904
 adafruit_feather_m4.upload.use_1200bps_touch=true
 adafruit_feather_m4.upload.wait_for_upload_port=true
 adafruit_feather_m4.upload.native_usb=true
@@ -212,7 +212,7 @@ adafruit_feather_m4.build.variant_system_lib=
 adafruit_feather_m4.build.vid=0x239A
 adafruit_feather_m4.build.pid=0x8022
 adafruit_feather_m4.bootloader.tool=openocd
-adafruit_feather_m4.bootloader.file=metroM4/samd51_sam_ba.bin
+adafruit_feather_m4.bootloader.file=metroM4/FEATHER_M4_sam_ba.bin
 adafruit_feather_m4.compiler.c.elf.extra_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
 adafruit_feather_m4.compiler.c.extra_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
 adafruit_feather_m4.compiler.cpp.extra_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16

bootloaders/metroM4/.vs/samdx1_sam_ba/v14/.atsuo

@@ -55,11 +55,6 @@ OBJCOPY=$(ARM_GCC_PATH)objcopy
 NM=$(ARM_GCC_PATH)nm
 SIZE=$(ARM_GCC_PATH)size
 
-# -----------------------------------------------------------------------------
-# Boards definitions
-BOARD_ID?=FEATHER_M4
-BOARD_CHIP?=__SAMD51G19A__
-
 # -----------------------------------------------------------------------------
 # Compiler options
 CFLAGS_EXTRA=-D$(BOARD_CHIP) -DBOARD_ID_$(BOARD_ID)
@@ -71,7 +66,7 @@ else
 endif
 
 ELF=$(BOARD_ID)_sam_ba.elf
-BIN=$(BOARD_ID)_ba.bin
+BIN=$(BOARD_ID)_sam_ba.bin
 HEX=$(BOARD_ID)_sam_ba.hex
 
 

bootloaders/metroM4/Makefile

@@ -35,7 +35,7 @@
  * BOOT_DOUBLE_TAP_ADDRESS must point to a free SRAM cell that must not
  * be touched from the loaded application.
  */
-#define BOOT_DOUBLE_TAP_ADDRESS           (0x20007FFCul)
+#define BOOT_DOUBLE_TAP_ADDRESS           (0x2002FFFCul)
 #define BOOT_DOUBLE_TAP_DATA              (*((volatile uint32_t *) BOOT_DOUBLE_TAP_ADDRESS))
 
 /*

bootloaders/metroM4/board_definitions_feather_m4.h

@@ -28,13 +28,14 @@
 #define USB_PID_HIGH   0x00
 #define USB_PID_LOW    0x20
 
+
 /*
  * If BOOT_DOUBLE_TAP_ADDRESS is defined the bootloader is started by
  * quickly tapping two times on the reset button.
  * BOOT_DOUBLE_TAP_ADDRESS must point to a free SRAM cell that must not
  * be touched from the loaded application.
  */
-#define BOOT_DOUBLE_TAP_ADDRESS           (0x20007FFCul)
+#define BOOT_DOUBLE_TAP_ADDRESS           (0x2002FFFCul)
 #define BOOT_DOUBLE_TAP_DATA              (*((volatile uint32_t *) BOOT_DOUBLE_TAP_ADDRESS))
 
 /*

bootloaders/metroM4/board_definitions_metro_m4.h

@@ -28,7 +28,7 @@
 MEMORY
 {
   FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x4000 /* First 16KB used by bootloader */
-  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00040000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00030000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
 }
 
 /* Linker script to place sections and symbol values. Should be used together

bootloaders/metroM4/bootloader_METRO_M4.ld

@@ -5,7 +5,7 @@
     <ProjectVersion>7.0</ProjectVersion>
     <ToolchainName>com.Atmel.ARMGCC.C</ToolchainName>
     <ProjectGuid>dce6c7e3-ee26-4d79-826b-08594b9ad897</ProjectGuid>
-    <avrdevice>ATSAMD51G19A</avrdevice>
+    <avrdevice>ATSAMD51J19A</avrdevice>
     <avrdeviceseries>none</avrdeviceseries>
     <OutputType>Executable</OutputType>
     <Language>C</Language>
@@ -41,7 +41,7 @@
     </AsfFrameworkConfig>
     <avrtool>com.atmel.avrdbg.tool.edbg</avrtool>
     <avrtoolserialnumber>00000000EZE000006352</avrtoolserialnumber>
-    <avrdeviceexpectedsignature>0x60060007</avrdeviceexpectedsignature>
+    <avrdeviceexpectedsignature>0x60060005</avrdeviceexpectedsignature>
     <avrtoolinterface>SWD</avrtoolinterface>
     <com_atmel_avrdbg_tool_atmelice>
       <ToolOptions>
@@ -130,7 +130,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'featherm4' ">
     <ToolchainSettings>
-      <ArmGcc xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <ArmGcc>
   <armgcc.common.outputfiles.hex>True</armgcc.common.outputfiles.hex>
   <armgcc.common.outputfiles.lss>True</armgcc.common.outputfiles.lss>
   <armgcc.common.outputfiles.eep>True</armgcc.common.outputfiles.eep>
@@ -159,13 +159,13 @@
     <UsesExternalMakeFile>True</UsesExternalMakeFile>
     <OutputDirectory />
     <BuildTarget>DEBUG=1 all BOARD_ID=FEATHER_M4 BOARD_CHIP=__SAMD51G19A__</BuildTarget>
-    <CleanTarget>clean</CleanTarget>
+    <CleanTarget>clean BOARD_ID=FEATHER_M4</CleanTarget>
     <ExternalMakeFilePath>Makefile</ExternalMakeFilePath>
     <OutputPath>bin\featherm4\</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'metrom4' ">
     <ToolchainSettings>
-      <ArmGcc xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <ArmGcc>
   <armgcc.common.outputfiles.hex>True</armgcc.common.outputfiles.hex>
   <armgcc.common.outputfiles.lss>True</armgcc.common.outputfiles.lss>
   <armgcc.common.outputfiles.eep>True</armgcc.common.outputfiles.eep>
@@ -193,8 +193,8 @@
     </ToolchainSettings>
     <UsesExternalMakeFile>True</UsesExternalMakeFile>
     <OutputDirectory />
-    <BuildTarget>DEBUG=1 all BOARD_ID=METRO_M4 BOARD_CHIP=__SAMD51J20A__</BuildTarget>
-    <CleanTarget>clean</CleanTarget>
+    <BuildTarget>DEBUG=1 all BOARD_ID=METRO_M4 BOARD_CHIP=__SAMD51J19A__</BuildTarget>
+    <CleanTarget>clean BOARD_ID=METRO_M4</CleanTarget>
     <ExternalMakeFilePath>Makefile</ExternalMakeFilePath>
     <OutputPath>bin\metrom4\</OutputPath>
   </PropertyGroup>