From ea10347f7e1dd9195a7dfc73b5deea77cf242ccc Mon Sep 17 00:00:00 2001
From: penguin <ad0097@uah.edu>
Date: Wed, 21 Oct 2020 18:33:02 -0500
Subject: [PATCH] e54p20a successfully generated and compiled!

---
 arch/arm/SAME54/SAME54A/manifest/same54a.toml |  8 +++
 manifest/make-manifest.toml                   | 10 ++--
 manifest/target-manifest.toml                 | 52 +++++++++----------
 3 files changed, 41 insertions(+), 29 deletions(-)
 create mode 100644 arch/arm/SAME54/SAME54A/manifest/same54a.toml

diff --git a/arch/arm/SAME54/SAME54A/manifest/same54a.toml b/arch/arm/SAME54/SAME54A/manifest/same54a.toml
new file mode 100644
index 00000000..0330d924
--- /dev/null
+++ b/arch/arm/SAME54/SAME54A/manifest/same54a.toml
@@ -0,0 +1,8 @@
+[esf.links]
+common = "arch/arm/common"
+mcu = "arch/arm/SAME54/SAME54A/mcu/"
+ld = "arch/arm/SAME54/SAME54A/ld/"
+cfg = "arch/arm/SAME54/SAME54A/manifest/"
+
+[esf.includes]
+IGLOO_INCLUDES = ["sam.h"]
diff --git a/manifest/make-manifest.toml b/manifest/make-manifest.toml
index f2146041..b22c3c05 100644
--- a/manifest/make-manifest.toml
+++ b/manifest/make-manifest.toml
@@ -124,13 +124,17 @@ MCU = "__SAMD21J18A__"
 LD_SCRIPT = "$(LD_PATH)/samd21j18a_flash.ld"
 
 
-[arch.arm.same54]
+[arch.arm.same54a]
 MCPU = "cortex-m4"
 FPU = "fpv4-sp-d16"
 FLOAT_ABI = "softfp"
-[arch.arm.same54.same54p20a]
+[arch.arm.same54a.same54p20a]
 MCU = "__SAME54P20A__"
-
+LD_SCRIPT = "$(LD_PATH)/same54p20a_flash.ld"
+OBJS = ["ESF/mcu/src/startup_same54p20a.o",
+     "ESF/mcu/src/system_same54p20a.o"]
+OBJS_AS_ARGS = ["$(QUOTE)ESF/mcu/src/startup_same54p20a.o$(QUOTE)",
+             "$(QUOTE)ESF/mcu/src/system_same54p20a.o$(QUOTE)"]
 [arch.avr]
 CC = "arm-none-eabi-gcc"
 CXX = "arm-none-eabi-g++"
diff --git a/manifest/target-manifest.toml b/manifest/target-manifest.toml
index 2ff67c54..b7e4d6ea 100644
--- a/manifest/target-manifest.toml
+++ b/manifest/target-manifest.toml
@@ -17,21 +17,21 @@ samd21j17a = "arch.arm.samd21a.samd21j17a"
 samd21j18a = "arch.arm.samd21a.samd21j18a"
 # same54 family
 # same54n/p series
-same54n19a = "arch.arm.same54.same54a.same54n19a"
-same54n20a = "arch.arm.same54.same54a.same54n20a"
-same54p19a = "arch.arm.same54.same54a.same54p19a"
-same54p20a = "arch.arm.same54.same54a.same54p20a"
+same54n19a = "arch.arm.same54a.same54n19a"
+same54n20a = "arch.arm.same54a.same54n20a"
+same54p19a = "arch.arm.same54a.same54p19a"
+same54p20a = "arch.arm.same54a.same54p20a"
 # same70 family
 # same70a series
