From a6039dd5829d8822259ee8a56128b861d6deec89 Mon Sep 17 00:00:00 2001
From: Penguin <penguin@epenguin.net>
Date: Thu, 30 Dec 2021 20:55:09 -0600
Subject: [PATCH] updating things to work with igloo 0.1.1

---
 arch/arm/SAMD21/SAMD21A/manifest/samd21a.toml |  22 +-
 manifest/make-manifest.toml                   | 212 +++++++++---------
 manifest/target-manifest.toml                 | 108 ++++-----
 3 files changed, 170 insertions(+), 172 deletions(-)

diff --git a/arch/arm/SAMD21/SAMD21A/manifest/samd21a.toml b/arch/arm/SAMD21/SAMD21A/manifest/samd21a.toml
index feadf0fb..579f0cc9 100644
--- a/arch/arm/SAMD21/SAMD21A/manifest/samd21a.toml
+++ b/arch/arm/SAMD21/SAMD21A/manifest/samd21a.toml
@@ -1,18 +1,16 @@
-[esf.links]
-common = "arch/arm/common"
-mcu = "arch/arm/SAMD21/SAMD21A/mcu"
-ld = "arch/arm/SAMD21/SAMD21A/ld"
-cfg = "arch/arm/SAMD21/SAMD21A/manifest"
-[esf.includes]
-IGLOO_INCLUDES = ["sam.h"]
-
+# This is a template.
+[esf]
+name = "${TARGET}"
+links = ["arch/arm/common", "arch/arm/SAMD21/SAMD21A/mcu",
+"arch/arm/SAMD21/SAMD21A/ld"]
+includes = ["sam.h"]
 # These are defaults. Once a project is generated, the .cfg can be freely edited without fear of anything being overwritten. However, I do not recommend editing any of the _cfg variables.
-[esf.scripts]
-scripts = ["arch/arm/SAMD21/SAMD21A/scripts/${TARGET}.cfg", "scripts"]
-
+scripts = ["arch/arm/SAMD21/SAMD21A/scripts/${TARGET}.cfg", "scripts/push.gdb",
+"scripts/debug.gdb"]
 # lineage for this family of mcus
 # this is used to evaluate makefile requirements for mcus
 # this will be evaluated to "arch.arm.samd21a.<mcu_name>
-[esf.make]
 series = "arch.arm.samd21a.${TARGET}"
 
+[user]
+# Add user config options here
diff --git a/manifest/make-manifest.toml b/manifest/make-manifest.toml
index 0e712041..0cdc8fa1 100644
--- a/manifest/make-manifest.toml
+++ b/manifest/make-manifest.toml
@@ -11,8 +11,7 @@ OBJDUMP = "${TOOLCHAIN}-objdump"
 GDB = "${TOOLCHAIN}-gdb"
 SIZE = "${TOOLCHAIN}-size"
 AS = "${TOOLCHAIN}-as"
-DIR_INCLUDES = ["-I$(QUOTE)../../../ESF/mcu/inc$(QUOTE)",
-             "-I$(QUOTE)../../../inc$(QUOTE)"]
+DIR_INCLUDES = ["-I$(QUOTE)../../../inc$(QUOTE)"]
 DEPS = "$(OBJS:%.o=%.d)"
 DEPS_AS_ARGS = "$(OBJS_AS_ARGS:%.o=%.d)"
 OBJS = ["src/main.o"]
@@ -24,7 +23,7 @@ CLEAN_CMDS = ["@rm -f $(OBJS_AS_ARGS)",
            "@rm -f $(PROJECT_NAME).bin",
            "@rm -f $(PROJECT_NAME).elf",
            "@rm -f $(PROJECT_NAME).hex"]
-SUB_DIRS = ["src", "ESF/mcu/src"]
+SUB_DIRS = ["src", "esf/mcu/src"]
 
 DEBUG_PREREQS = ["all"]
 DEBUG_CMDS = ["@$(GDB) $(PROJECT_NAME).elf -x $(QUOTE)scripts/debug.gdb$(QUOTE)"]
@@ -75,9 +74,9 @@ EEP_FLAGS = ["-j .eeprom --set-section-flags=.eeprom=alloc,load",
           "--change-section-lma",
           ".eeprom=0",
           "--no-change-warnings"]
