tiny changes. d21j18a compiles and runs. Note the differences in some of the register definitions from Microchip packs...

2 years ago · f6f1bdd37a
parent ef2a1204a8
commit f6f1bdd37a
3 changed files with 33 additions and 100 deletions
--- a/arch/arm/SAMD21/SAMD21A/scripts/samd21j18a.cfg
+++ b/arch/arm/SAMD21/SAMD21A/scripts/samd21j18a.cfg
@ -4,7 +4,7 @@


 # Transport Select
-source [find interface/jlink.cfg]
+source [find interface/cmsis-dap.cfg]
 transport select swd

 # Chip Information
--- a/manifest/make-manifest.toml
+++ b/manifest/make-manifest.toml
@ -23,7 +23,6 @@ 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"]

 DEBUG_PREREQS = ["all"]
 DEBUG_CMDS = ["@$(GDB) $(PROJECT_NAME).elf -x $(QUOTE)scripts/debug.gdb$(QUOTE)"]
@ -74,7 +73,6 @@ 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/arm/common/inc$(QUOTE)",
             "-I$(QUOTE)../../../esf/arm/common/inc/cmsis$(QUOTE)"]
 ALL_PREREQS = ["$(SUB_DIRS)",
@ -100,200 +98,132 @@ CLEAN_CMDS = ["@rm -f $(PROJECT_NAME).a",
 MCPU = "cortex-m0plus"
 CFLAGS = ["-D$(MCU)", "-mcpu=$(MCPU)"]
 DIR_INCLUDES = ["-I$(QUOTE)../../../esf/arm/SAMD21/SAMD21A/mcu/inc$(QUOTE)"]
+LD_PATH = "../../../esf/arm/SAMD21/SAMD21A/ld"
+
 [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)"]
+
 [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)"]
+
 [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)"]
+
 [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)"]

 [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)"]
+
 [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)"]
+
 [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)"]
+
 [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)"]
+
 [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)"]
+
 [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)"]

 [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)"]
+
 [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)"]
+
 [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)"]
+
 [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/arm/SAMD21/SAMD21A/mcu/src/startup_samd21j18a.o",
+     "esf/arm/SAMD21/SAMD21A/mcu/src/system_samd21j18a.o"]

 [arch.arm.samd51a]
 MCPU = "cortex-m4"
 FPU = "fpv4-sp-d16"
 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)"]
+
 [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)"]

 [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)"]
+
 [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)"]
+
 [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)"]

 [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)"]
+
 [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)"]

 [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)"]
+
 [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)"]

 [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/arm/SAME54/SAME54A/mcu/src/startup_same54.o",
+     "esf/arm/SAME54/SAME54A/mcu/src/system_same54.o"]
 CFLAGS = ["-D$(MCU)", "-mcpu=$(MCPU)"]
 ELF_FLAGS = ["-D$(MCU)", "-mcpu=$(MCPU)"]
+
 [arch.arm.same54a.same54n19a]
 MCU = "__SAME54N19A__"
 LD_SCRIPT = "$(LD_PATH)/same54n19a_flash.ld"
+
 [arch.arm.same54a.same54n20a]
 MCU = "__SAME54N20A__"
 LD_SCRIPT = "$(LD_PATH)/same54n20a_flash.ld"
+
 [arch.arm.same54a.same54p19a]
 MCU = "__SAME54P19A__"
 LD_SCRIPT = "$(LD_PATH)/same54p19a_flash.ld"
+
 [arch.arm.same54a.same54p20a]
 MCU = "__SAME54P20A__"
 LD_SCRIPT = "$(LD_PATH)/same54p20a_flash.ld"
+
 [arch.avr]
 CC =        "avr-gcc"
 CXX =       "avr-g++"
@ -330,4 +260,3 @@ LD_SCRIPT = "$(LD_PATH)/fe310g000.ld"
 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)"]
--- a/notes.txt
+++ b/notes.txt
@ -0,0 +1,4 @@
+makefile manifest defaults change:
+ - removed DEPS, DEPS_AS_ARGS, OBJS_AS_ARGS
+ - DEPS, DEPS_AS_ARGS, and OBJS_AS_ARGS will now be generated by igloo
+ - can revisit this if it becomes an issue, but it shouldnt