-same70j19a = "arch.arm.same70.same70a.same70j19a"
-same70j20a = "arch.arm.same70.same70a.same70j20a"
-same70j21a = "arch.arm.same70.same70a.same70j21a"
-same70n19a = "arch.arm.same70.same70a.same70n19a"
-same70n20a = "arch.arm.same70.same70a.same70n20a"
-same70n21a = "arch.arm.same70.same70a.same70n21a"
-same70q19a = "arch.arm.same70.same70a.same70q19a"
-same70q20a = "arch.arm.same70.same70a.same70q20a"
-same70q21a = "arch.arm.same70.same70a.same70q21a"
+same70j19a = "arch.arm.same70a.same70j19a"
+same70j20a = "arch.arm.same70a.same70j20a"
+same70j21a = "arch.arm.same70a.same70j21a"
+same70n19a = "arch.arm.same70a.same70n19a"
+same70n20a = "arch.arm.same70a.same70n20a"
+same70n21a = "arch.arm.same70a.same70n21a"
+same70q19a = "arch.arm.same70a.same70q19a"
+same70q20a = "arch.arm.same70a.same70q20a"
+same70q21a = "arch.arm.same70a.same70q21a"
 
 # target.cfg contains the file locations for all config manifests for all mcus
 # target.cfg contains things like symlinks
@@ -54,18 +54,18 @@ samd21j17a = "arch/arm/SAMD21/SAMD21A/manifest/samd21a.toml"
 samd21j18a = "arch/arm/SAMD21/SAMD21A/manifest/samd21a.toml"
 # same54 family
 # same54a series
-same54n19a = "arch/arm/SAME54/SAMD54A/manifest/same54n19a.toml"
-same54n20a = "arch/arm/SAME54/SAMD54A/manifest/same54n20a.toml"
-same54p19a = "arch/arm/SAME54/SAMD54A/manifest/same54p19a.toml"
-same54p20a = "arch/arm/SAME54/SAMD54A/manifest/same54p20a.toml"
+same54n19a = "arch/arm/SAME54/SAME54A/manifest/same54a.toml"
+same54n20a = "arch/arm/SAME54/SAME54A/manifest/same54a.toml"
+same54p19a = "arch/arm/SAME54/SAME54A/manifest/same54a.toml"
+same54p20a = "arch/arm/SAME54/SAME54A/manifest/same54a.toml"
 # same70 family
 # same70a series
-same70j19 = "arch/arm/SAME70/SAMD70A/manifest/same70j19a.toml"
-same70j20 = "arch/arm/SAME70/SAMD70A/manifest/same70j20a.toml"
-same70j21 = "arch/arm/SAME70/SAMD70A/manifest/same70j21a.toml"
-same70n19 = "arch/arm/SAME70/SAMD70A/manifest/same70n19a.toml"
-same70n20 = "arch/arm/SAME70/SAMD70A/manifest/same70n19a.toml"
-same70n21 = "arch/arm/SAME70/SAMD70A/manifest/same70n20a.toml"
-same70q19 = "arch/arm/SAME70/SAMD70A/manifest/same70q21a.toml"
-same70q20 = "arch/arm/SAME70/SAMD70A/manifest/same70q20a.toml"
-same70q21 = "arch/arm/SAME70/SAMD70A/manifest/same70q21a.toml"
+same70j19 = "arch/arm/SAME70/SAME70A/manifest/same70j19a.toml"
+same70j20 = "arch/arm/SAME70/SAME70A/manifest/same70j20a.toml"
+same70j21 = "arch/arm/SAME70/SAME70A/manifest/same70j21a.toml"
+same70n19 = "arch/arm/SAME70/SAME70A/manifest/same70n19a.toml"
+same70n20 = "arch/arm/SAME70/SAME70A/manifest/same70n19a.toml"
+same70n21 = "arch/arm/SAME70/SAME70A/manifest/same70n20a.toml"
+same70q19 = "arch/arm/SAME70/SAME70A/manifest/same70q21a.toml"
+same70q20 = "arch/arm/SAME70/SAME70A/manifest/same70q20a.toml"
+same70q21 = "arch/arm/SAME70/SAME70A/manifest/same70q21a.toml"