-LD_PATH = "../../../ESF/ld"
-DIR_INCLUDES = ["-I$(QUOTE)../../../ESF/common/inc$(QUOTE)",
-             "-I$(QUOTE)../../../ESF/common/inc/cmsis$(QUOTE)"]
+LD_PATH = "../../../esf/ld"
+DIR_INCLUDES = ["-I$(QUOTE)../../../esf/arm/common/inc$(QUOTE)",
+             "-I$(QUOTE)../../../esf/arm/common/inc/cmsis$(QUOTE)"]
 ALL_PREREQS = ["$(SUB_DIRS)",
               "$(PROJECT_NAME).elf",
               "$(PROJECT_NAME).bin",
@@ -100,106 +99,107 @@ CLEAN_CMDS = ["@rm -f $(PROJECT_NAME).a",
 [arch.arm.samd21a]
 MCPU = "cortex-m0plus"
 CFLAGS = ["-D$(MCU)", "-mcpu=$(MCPU)"]
+DIR_INCLUDES = ["-I$(QUOTE)../../../esf/arm/SAMD21/SAMD21A/mcu/inc$(QUOTE)"]
 [arch.arm.samd21a.samd21e15a]
 MCU = "__SAMD21E15A__"
 LD_SCRIPT = "$(LD_PATH)/samd21e15a_flash.ld"
-OBJS = ["ESF/mcu/src/startup_samd21e15a.o",
-     "ESF/mcu/src/system_samd21e15a.o"]
-OBJS_AS_ARGS = ["$(QUOTE)ESF/mcu/src/startup_samd21e15a.o$(QUOTE)",
-             "$(QUOTE)ESF/mcu/src/system_samd21e15a.o$(QUOTE)"]
+OBJS = ["esf/mcu/src/startup_samd21e15a.o",
+     "esf/mcu/src/system_samd21e15a.o"]
+OBJS_AS_ARGS = ["$(QUOTE)esf/mcu/src/startup_samd21e15a.o$(QUOTE)",
+             "$(QUOTE)esf/mcu/src/system_samd21e15a.o$(QUOTE)"]
 [arch.arm.samd21a.samd21e16a]
 MCU = "__SAMD21E16A__"
 LD_SCRIPT = "$(LD_PATH)/samd21e16a_flash.ld"
-OBJS = ["ESF/mcu/src/startup_samd21e16a.o",
-     "ESF/mcu/src/system_samd21e16a.o"]
-OBJS_AS_ARGS = ["$(QUOTE)ESF/mcu/src/startup_samd21e16a.o$(QUOTE)",
-             "$(QUOTE)ESF/mcu/src/system_samd21e16a.o$(QUOTE)"]
+OBJS = ["esf/mcu/src/startup_samd21e16a.o",
+     "esf/mcu/src/system_samd21e16a.o"]
+OBJS_AS_ARGS = ["$(QUOTE)esf/mcu/src/startup_samd21e16a.o$(QUOTE)",
+             "$(QUOTE)esf/mcu/src/system_samd21e16a.o$(QUOTE)"]
 [arch.arm.samd21a.samd21e17a]
 MCU = "__SAMD21E17A__"
 LD_SCRIPT = "$(LD_PATH)/samd21e17a_flash.ld"
-OBJS = ["ESF/mcu/src/startup_samd21e17a.o",
-     "ESF/mcu/src/system_samd21e17a.o"]
-OBJS_AS_ARGS = ["$(QUOTE)ESF/mcu/src/startup_samd21e17a.o$(QUOTE)",
-             "$(QUOTE)ESF/mcu/src/system_samd21e17a.o$(QUOTE)"]
+OBJS = ["esf/mcu/src/startup_samd21e17a.o",
+     "esf/mcu/src/system_samd21e17a.o"]
+OBJS_AS_ARGS = ["$(QUOTE)esf/mcu/src/startup_samd21e17a.o$(QUOTE)",
+             "$(QUOTE)esf/mcu/src/system_samd21e17a.o$(QUOTE)"]
 [arch.arm.samd21a.samd21e18a]
 MCU = "__SAMD21E18A__"
 LD_SCRIPT = "$(LD_PATH)/samd21e18a_flash.ld"
-OBJS = ["ESF/mcu/src/startup_samd21e18a.o",
-     "ESF/mcu/src/system_samd21e18a.o"]
-OBJS_AS_ARGS = ["$(QUOTE)ESF/mcu/src/startup_samd21e18a.o$(QUOTE)",
-             "$(QUOTE)ESF/mcu/src/system_samd21e18a.o$(QUOTE)"]
+OBJS = ["esf/mcu/src/startup_samd21e18a.o",
+     "esf/mcu/src/system_samd21e18a.o"]
+OBJS_AS_ARGS = ["$(QUOTE)esf/mcu/src/startup_samd21e18a.o$(QUOTE)",
+             "$(QUOTE)esf/mcu/src/system_samd21e18a.o$(QUOTE)"]
 
 [arch.arm.samd21a.samd21g15a]
 MCU = "__SAMD21G15A__"
 LD_SCRIPT = "$(LD_PATH)/samd21g15a_flash.ld"
-OBJS = ["ESF/mcu/src/startup_samd21g15a.o",
-     "ESF/mcu/src/system_samd21g15a.o"]
-OBJS_AS_ARGS = ["$(QUOTE)ESF/mcu/src/startup_samd21g15a.o$(QUOTE)",
-             "$(QUOTE)ESF/mcu/src/system_samd21g15a.o$(QUOTE)"]
+OBJS = ["esf/mcu/src/startup_samd21g15a.o",
+     "esf/mcu/src/system_samd21g15a.o"]
+OBJS_AS_ARGS = ["$(QUOTE)esf/mcu/src/startup_samd21g15a.o$(QUOTE)",
+             "$(QUOTE)esf/mcu/src/system_samd21g15a.o$(QUOTE)"]
 [arch.arm.samd21a.samd21g16a]
 MCU = "__SAMD21G16A__"
 LD_SCRIPT = "$(LD_PATH)/samd21g16a_flash.ld"
-OBJS = ["ESF/mcu/src/startup_samd21g16a.o",
-     "ESF/mcu/src/system_samd21g16a.o"]
-OBJS_AS_ARGS = ["$(QUOTE)ESF/mcu/src/startup_samd21g16a.o$(QUOTE)",
-             "$(QUOTE)ESF/mcu/src/system_samd21g16a.o$(QUOTE)"]
+OBJS = ["esf/mcu/src/startup_samd21g16a.o",
+     "esf/mcu/src/system_samd21g16a.o"]
+OBJS_AS_ARGS = ["$(QUOTE)esf/mcu/src/startup_samd21g16a.o$(QUOTE)",
+             "$(QUOTE)esf/mcu/src/system_samd21g16a.o$(QUOTE)"]
 [arch.arm.samd21a.samd21g17a]
 MCU = "__SAMD21G17A__"
 LD_SCRIPT = "$(LD_PATH)/samd21g17a_flash.ld"
-OBJS = ["ESF/mcu/src/startup_samd21g17a.o",
-     "ESF/mcu/src/system_samd21g17a.o"]
-OBJS_AS_ARGS = ["$(QUOTE)ESF/mcu/src/startup_samd21g17a.o$(QUOTE)",
-             "$(QUOTE)ESF/mcu/src/system_samd21g17a.o$(QUOTE)"]
+OBJS = ["esf/mcu/src/startup_samd21g17a.o",
+     "esf/mcu/src/system_samd21g17a.o"]
+OBJS_AS_ARGS = ["$(QUOTE)esf/mcu/src/startup_samd21g17a.o$(QUOTE)",
+             "$(QUOTE)esf/mcu/src/system_samd21g17a.o$(QUOTE)"]
 [arch.arm.samd21a.samd21g17au]
 MCU = "__SAMD21G17AU__"
 LD_SCRIPT = "$(LD_PATH)/samd21g17au_flash.ld"
-OBJS = ["ESF/mcu/src/startup_samd21g17au.o",
-     "ESF/mcu/src/system_samd21g17au.o"]
-OBJS_AS_ARGS = ["$(QUOTE)ESF/mcu/src/startup_samd21g17au.o$(QUOTE)",
-             "$(QUOTE)ESF/mcu/src/system_samd21g17au.o$(QUOTE)"]
+OBJS = ["esf/mcu/src/startup_samd21g17au.o",
+     "esf/mcu/src/system_samd21g17au.o"]
+OBJS_AS_ARGS = ["$(QUOTE)esf/mcu/src/startup_samd21g17au.o$(QUOTE)",
+             "$(QUOTE)esf/mcu/src/system_samd21g17au.o$(QUOTE)"]
 [arch.arm.samd21a.samd21g18a]
 MCU = "__SAMD21G18A__"
 LD_SCRIPT = "$(LD_PATH)/samd21g18a_flash.ld"
-OBJS = ["ESF/mcu/src/startup_samd21g18a.o",
-     "ESF/mcu/src/system_samd21g18a.o"]
-OBJS_AS_ARGS = ["$(QUOTE)ESF/mcu/src/startup_samd21g18a.o$(QUOTE)",
-             "$(QUOTE)ESF/mcu/src/system_samd21g18a.o$(QUOTE)"]
+OBJS = ["esf/mcu/src/startup_samd21g18a.o",
+     "esf/mcu/src/system_samd21g18a.o"]
+OBJS_AS_ARGS = ["$(QUOTE)esf/mcu/src/startup_samd21g18a.o$(QUOTE)",
+             "$(QUOTE)esf/mcu/src/system_samd21g18a.o$(QUOTE)"]
 [arch.arm.samd21a.samd21g18au]
 MCU = "__SAMD21G18AU__"
 LD_SCRIPT = "$(LD_PATH)/samd21g18au_flash.ld"
-OBJS = ["ESF/mcu/src/startup_samd21g18au.o",
-     "ESF/mcu/src/system_samd21g18au.o"]
-OBJS_AS_ARGS = ["$(QUOTE)ESF/mcu/src/startup_samd21g18au.o$(QUOTE)",
-             "$(QUOTE)ESF/mcu/src/system_samd21g18au.o$(QUOTE)"]
+OBJS = ["esf/mcu/src/startup_samd21g18au.o",
+     "esf/mcu/src/system_samd21g18au.o"]
+OBJS_AS_ARGS = ["$(QUOTE)esf/mcu/src/startup_samd21g18au.o$(QUOTE)",
+             "$(QUOTE)esf/mcu/src/system_samd21g18au.o$(QUOTE)"]
 
 [arch.arm.samd21a.samd21j15a]
 MCU = "__SAMD21J15A__"
 LD_SCRIPT = "$(LD_PATH)/samd21j15a_flash.ld"
-OBJS = ["ESF/mcu/src/startup_samd21j15a.o",
-     "ESF/mcu/src/system_samd21j15a.o"]
-OBJS_AS_ARGS = ["$(QUOTE)ESF/mcu/src/startup_samd21j15a.o$(QUOTE)",
-             "$(QUOTE)ESF/mcu/src/system_samd21j15a.o$(QUOTE)"]
+OBJS = ["esf/mcu/src/startup_samd21j15a.o",
+     "esf/mcu/src/system_samd21j15a.o"]
+OBJS_AS_ARGS = ["$(QUOTE)esf/mcu/src/startup_samd21j15a.o$(QUOTE)",
+             "$(QUOTE)esf/mcu/src/system_samd21j15a.o$(QUOTE)"]
 [arch.arm.samd21a.samd21j16a]
 MCU = "__SAMD21J16A__"
 LD_SCRIPT = "$(LD_PATH)/samd21j16a_flash.ld"
-OBJS = ["ESF/mcu/src/startup_samd21j16a.o",
-     "ESF/mcu/src/system_samd21j16a.o"]
-OBJS_AS_ARGS = ["$(QUOTE)ESF/mcu/src/startup_samd21j16a.o$(QUOTE)",
-             "$(QUOTE)ESF/mcu/src/system_samd21j16a.o$(QUOTE)"]
+OBJS = ["esf/mcu/src/startup_samd21j16a.o",
+     "esf/mcu/src/system_samd21j16a.o"]
+OBJS_AS_ARGS = ["$(QUOTE)esf/mcu/src/startup_samd21j16a.o$(QUOTE)",
+             "$(QUOTE)esf/mcu/src/system_samd21j16a.o$(QUOTE)"]
 [arch.arm.samd21a.samd21j17a]
 MCU = "__SAMD21J17A__"
 LD_SCRIPT = "$(LD_PATH)/samd21j17a_flash.ld"
-OBJS = ["ESF/mcu/src/startup_samd21j17a.o",
-     "ESF/mcu/src/system_samd21j17a.o"]
-OBJS_AS_ARGS = ["$(QUOTE)ESF/mcu/src/startup_samd21j17a.o$(QUOTE)",
-             "$(QUOTE)ESF/mcu/src/system_samd21j17a.o$(QUOTE)"]
+OBJS = ["esf/mcu/src/startup_samd21j17a.o",
+     "esf/mcu/src/system_samd21j17a.o"]
+OBJS_AS_ARGS = ["$(QUOTE)esf/mcu/src/startup_samd21j17a.o$(QUOTE)",
+             "$(QUOTE)esf/mcu/src/system_samd21j17a.o$(QUOTE)"]
 [arch.arm.samd21a.samd21j18a]
 MCU = "__SAMD21J18A__"
 LD_SCRIPT = "$(LD_PATH)/samd21j18a_flash.ld"
-OBJS = ["ESF/mcu/src/startup_samd21j18a.o",
-     "ESF/mcu/src/system_samd21j18a.o"]
-OBJS_AS_ARGS = ["$(QUOTE)ESF/mcu/src/startup_samd21j18a.o$(QUOTE)",
-             "$(QUOTE)ESF/mcu/src/system_samd21j18a.o$(QUOTE)"]
+OBJS = ["esf/mcu/src/startup_samd21j18a.o",
+     "esf/mcu/src/system_samd21j18a.o"]
+OBJS_AS_ARGS = ["$(QUOTE)esf/mcu/src/startup_samd21j18a.o$(QUOTE)",
+             "$(QUOTE)esf/mcu/src/system_samd21j18a.o$(QUOTE)"]
 
 [arch.arm.samd51a]
 MCPU = "cortex-m4"
@@ -208,78 +208,78 @@ FLOAT_ABI = "hard"
 [arch.arm.samd51a.samd51g18a]
 MCU = "__SAMD51G18A__"
 LD_SCRIPT = "$(LD_PATH)/samd51g18a_flash.ld"
-OBJS = ["ESF/mcu/src/startup_samd51g18a.o",
-     "ESF/mcu/src/system_samd51g18a.o"]
-OBJS_AS_ARGS = ["$(QUOTE)ESF/mcu/src/startup_samd51g18a.o$(QUOTE)",
-             "$(QUOTE)ESF/mcu/src/system_samd51g18a.o$(QUOTE)"]
+OBJS = ["esf/mcu/src/startup_samd51g18a.o",
+     "esf/mcu/src/system_samd51g18a.o"]
+OBJS_AS_ARGS = ["$(QUOTE)esf/mcu/src/startup_samd51g18a.o$(QUOTE)",
+             "$(QUOTE)esf/mcu/src/system_samd51g18a.o$(QUOTE)"]
 [arch.arm.samd51a.samd51g19a]
 MCU = "__SAMD51G19A__"
 LD_SCRIPT = "$(LD_PATH)/samd51g19a_flash.ld"
-OBJS = ["ESF/mcu/src/startup_samd51g19a.o",
-     "ESF/mcu/src/system_samd51g19a.o"]
-OBJS_AS_ARGS = ["$(QUOTE)ESF/mcu/src/startup_samd51g19a.o$(QUOTE)",
-             "$(QUOTE)ESF/mcu/src/system_samd51g19a.o$(QUOTE)"]
+OBJS = ["esf/mcu/src/startup_samd51g19a.o",
+     "esf/mcu/src/system_samd51g19a.o"]
+OBJS_AS_ARGS = ["$(QUOTE)esf/mcu/src/startup_samd51g19a.o$(QUOTE)",
+             "$(QUOTE)esf/mcu/src/system_samd51g19a.o$(QUOTE)"]
 
 [arch.arm.samd51a.samd51j18a]
 MCU = "__SAMD51J18A__"
 LD_SCRIPT = "$(LD_PATH)/samd51j18a_flash.ld"
-OBJS = ["ESF/mcu/src/startup_samd51j18a.o",
-     "ESF/mcu/src/system_samd51j18a.o"]
-OBJS_AS_ARJS = ["$(QUOTE)ESF/mcu/src/startup_samd51j18a.o$(QUOTE)",
-             "$(QUOTE)ESF/mcu/src/system_samd51j18a.o$(QUOTE)"]
+OBJS = ["esf/mcu/src/startup_samd51j18a.o",
+     "esf/mcu/src/system_samd51j18a.o"]
+OBJS_AS_ARJS = ["$(QUOTE)esf/mcu/src/startup_samd51j18a.o$(QUOTE)",
+             "$(QUOTE)esf/mcu/src/system_samd51j18a.o$(QUOTE)"]
 [arch.arm.samd51a.samd51j19a]
 MCU = "__SAMD51J19A__"
 LD_SCRIPT = "$(LD_PATH)/samd51j19a_flash.ld"
-OBJS = ["ESF/mcu/src/startup_samd51j19a.o",
-     "ESF/mcu/src/system_samd51j19a.o"]
-OBJS_AS_ARGS = ["$(QUOTE)ESF/mcu/src/startup_samd51j19a.o$(QUOTE)",
-             "$(QUOTE)ESF/mcu/src/system_samd51j19a.o$(QUOTE)"]
+OBJS = ["esf/mcu/src/startup_samd51j19a.o",
+     "esf/mcu/src/system_samd51j19a.o"]
+OBJS_AS_ARGS = ["$(QUOTE)esf/mcu/src/startup_samd51j19a.o$(QUOTE)",
+             "$(QUOTE)esf/mcu/src/system_samd51j19a.o$(QUOTE)"]
 [arch.arm.samd51a.samd51j20a]
 MCU = "__SAMD51J20A__"
 LD_SCRIPT = "$(LD_PATH)/samd51j20a_flash.ld"
-OBJS = ["ESF/mcu/src/startup_samd51j20a.o",
-     "ESF/mcu/src/system_samd51j20a.o"]
-OBJS_AS_ARGS = ["$(QUOTE)ESF/mcu/src/startup_samd51j20a.o$(QUOTE)",
-             "$(QUOTE)ESF/mcu/src/system_samd51j20a.o$(QUOTE)"]
+OBJS = ["esf/mcu/src/startup_samd51j20a.o",
+     "esf/mcu/src/system_samd51j20a.o"]
+OBJS_AS_ARGS = ["$(QUOTE)esf/mcu/src/startup_samd51j20a.o$(QUOTE)",
+             "$(QUOTE)esf/mcu/src/system_samd51j20a.o$(QUOTE)"]
 
 [arch.arm.samd51a.samd51n19a]
 MCU = "__SAMD51N19A__"
 LD_SCRIPT = "$(LD_PATH)/samd51n19a_flash.ld"
-OBJS = ["ESF/mcu/src/startup_samd51n19a.o",
-     "ESF/mcu/src/system_samd51n19a.o"]
-OBJS_AS_ARGS = ["$(QUOTE)ESF/mcu/src/startup_samd51n19a.o$(QUOTE)",
-             "$(QUOTE)ESF/mcu/src/system_samd51n19a.o$(QUOTE)"]
+OBJS = ["esf/mcu/src/startup_samd51n19a.o",
+     "esf/mcu/src/system_samd51n19a.o"]
+OBJS_AS_ARGS = ["$(QUOTE)esf/mcu/src/startup_samd51n19a.o$(QUOTE)",
+             "$(QUOTE)esf/mcu/src/system_samd51n19a.o$(QUOTE)"]
 [arch.arm.samd51a.samd51n20a]
 MCU = "__SAMD51N20A__"
 LD_SCRIPT = "$(LD_PATH)/samd51n20a_flash.ld"
-OBJS = ["ESF/mcu/src/startup_samd51n20a.o",
-     "ESF/mcu/src/system_samd51n20a.o"]
-OBJS_AS_ARGS = ["$(QUOTE)ESF/mcu/src/startup_samd51n20a.o$(QUOTE)",
-             "$(QUOTE)ESF/mcu/src/system_samd51n20a.o$(QUOTE)"]
+OBJS = ["esf/mcu/src/startup_samd51n20a.o",
+     "esf/mcu/src/system_samd51n20a.o"]
+OBJS_AS_ARGS = ["$(QUOTE)esf/mcu/src/startup_samd51n20a.o$(QUOTE)",
+             "$(QUOTE)esf/mcu/src/system_samd51n20a.o$(QUOTE)"]
 
 [arch.arm.samd51a.samd51p19a]
 MCU = "__SAMD51P19A__"
 LD_SCRIPT = "$(LD_PATH)/samd51p19a_flash.ld"
-OBJS = ["ESF/mcu/src/startup_samd51p19a.o",
-     "ESF/mcu/src/system_samd51p19a.o"]
-OBJS_AS_ARGS = ["$(QUOTE)ESF/mcu/src/startup_samd51p19a.o$(QUOTE)",
-             "$(QUOTE)ESF/mcu/src/system_samd51p19a.o$(QUOTE)"]
+OBJS = ["esf/mcu/src/startup_samd51p19a.o",
+     "esf/mcu/src/system_samd51p19a.o"]
+OBJS_AS_ARGS = ["$(QUOTE)esf/mcu/src/startup_samd51p19a.o$(QUOTE)",
+             "$(QUOTE)esf/mcu/src/system_samd51p19a.o$(QUOTE)"]
 [arch.arm.samd51a.samd51p20a]
 MCU = "__SAMD51P20A__"
 LD_SCRIPT = "$(LD_PATH)/samd51p20a_flash.ld"
-OBJS = ["ESF/mcu/src/startup_samd51p20a.o",
-     "ESF/mcu/src/system_samd51p20a.o"]
-OBJS_AS_ARGS = ["$(QUOTE)ESF/mcu/src/startup_samd51p20a.o$(QUOTE)",
-             "$(QUOTE)ESF/mcu/src/system_samd51p20a.o$(QUOTE)"]
+OBJS = ["esf/mcu/src/startup_samd51p20a.o",
+     "esf/mcu/src/system_samd51p20a.o"]
+OBJS_AS_ARGS = ["$(QUOTE)esf/mcu/src/startup_samd51p20a.o$(QUOTE)",
+             "$(QUOTE)esf/mcu/src/system_samd51p20a.o$(QUOTE)"]
 
 [arch.arm.same54a]
 MCPU = "cortex-m4"
 FPU = "fpv4-sp-d16"
 FLOAT_ABI = "hard"
-OBJS = ["ESF/mcu/src/startup_same54.o",
-     "ESF/mcu/src/system_same54.o"]
-OBJS_AS_ARGS = ["$(QUOTE)ESF/mcu/src/startup_same54.o$(QUOTE)",
-             "$(QUOTE)ESF/mcu/src/system_same54.o$(QUOTE)"]
+OBJS = ["esf/mcu/src/startup_same54.o",
+     "esf/mcu/src/system_same54.o"]
+OBJS_AS_ARGS = ["$(QUOTE)esf/mcu/src/startup_same54.o$(QUOTE)",
+             "$(QUOTE)esf/mcu/src/system_same54.o$(QUOTE)"]
 CFLAGS = ["-D$(MCU)", "-mcpu=$(MCPU)"]
 ELF_FLAGS = ["-D$(MCU)", "-mcpu=$(MCPU)"]
 [arch.arm.same54a.same54n19a]
@@ -303,7 +303,7 @@ SIZE =      "avr-size"
 AS =        "avr-as"
 
 [arch.riscv]
-TOOLCHAIN = "${ESF_DIR}/toolchains/riscv/bin/riscv64-unknown-elf"
+TOOLCHAIN = "${esf_DIR}/toolchains/riscv/bin/riscv64-unknown-elf"
 CFLAGS = ["-x c", "-DDEBUG", "-Os",
        "-g3",
        "-Wall",
@@ -320,7 +320,7 @@ CFLAGS = ["-x c", "-DDEBUG", "-Os",
 ELF_FLAGS = ["-nostartfiles",
           "-Wl,--gc-sections",
           "-Wl,--script=$(LD_SCRIPT)"]
-LD_PATH = "../../../ESF/ld"
+LD_PATH = "../../../esf/ld"
 [arch.riscv.fe310]
 [arch.riscv.fe310g]
 CFLAGS = ["-DF_CPU=256000000"]
@@ -329,5 +329,5 @@ LD_SCRIPT = "$(LD_PATH)/fe310g000.ld"
 [arch.riscv.fe310g.fe310g002]
 MCU = "__FE310G002__"
 LD_SCRIPT = "$(LD_PATH)/fe310g002.ld"
-OBJS = ["ESF/mcu/src/startup_fe310.o"]
-OBJS_AS_ARGS = ["$(QUOTE)ESF/mcu/src/startup_fe310.o$(QUOTE)"]
+OBJS = ["esf/mcu/src/startup_fe310.o"]
+OBJS_AS_ARGS = ["$(QUOTE)esf/mcu/src/startup_fe310.o$(QUOTE)"]
diff --git a/manifest/target-manifest.toml b/manifest/target-manifest.toml
index 51686f87..e203e2cb 100644
--- a/manifest/target-manifest.toml
+++ b/manifest/target-manifest.toml
@@ -1,57 +1,58 @@
-[target.make]
-# samd21 family
-# samd21a series
-samd21e15a = "arch.arm.samd21a.samd21e15a"
-samd21e16a = "arch.arm.samd21a.samd21e16a"
-samd21e17a = "arch.arm.samd21a.samd21e17a"
-samd21e18a = "arch.arm.samd21a.samd21e18a"
-samd21g15a = "arch.arm.samd21a.samd21g15a"
-samd21g16a = "arch.arm.samd21a.samd21g16a"
-samd21g17a = "arch.arm.samd21a.samd21g17a"
-samd21g17au = "arch.arm.samd2a1.samd21g17au"
-samd21g18a = "arch.arm.samd21a.samd21g18a"
-samd21g18au = "arch.arm.samd21a.samd21g18au"
-samd21j15a = "arch.arm.samd21a.samd21j15a"
-samd21j16a = "arch.arm.samd21a.samd21j16a"
-samd21j17a = "arch.arm.samd21a.samd21j17a"
-samd21j18a = "arch.arm.samd21a.samd21j18a"
-# samd51 family
-# samd51a series
-samd51g18a = "arch.arm.samd51a.samd51g18a"
-samd51g19a = "arch.arm.samd51a.samd51g19a"
-samd51j18a = "arch.arm.samd51a.samd51j18a"
-samd51j19a = "arch.arm.samd51a.samd51j19a"
-samd51j20a = "arch.arm.samd51a.samd51j20a"
-samd51n19a = "arch.arm.samd51a.samd51n19a"
-samd51n20a = "arch.arm.samd51a.samd51n20a"
-samd51p19a = "arch.arm.samd51a.samd51p19a"
-samd51p20a = "arch.arm.samd51a.samd51p20a"
-# same54 family
-# same54n/p series
-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.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"
-
-# fe310 family
-# fe310g series
-fe310g000 = "arch.riscv.fe310g.fe310g000"
-fe310g002 = "arch.riscv.fe310g.fe310g002"
+# [target.make]
+# # samd21 family
+# # samd21a series
+# samd21e15a = "arch.arm.samd21a.samd21e15a"
+# samd21e16a = "arch.arm.samd21a.samd21e16a"
+# samd21e17a = "arch.arm.samd21a.samd21e17a"
+# samd21e18a = "arch.arm.samd21a.samd21e18a"
+# samd21g15a = "arch.arm.samd21a.samd21g15a"
+# samd21g16a = "arch.arm.samd21a.samd21g16a"
+# samd21g17a = "arch.arm.samd21a.samd21g17a"
+# samd21g17au = "arch.arm.samd2a1.samd21g17au"
+# samd21g18a = "arch.arm.samd21a.samd21g18a"
+# samd21g18au = "arch.arm.samd21a.samd21g18au"
+# samd21j15a = "arch.arm.samd21a.samd21j15a"
+# samd21j16a = "arch.arm.samd21a.samd21j16a"
+# samd21j17a = "arch.arm.samd21a.samd21j17a"
+# samd21j18a = "arch.arm.samd21a.samd21j18a"
+# # samd51 family
+# # samd51a series
+# samd51g18a = "arch.arm.samd51a.samd51g18a"
+# samd51g19a = "arch.arm.samd51a.samd51g19a"
+# samd51j18a = "arch.arm.samd51a.samd51j18a"
+# samd51j19a = "arch.arm.samd51a.samd51j19a"
+# samd51j20a = "arch.arm.samd51a.samd51j20a"
+# samd51n19a = "arch.arm.samd51a.samd51n19a"
+# samd51n20a = "arch.arm.samd51a.samd51n20a"
+# samd51p19a = "arch.arm.samd51a.samd51p19a"
+# samd51p20a = "arch.arm.samd51a.samd51p20a"
+# # same54 family
+# # same54n/p series
+# 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.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"
+# 
+# # fe310 family
+# # fe310g series
+# fe310g000 = "arch.riscv.fe310g.fe310g000"
+# fe310g002 = "arch.riscv.fe310g.fe310g002"
 
 # target.cfg contains the file locations for all config manifests for all mcus
 # target.cfg contains things like symlinks
-[target.manifest]
+# [target.manifest]
+[targets]
 # samd21 family
 # samd21a series
 samd21e15a = "arch/arm/SAMD21/SAMD21A/manifest/samd21a.toml"
@@ -69,8 +70,7 @@ samd21j16a = "arch/arm/SAMD21/SAMD21A/manifest/samd21a.toml"
 samd21j17a = "arch/arm/SAMD21/SAMD21A/manifest/samd21a.toml"
 samd21j18a = "arch/arm/SAMD21/SAMD21A/manifest/samd21a.toml"
 # samd51 family
-# samd51a series
-samd51g18a = "arch/arm/SAMD51/SAMD51A/manifest/samd51a.toml"
+
 samd51g19a = "arch/arm/SAMD51/SAMD51A/manifest/samd51a.toml"
 samd51j18a = "arch/arm/SAMD51/SAMD51A/manifest/samd51a.toml"
 samd51j19a = "arch/arm/SAMD51/SAMD51A/manifest/samd51a.toml"
@@ -100,4 +100,4 @@ same70q21a = "arch/arm/SAME70/SAME70A/manifest/same70q21a.toml"
 # fe310 family
 # fe310g series
 fe310g000 = "arch/riscv/FE310/FE310_G/manifest/fe310g.toml"
-fe310g002 = "arch/riscv/FE310/FE310_G/manifest/fe310g.toml"
\ No newline at end of file
+fe310g002 = "arch/riscv/FE310/FE310_G/manifest/fe310g.toml"