Merge branch 'main' into atsam-v71-v70-s70-e70/vladimir.cvetkovic

MikroElektronika · Jun 17, 2024 · 6c2523c · 6c2523c
2 parents 9a3e209 + b503a7f
commit 6c2523c
Show file tree

Hide file tree

Showing 988 changed files with 773,514 additions and 48 deletions.
diff --git a/ARM/gcc_clang/CMakeLists.txt b/ARM/gcc_clang/CMakeLists.txt
@@ -10,7 +10,7 @@ include(coreUtils)
 
 add_preinit_lib()
 
-core_files_set(fileListInclude fileDirInclude fileListInstall linkerScript startupFile)
+core_files_set(fileListInclude fileDirInclude fileListInstall linkerScript startupFile thirdpartyInstall)
 
 set_delay_parameters(delayParameters)
 add_macros(${CMAKE_BINARY_DIR} delay_parameters.h ${delayParameters})
@@ -49,8 +49,11 @@ target_include_directories(lib_core
         ${TEST_LIB_PATH}/include
         ${PREINIT_ROUTINE_PATH}/include
         interrupts/include/interrupts_mcu/${MCU_NAME_LOWER}
+        common/cmsis
     INTERFACE
         $<INSTALL_INTERFACE:include/core>
+        $<INSTALL_INTERFACE:include/core/${MCU_NAME}>
+        $<INSTALL_INTERFACE:include/core/common/cmsis>
 )
 
 add_fosc_macro(lib_core)
@@ -106,4 +109,30 @@ install(
         ${CMAKE_INSTALL_PREFIX}/../FileLinker
 )
 
+install(
+    DIRECTORY "common/cmsis/"
+    DESTINATION "${CMAKE_INSTALL_PREFIX}/include/core/common/cmsis"
+    FILES_MATCHING
+        PATTERN "*.h"
+)
+
+get_mcu_vendor(vendor)
+install(
+    DIRECTORY "def/${vendor}/${MCU_NAME}/"
+    DESTINATION "${CMAKE_INSTALL_PREFIX}/include/core/${MCU_NAME}"
+    FILES_MATCHING
+        PATTERN "*.h"
+)
+
+if(thirdpartyInstall)
+    if(IS_DIRECTORY "system/src/${vendor}/${thirdpartyInstall}")
+        install(
+            DIRECTORY "system/src/${vendor}/${thirdpartyInstall}/"
+            DESTINATION "${CMAKE_INSTALL_PREFIX}/include/core/${MCU_NAME}"
+            FILES_MATCHING
+                PATTERN "*.h"
+        )
+    endif()
+endif()
+
 target_sources(${PROJECT_NAME} PRIVATE ${linkerScript} ${startupFile})
diff --git a/ARM/gcc_clang/cmake/coreUtils.cmake b/ARM/gcc_clang/cmake/coreUtils.cmake
@@ -169,6 +169,8 @@ function(get_mcu_vendor vendor)
         set(${vendor} nxp PARENT_SCOPE)
     elseif(${MCU_NAME} MATCHES "^TM4C.+$")
         set(${vendor} ti PARENT_SCOPE)
+    elseif(${MCU_NAME} MATCHES "^(AT)?SAM.+$")
+        set(${vendor} sam PARENT_SCOPE)
     else()
         message(FATAL_ERROR "${MCU_NAME} not supported in GCC by NECTO.")
     endif()
@@ -178,7 +180,7 @@ endfunction()
 #############################################################################
 ## Function to set appropriate linker, startup and source files
 #############################################################################
-function(core_files_set fileListInclude fileDirInclude fileListInstall linkerScript startupFile)
+function(core_files_set fileListInclude fileDirInclude fileListInstall linkerScript startupFile thirdpartyInstall)
 
     set(local_list_include ${fileListInclude})
     set(local_list_install ${fileListInstall})
