From 626305b42657aeaeaaf586e8030fbb19b76b15f5 Mon Sep 17 00:00:00 2001
From: Peter Lawrence <majbthrd@gmail.com>
Date: Sun, 6 May 2018 13:57:39 -0500
Subject: [PATCH] example apps: use better Crossworks method for app placement

---
 example-apps/mouseplay/ATSAMD11D14AM_MemoryMap.xml | 5 -----
 example-apps/mouseplay/D11mouseplay.hzp            | 4 +---
 example-apps/vcp/ATSAMD11D14AM_MemoryMap.xml       | 5 -----
 example-apps/vcp/ataradov-vcp.hzp                  | 4 +---
 4 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 example-apps/mouseplay/ATSAMD11D14AM_MemoryMap.xml
 delete mode 100644 example-apps/vcp/ATSAMD11D14AM_MemoryMap.xml

diff --git a/example-apps/mouseplay/ATSAMD11D14AM_MemoryMap.xml b/example-apps/mouseplay/ATSAMD11D14AM_MemoryMap.xml
deleted file mode 100644
index 9249964..0000000
--- a/example-apps/mouseplay/ATSAMD11D14AM_MemoryMap.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE Board_Memory_Definition_File>
-<root name="ATSAMD11D14AM">
-  <MemorySegment name="FLASH" start="0x00000400" size="0x00003C00" access="ReadOnly" />
-  <MemorySegment name="RAM" start="0x20000000" size="0x00001000" access="Read/Write" />
-</root>
diff --git a/example-apps/mouseplay/D11mouseplay.hzp b/example-apps/mouseplay/D11mouseplay.hzp
index 61248fa..bdf3f9f 100644
--- a/example-apps/mouseplay/D11mouseplay.hzp
+++ b/example-apps/mouseplay/D11mouseplay.hzp
@@ -30,6 +30,7 @@
       linker_memory_map_file="$(DeviceMemoryMapFile)"
       linker_output_format="bin"
       linker_section_placement_file="$(StudioDir)/targets/Cortex_M/flash_placement.xml"
+      linker_section_placement_macros="FLASH_START=0x400"
       macros="DeviceLoaderFile=$(TargetsDir)/SAM_D/Loader/SAM_D11_Loader.elf;DeviceMemoryMapFile=$(TargetsDir)/SAM_D/XML/ATSAMD11D14AM_MemoryMap.xml;DeviceRegisterDefinitionFile=$(TargetsDir)/SAM_D/XML/ATSAMD11D14AM_Registers.xml;DeviceFamily=SAM D;DeviceSubFamily=SAM D11"
       package_dependencies="SAM_D"
       project_directory=""
@@ -52,9 +53,6 @@
       <file file_name="usb_std.c" />
       <file file_name="usb_hid.c" />
     </folder>
-    <folder Name="System Files">
-      <file file_name="ATSAMD11D14AM_MemoryMap.xml" />
-    </folder>
   </project>
   <configuration Name="THUMB Debug" inherited_configurations="THUMB;Debug" />
   <configuration
diff --git a/example-apps/vcp/ATSAMD11D14AM_MemoryMap.xml b/example-apps/vcp/ATSAMD11D14AM_MemoryMap.xml
deleted file mode 100644
index 9249964..0000000
--- a/example-apps/vcp/ATSAMD11D14AM_MemoryMap.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE Board_Memory_Definition_File>
-<root name="ATSAMD11D14AM">
-  <MemorySegment name="FLASH" start="0x00000400" size="0x00003C00" access="ReadOnly" />
-  <MemorySegment name="RAM" start="0x20000000" size="0x00001000" access="Read/Write" />
-</root>
diff --git a/example-apps/vcp/ataradov-vcp.hzp b/example-apps/vcp/ataradov-vcp.hzp
index 02d4052..bc22a4d 100644
--- a/example-apps/vcp/ataradov-vcp.hzp
+++ b/example-apps/vcp/ataradov-vcp.hzp
@@ -29,6 +29,7 @@
       linker_memory_map_file="$(DeviceMemoryMapFile)"
       linker_output_format="bin"
       linker_section_placement_file="$(StudioDir)/targets/Cortex_M/flash_placement.xml"
+      linker_section_placement_macros="FLASH_START=0x400"
       macros="DeviceLoaderFile=$(TargetsDir)/SAM_D/Loader/SAM_D11_Loader.elf;DeviceMemoryMapFile=$(TargetsDir)/SAM_D/XML/ATSAMD11D14AM_MemoryMap.xml;DeviceRegisterDefinitionFile=$(TargetsDir)/SAM_D/XML/ATSAMD11D14AM_Registers.xml;DeviceFamily=SAM D;DeviceSubFamily=SAM D11"
       package_dependencies="SAM_D"
       project_directory=""
@@ -52,9 +53,6 @@
       <file file_name="usb_descriptors.c" />
       <file file_name="usb_std.c" />
     </folder>
-    <folder Name="System Files">
-      <file file_name="ATSAMD11D14AM_MemoryMap.xml" />
-    </folder>
   </project>
   <configuration Name="THUMB Debug" inherited_configurations="THUMB;Debug" />
   <configuration