@@ -192,19 +194,28 @@ function(core_files_set fileListInclude fileDirInclude fileListInstall linkerScr
 
     list(APPEND local_dir_install system/inc/${vendor})
     list(APPEND local_dir_install def/${vendor}/${MCU_NAME})
-    set(${list} ${local_dir_install} PARENT_SCOPE)
 
     # Include mcu based on full mcu name matched
     string(TOLOWER ${MCU_NAME} mcu_match)
+    string(SUBSTRING ${MCU_NAME} 0 8 MCU_NAME_FIRST_8)
+    string(TOLOWER ${MCU_NAME_FIRST_8} MCU_NAME_FIRST_8_LOWER)
+    string(SUBSTRING ${MCU_NAME} 0 6 MCU_NAME_FIRST_6)
+    string(TOLOWER ${MCU_NAME_FIRST_6} MCU_NAME_FIRST_6_LOWER)
 
     file(GLOB_RECURSE CMAKE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${vendor}/*.cmake)
     foreach(cmakeFile ${CMAKE_FILES})
         include(${cmakeFile})
     endforeach()
 
+    set(${list} ${local_dir_install} PARENT_SCOPE)
+
     set(${list} ${local_list_include} PARENT_SCOPE)
     set(${list} ${local_list_install} PARENT_SCOPE)
 
+    if(NOT thirdpartyInstall)
+        set(${thirdpartyInstall} "" PARENT_SCOPE)
+    endif()
+
 endfunction()
 
 #############################################################################
@@ -218,8 +229,12 @@ function(set_flags flags)
         else()
             set(${flags} -std=gnu99 -Wl,-Map=output.map,-gc-sections,--print-memory-usage -mcpu=cortex-m0plus -mthumb --specs=nosys.specs -ffunction-sections -fdata-sections -fno-common -fmessage-length=0 -Wno-int-conversion -Wno-incompatible-function-pointer-types -Wno-implicit-function-declaration PARENT_SCOPE)
         endif()
+    elseif (${CORE_NAME} STREQUAL "M0+")
+        set(${flags} -std=gnu99 -Wl,-Map=output.map,-gc-sections,--print-memory-usage -mcpu=cortex-m0plus -mthumb --specs=nosys.specs -ffunction-sections -fdata-sections -fno-common -fmessage-length=0 PARENT_SCOPE)
     elseif (${CORE_NAME} STREQUAL "M3")
         set(${flags} -std=gnu99 -Wl,-Map=output.map,-gc-sections,--print-memory-usage -mcpu=cortex-m3 -mthumb --specs=nosys.specs -ffunction-sections -fdata-sections -fno-common -fmessage-length=0 -Wno-int-conversion -Wno-incompatible-function-pointer-types -Wno-implicit-function-declaration PARENT_SCOPE)
+    elseif (${CORE_NAME} STREQUAL "M4")
+        set(${flags} -std=gnu99 -Wl,-Map=output.map,-gc-sections,--print-memory-usage -mcpu=cortex-m4 -mthumb --specs=nosys.specs -mfloat-abi=hard -mfpu=fpv4-sp-d16 -ffunction-sections -fdata-sections -fno-common -fmessage-length=0 -Wno-int-conversion -Wno-incompatible-function-pointer-types -Wno-implicit-function-declaration PARENT_SCOPE)
     elseif (${CORE_NAME} STREQUAL "M4EF")
         set(${flags} -std=gnu99 -Wl,-Map=output.map,-gc-sections,--print-memory-usage -mcpu=cortex-m4 -mthumb --specs=nosys.specs -mfloat-abi=hard -mfpu=fpv4-sp-d16 -ffunction-sections -fdata-sections -fno-common -fmessage-length=0 -Wno-int-conversion -Wno-incompatible-function-pointer-types -Wno-implicit-function-declaration PARENT_SCOPE)
     elseif (${CORE_NAME} STREQUAL "M4DSP")

diff --git a/ARM/gcc_clang/cmake/sam/atsam_d21_da1.cmake b/ARM/gcc_clang/cmake/sam/atsam_d21_da1.cmake
@@ -0,0 +1,6 @@
+if(${MCU_NAME} MATCHES "^ATSAMD21E15$|^ATSAMD21E15L$|^ATSAMD21E16$|^ATSAMD21E16L$|^ATSAMD21E17$|^ATSAMD21E17L$|^ATSAMD21E18$|^ATSAMD21G15$|^ATSAMD21G16$|^ATSAMD21G16L$|^ATSAMD21G17$|^ATSAMD21G17L$|^ATSAMD21G18$|^ATSAMD21J15$|^ATSAMD21J16$|^ATSAMD21J17$|^ATSAMD21J18$|^ATSAMDA1E15B$|^ATSAMDA1E16B$|^ATSAMDA1G14B$|^ATSAMDA1G16B$|^ATSAMDA1J14B$|^ATSAMDA1J15B")
+    set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
+    set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
+    list(APPEND local_list_include system/src/sam/sam_d21_da1/system_sam_d21_da1.c)
+    list(APPEND local_list_include common/syscalls.c)
+endif()
diff --git a/ARM/gcc_clang/cmake/sam/atsam_v71_v70_s70_e70.cmake b/ARM/gcc_clang/cmake/sam/atsam_v71_v70_s70_e70.cmake
@@ -1,126 +1,125 @@
 if(${MCU_NAME} MATCHES "^ATSAMV71J21$")
     set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
     set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
-    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/thirdparty/system_samv71j21.c)
+    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/system_samv71j21.c)
     list(APPEND local_list_include common/syscalls.c)
 endif()
 
 if(${MCU_NAME} MATCHES "^ATSAMV71J21B$")
     set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
     set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
-    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/thirdparty/system_samv71j21b.c)
+    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/system_samv71j21b.c)
     list(APPEND local_list_include common/syscalls.c)
 endif()
 
 if(${MCU_NAME} MATCHES "^ATSAMV71J19$")
     set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
     set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
-    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/thirdparty/system_samv71j19.c)
+    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/system_samv71j19.c)
     list(APPEND local_list_include common/syscalls.c)
 endif()
 
 if(${MCU_NAME} MATCHES "^ATSAMV71J19B$")
     set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
     set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
-    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/thirdparty/system_samv71j19b.c)
+    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/system_samv71j19b.c)
     list(APPEND local_list_include common/syscalls.c)
 endif()
 
 if(${MCU_NAME} MATCHES "^ATSAMV71N19$")
     set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
     set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
-    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/thirdparty/system_samv71n19.c)
+    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/system_samv71n19.c)
     list(APPEND local_list_include common/syscalls.c)
 endif()
 
 if(${MCU_NAME} MATCHES "^ATSAMV71N19B$")
     set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
     set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
-    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/thirdparty/system_samv71n19b.c)
+    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/system_samv71n19b.c)
     list(APPEND local_list_include common/syscalls.c)
 endif()
 
 if(${MCU_NAME} MATCHES "^ATSAMV71Q20$")
     set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
     set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
-    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/thirdparty/system_samv71q20.c)
+    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/system_samv71q20.c)
     list(APPEND local_list_include common/syscalls.c)
 endif()
 
 if(${MCU_NAME} MATCHES "^ATSAMV71Q20B$")
     set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
     set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
-    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/thirdparty/system_samv71q20b.c)
+    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/system_samv71q20b.c)
     list(APPEND local_list_include common/syscalls.c)
 endif()
 
 if(${MCU_NAME} MATCHES "^ATSAMV71Q21$")
     set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
     set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
-    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/thirdparty/system_samv71q21.c)
+    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/system_samv71q21.c)
     list(APPEND local_list_include common/syscalls.c)
 endif()
 
 if(${MCU_NAME} MATCHES "^ATSAMV71Q21B$")
     set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
     set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
-    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/thirdparty/system_samv71q21b.c)
+    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/system_samv71q21b.c)
     list(APPEND local_list_include common/syscalls.c)
 endif()
 
 if(${MCU_NAME} MATCHES "^ATSAMV71Q19$")
     set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
     set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
-    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/thirdparty/system_samv71q19.c)
+    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/system_samv71q19.c)
     list(APPEND local_list_include common/syscalls.c)
 endif()
 
 if(${MCU_NAME} MATCHES "^ATSAMV71Q19B$")
     set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
     set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
-    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/thirdparty/system_samv71q19b.c)
+    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/system_samv71q19b.c)
     list(APPEND local_list_include common/syscalls.c)
 endif()
 
 if(${MCU_NAME} MATCHES "^ATSAMV71N20$")
     set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
     set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
-    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/thirdparty/system_samv71n20.c)
+    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/system_samv71n20.c)
     list(APPEND local_list_include common/syscalls.c)
 endif()
 
 if(${MCU_NAME} MATCHES "^ATSAMV71N20B$")
     set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
     set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
-    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/thirdparty/system_samv71n20b.c)
+    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/system_samv71n20b.c)
     list(APPEND local_list_include common/syscalls.c)
 endif()
 
 if(${MCU_NAME} MATCHES "^ATSAMV71N21$")
     set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
     set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
-    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/thirdparty/system_samv71n21.c)
+    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/system_samv71n21.c)
     list(APPEND local_list_include common/syscalls.c)
 endif()
 
 if(${MCU_NAME} MATCHES "^ATSAMV71N21B$")
     set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
     set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
-    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/thirdparty/system_samv71n21b.c)
+    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/system_samv71n21b.c)
     list(APPEND local_list_include common/syscalls.c)
 endif()
 
 if(${MCU_NAME} MATCHES "^ATSAMV71J20$")
     set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
     set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
-    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/thirdparty/system_samv71j20.c)
+    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/system_samv71j20.c)
     list(APPEND local_list_include common/syscalls.c)
 endif()
 
 if(${MCU_NAME} MATCHES "^ATSAMV71J20B$")
     set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
     set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
-    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/thirdparty/system_samv71j20b.c)
+    list(APPEND local_list_include system/src/sam/atsam_v71_v70_s70_e70/system_samv71j20b.c)
     list(APPEND local_list_include common/syscalls.c)
 endif()
-
diff --git a/ARM/gcc_clang/cmake/sam/atsamc20_21.cmake b/ARM/gcc_clang/cmake/sam/atsamc20_21.cmake
@@ -0,0 +1,8 @@
+if(${MCU_NAME} MATCHES "^ATSAMC20E15A$|^ATSAMC20E16A$|^ATSAMC20E17A$|^ATSAMC20E18A$|^ATSAMC20G15A$|^ATSAMC20G16A$|^ATSAMC20G17A$|^ATSAMC20G18A$|^ATSAMC20J15A$|^ATSAMC20J16A$|^ATSAMC20J17A$|^ATSAMC20J18A$|^ATSAMC21E15A$|^ATSAMC21E16A$|^ATSAMC21E17A$|^ATSAMC21E18A$|^ATSAMC21G15A$|^ATSAMC21G16A$|^ATSAMC21G17A$|^ATSAMC21G18A$|^ATSAMC21J15A$|^ATSAMC21J16A$|^ATSAMC21J17A$|^ATSAMC21J18A$")
+    set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
+    set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
+    list(APPEND local_list_include system/src/sam/atsamc20_21/system_samc20_21.c)
+    list(APPEND local_list_include common/syscalls.c)
+    list(APPEND local_dir_install system/src/sam/atsamc20_21/thirdparty/${MCU_NAME_FIRST_8_LOWER})
+    set(${thirdpartyInstall} atsamc20_21/thirdparty/${MCU_NAME_FIRST_8_LOWER} PARENT_SCOPE)
+endif()
diff --git a/ARM/gcc_clang/cmake/sam/atsamc20n_21n.cmake b/ARM/gcc_clang/cmake/sam/atsamc20n_21n.cmake
@@ -0,0 +1,8 @@
+if(${MCU_NAME} MATCHES "^ATSAMC20N17A$|^ATSAMC20N18A$|^ATSAMC21N17A$|^ATSAMC21N18A$")
+    set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
+    set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
+    list(APPEND local_list_include system/src/sam/atsamc20n_21n/system_samc20n_21n.c)
+    list(APPEND local_list_include common/syscalls.c)
+    list(APPEND local_dir_install system/src/sam/atsamc20n_21n/thirdparty/${MCU_NAME_FIRST_8_LOWER})
+    set(${thirdpartyInstall} atsamc20n_21n/thirdparty/${MCU_NAME_FIRST_8_LOWER} PARENT_SCOPE)
+endif()
diff --git a/ARM/gcc_clang/cmake/sam/atsamg53.cmake b/ARM/gcc_clang/cmake/sam/atsamg53.cmake
@@ -0,0 +1,17 @@
+if(${MCU_NAME} MATCHES "^ATSAMG53N19A$|^ATSAMG53N19B$")
+    set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
+    set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
+    list(APPEND local_list_include system/src/sam/atsamg53/system_samg53n19.c)
+    list(APPEND local_list_include common/syscalls.c)
+    list(APPEND local_dir_install system/src/sam/atsamg53/thirdparty/${MCU_NAME_FIRST_8_LOWER})
+    set(${thirdpartyInstall} atsamg53/thirdparty/${MCU_NAME_FIRST_8_LOWER} PARENT_SCOPE)
+endif()
+
+if(${MCU_NAME} MATCHES "^ATSAMG53G19A$|^ATSAMG53G19B$")
+    set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
+    set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
+    list(APPEND local_list_include system/src/sam/atsamg53/system_samg53g19.c)
+    list(APPEND local_list_include common/syscalls.c)
+    list(APPEND local_dir_install system/src/sam/atsamg53/thirdparty/${MCU_NAME_FIRST_8_LOWER})
+    set(${thirdpartyInstall} atsamg53/thirdparty/${MCU_NAME_FIRST_8_LOWER} PARENT_SCOPE)
+endif()
diff --git a/ARM/gcc_clang/cmake/sam/atsamg54.cmake b/ARM/gcc_clang/cmake/sam/atsamg54.cmake
@@ -0,0 +1,26 @@
+if(${MCU_NAME} MATCHES "^ATSAMG54J19B$")
+    set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
+    set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
+    list(APPEND local_list_include system/src/sam/atsamg54/system_samg54j19.c)
+    list(APPEND local_list_include common/syscalls.c)
+    list(APPEND local_dir_install system/src/sam/atsamg54/thirdparty/${MCU_NAME_FIRST_8_LOWER})
+    set(${thirdpartyInstall} atsamg54/thirdparty/${MCU_NAME_FIRST_8_LOWER} PARENT_SCOPE)
+endif()
+
+if(${MCU_NAME} MATCHES "^ATSAMG54G19B$")
+    set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
+    set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
+    list(APPEND local_list_include system/src/sam/atsamg54/system_samg54g19.c)
+    list(APPEND local_list_include common/syscalls.c)
+    list(APPEND local_dir_install system/src/sam/atsamg54/thirdparty/${MCU_NAME_FIRST_8_LOWER})
+    set(${thirdpartyInstall} atsamg54/thirdparty/${MCU_NAME_FIRST_8_LOWER} PARENT_SCOPE)
+endif()
+
+if(${MCU_NAME} MATCHES "^ATSAMG54N19B$")
+    set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
+    set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
+    list(APPEND local_list_include system/src/sam/atsamg54/system_samg54n19.c)
+    list(APPEND local_list_include common/syscalls.c)
+    list(APPEND local_dir_install system/src/sam/atsamg54/thirdparty/${MCU_NAME_FIRST_8_LOWER})
+    set(${thirdpartyInstall} atsamg54/thirdparty/${MCU_NAME_FIRST_8_LOWER} PARENT_SCOPE)
+endif()
diff --git a/ARM/gcc_clang/cmake/sam/atsamg55.cmake b/ARM/gcc_clang/cmake/sam/atsamg55.cmake
@@ -0,0 +1,17 @@
+if(${MCU_NAME} MATCHES "^ATSAMG55G19A$|^ATSAMG55G19B$")
+    set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
+    set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
+    list(APPEND local_list_include system/src/sam/atsamg55/system_samg55g19.c)
+    list(APPEND local_list_include common/syscalls.c)
+    list(APPEND local_dir_install system/src/sam/atsamg55/thirdparty/${MCU_NAME_FIRST_8_LOWER})
+    set(${thirdpartyInstall} atsamg55/thirdparty/${MCU_NAME_FIRST_8_LOWER} PARENT_SCOPE)
+endif()
+
+if(${MCU_NAME} MATCHES "^ATSAMG55J19A$|^ATSAMG55J19B$")
+    set(${linkerScript} linker_scripts/${vendor}/${mcu_match}.ld PARENT_SCOPE)
+    set(${startupFile} startup/${vendor}/${mcu_match}.c PARENT_SCOPE)
+    list(APPEND local_list_include system/src/sam/atsamg55/system_samg55j19.c)
+    list(APPEND local_list_include common/syscalls.c)
+    list(APPEND local_dir_install system/src/sam/atsamg55/thirdparty/${MCU_NAME_FIRST_8_LOWER})
+    set(${thirdpartyInstall} atsamg55/thirdparty/${MCU_NAME_FIRST_8_LOWER} PARENT_SCOPE)
+endif()
diff --git a/ARM/gcc_clang/cmake/sam/delays/atsam_d21_da1.cmake b/ARM/gcc_clang/cmake/sam/delays/atsam_d21_da1.cmake
@@ -0,0 +1,3 @@
+if(${MCU_NAME} MATCHES "^ATSAMD21E15$|^ATSAMD21E15L$|^ATSAMD21E16$|^ATSAMD21E16L$|^ATSAMD21E17$|^ATSAMD21E17L$|^ATSAMD21E18$|^ATSAMD21G15$|^ATSAMD21G16$|^ATSAMD21G16L$|^ATSAMD21G17$|^ATSAMD21G17L$|^ATSAMD21G18$|^ATSAMD21J15$|^ATSAMD21J16$|^ATSAMD21J17$|^ATSAMD21J18$|^ATSAMDA1E15B$|^ATSAMDA1E16B$|^ATSAMDA1G14B$|^ATSAMDA1G16B$|^ATSAMDA1J14B$|^ATSAMDA1J15B$")
+    list(APPEND local_list_macros "getClockValue(_clock) (_clock/1000UL/4)")
+endif()