From 7f960233751b17b27da516429f3cb26fad5d7fcc Mon Sep 17 00:00:00 2001 From: strahi-linux Date: Mon, 17 Jun 2024 11:21:58 +0200 Subject: [PATCH] SAM packages checked. --- ARM/gcc_clang/cmake/coreUtils.cmake | 2 ++ ARM/gcc_clang/cmake/sam/atsamg51.cmake | 17 ----------------- .../sam/delays/{atsamg51.cmake => samg51.cmake} | 0 ARM/gcc_clang/cmake/sam/samg51.cmake | 17 +++++++++++++++++ .../def/{ATSAMG51G18A.json => SAMG51G18A.json} | 0 .../def/{ATSAMG51N18A.json => SAMG51N18A.json} | 0 .../sam/{atsamg51 => samg51}/system_samg51g18.c | 0 .../sam/{atsamg51 => samg51}/system_samg51n18.c | 0 .../thirdparty/samg51}/component/adc.h | 0 .../thirdparty/samg51}/component/chipid.h | 0 .../thirdparty/samg51}/component/efc.h | 0 .../thirdparty/samg51}/component/gpbr.h | 0 .../thirdparty/samg51}/component/matrix.h | 0 .../thirdparty/samg51}/component/mem2mem.h | 0 .../thirdparty/samg51}/component/pdc.h | 0 .../thirdparty/samg51}/component/pio.h | 0 .../thirdparty/samg51}/component/pmc.h | 0 .../thirdparty/samg51}/component/rstc.h | 0 .../thirdparty/samg51}/component/rtc.h | 0 .../thirdparty/samg51}/component/rtt.h | 0 .../thirdparty/samg51}/component/spi.h | 0 .../thirdparty/samg51}/component/supc.h | 0 .../thirdparty/samg51}/component/tc.h | 0 .../thirdparty/samg51}/component/twi.h | 0 .../thirdparty/samg51}/component/twihs.h | 0 .../thirdparty/samg51}/component/uart.h | 0 .../thirdparty/samg51}/component/usart.h | 0 .../thirdparty/samg51}/component/wdt.h | 0 .../thirdparty/samg51}/instance/adc.h | 0 .../thirdparty/samg51}/instance/chipid.h | 0 .../thirdparty/samg51}/instance/efc.h | 0 .../thirdparty/samg51}/instance/gpbr.h | 0 .../thirdparty/samg51}/instance/matrix.h | 0 .../thirdparty/samg51}/instance/mem2mem.h | 0 .../thirdparty/samg51}/instance/pioa.h | 0 .../thirdparty/samg51}/instance/piob.h | 0 .../thirdparty/samg51}/instance/pmc.h | 0 .../thirdparty/samg51}/instance/rstc.h | 0 .../thirdparty/samg51}/instance/rtc.h | 0 .../thirdparty/samg51}/instance/rtt.h | 0 .../thirdparty/samg51}/instance/spi.h | 0 .../thirdparty/samg51}/instance/supc.h | 0 .../thirdparty/samg51}/instance/tc0.h | 0 .../thirdparty/samg51}/instance/twi0.h | 0 .../thirdparty/samg51}/instance/twi1.h | 0 .../thirdparty/samg51}/instance/twi2.h | 0 .../thirdparty/samg51}/instance/uart0.h | 0 .../thirdparty/samg51}/instance/uart1.h | 0 .../thirdparty/samg51}/instance/usart.h | 0 .../thirdparty/samg51}/instance/wdt.h | 0 .../thirdparty/samg51}/pio/samg51g18.h | 0 .../thirdparty/samg51}/pio/samg51n18.h | 0 scripts/package.py | 8 ++++---- 53 files changed, 23 insertions(+), 21 deletions(-) delete mode 100644 ARM/gcc_clang/cmake/sam/atsamg51.cmake rename ARM/gcc_clang/cmake/sam/delays/{atsamg51.cmake => samg51.cmake} (100%) create mode 100644 ARM/gcc_clang/cmake/sam/samg51.cmake rename ARM/gcc_clang/def/{ATSAMG51G18A.json => SAMG51G18A.json} (100%) rename ARM/gcc_clang/def/{ATSAMG51N18A.json => SAMG51N18A.json} (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51 => samg51}/system_samg51g18.c (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51 => samg51}/system_samg51n18.c (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/component/adc.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/component/chipid.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/component/efc.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/component/gpbr.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/component/matrix.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/component/mem2mem.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/component/pdc.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/component/pio.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/component/pmc.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/component/rstc.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/component/rtc.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/component/rtt.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/component/spi.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/component/supc.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/component/tc.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/component/twi.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/component/twihs.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/component/uart.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/component/usart.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/component/wdt.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/instance/adc.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/instance/chipid.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/instance/efc.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/instance/gpbr.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/instance/matrix.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/instance/mem2mem.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/instance/pioa.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/instance/piob.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/instance/pmc.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/instance/rstc.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/instance/rtc.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/instance/rtt.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/instance/spi.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/instance/supc.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/instance/tc0.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/instance/twi0.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/instance/twi1.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/instance/twi2.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/instance/uart0.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/instance/uart1.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/instance/usart.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/instance/wdt.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/pio/samg51g18.h (100%) rename ARM/gcc_clang/system/src/sam/{atsamg51/thirdparty/atsamg51 => samg51/thirdparty/samg51}/pio/samg51n18.h (100%) diff --git a/ARM/gcc_clang/cmake/coreUtils.cmake b/ARM/gcc_clang/cmake/coreUtils.cmake index 2eb59b633..3968df332 100644 --- a/ARM/gcc_clang/cmake/coreUtils.cmake +++ b/ARM/gcc_clang/cmake/coreUtils.cmake @@ -199,6 +199,8 @@ function(core_files_set fileListInclude fileDirInclude fileListInstall linkerScr 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}) diff --git a/ARM/gcc_clang/cmake/sam/atsamg51.cmake b/ARM/gcc_clang/cmake/sam/atsamg51.cmake deleted file mode 100644 index b27b9c884..000000000 --- a/ARM/gcc_clang/cmake/sam/atsamg51.cmake +++ /dev/null @@ -1,17 +0,0 @@ -if(${MCU_NAME} MATCHES "^SAMG51N18A$") - 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/atsamg51/system_samg51n18.c) - list(APPEND local_list_include common/syscalls.c) - list(APPEND local_dir_install system/src/sam/atsamg51/thirdparty/${MCU_NAME_FIRST_8_LOWER}) - set(${thirdpartyInstall} atsamg51/thirdparty/${MCU_NAME_FIRST_8_LOWER} PARENT_SCOPE) -endif() - -if(${MCU_NAME} MATCHES "^SAMG51G18A$") - 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/atsamg51/system_samg51g18.c) - list(APPEND local_list_include common/syscalls.c) - list(APPEND local_dir_install system/src/sam/atsamg51/thirdparty/${MCU_NAME_FIRST_8_LOWER}) - set(${thirdpartyInstall} atsamg51/thirdparty/${MCU_NAME_FIRST_8_LOWER} PARENT_SCOPE) -endif() diff --git a/ARM/gcc_clang/cmake/sam/delays/atsamg51.cmake b/ARM/gcc_clang/cmake/sam/delays/samg51.cmake similarity index 100% rename from ARM/gcc_clang/cmake/sam/delays/atsamg51.cmake rename to ARM/gcc_clang/cmake/sam/delays/samg51.cmake diff --git a/ARM/gcc_clang/cmake/sam/samg51.cmake b/ARM/gcc_clang/cmake/sam/samg51.cmake new file mode 100644 index 000000000..6892698c5 --- /dev/null +++ b/ARM/gcc_clang/cmake/sam/samg51.cmake @@ -0,0 +1,17 @@ +if(${MCU_NAME} MATCHES "^SAMG51N18A$") + 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/samg51/system_samg51n18.c) + list(APPEND local_list_include common/syscalls.c) + list(APPEND local_dir_install system/src/sam/samg51/thirdparty/${MCU_NAME_FIRST_6_LOWER}) + set(${thirdpartyInstall} samg51/thirdparty/${MCU_NAME_FIRST_6_LOWER} PARENT_SCOPE) +endif() + +if(${MCU_NAME} MATCHES "^SAMG51G18A$") + 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/samg51/system_samg51g18.c) + list(APPEND local_list_include common/syscalls.c) + list(APPEND local_dir_install system/src/sam/samg51/thirdparty/${MCU_NAME_FIRST_6_LOWER}) + set(${thirdpartyInstall} samg51/thirdparty/${MCU_NAME_FIRST_6_LOWER} PARENT_SCOPE) +endif() diff --git a/ARM/gcc_clang/def/ATSAMG51G18A.json b/ARM/gcc_clang/def/SAMG51G18A.json similarity index 100% rename from ARM/gcc_clang/def/ATSAMG51G18A.json rename to ARM/gcc_clang/def/SAMG51G18A.json diff --git a/ARM/gcc_clang/def/ATSAMG51N18A.json b/ARM/gcc_clang/def/SAMG51N18A.json similarity index 100% rename from ARM/gcc_clang/def/ATSAMG51N18A.json rename to ARM/gcc_clang/def/SAMG51N18A.json diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/system_samg51g18.c b/ARM/gcc_clang/system/src/sam/samg51/system_samg51g18.c similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/system_samg51g18.c rename to ARM/gcc_clang/system/src/sam/samg51/system_samg51g18.c diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/system_samg51n18.c b/ARM/gcc_clang/system/src/sam/samg51/system_samg51n18.c similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/system_samg51n18.c rename to ARM/gcc_clang/system/src/sam/samg51/system_samg51n18.c diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/adc.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/adc.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/adc.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/adc.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/chipid.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/chipid.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/chipid.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/chipid.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/efc.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/efc.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/efc.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/efc.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/gpbr.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/gpbr.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/gpbr.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/gpbr.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/matrix.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/matrix.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/matrix.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/matrix.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/mem2mem.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/mem2mem.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/mem2mem.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/mem2mem.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/pdc.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/pdc.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/pdc.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/pdc.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/pio.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/pio.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/pio.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/pio.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/pmc.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/pmc.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/pmc.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/pmc.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/rstc.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/rstc.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/rstc.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/rstc.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/rtc.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/rtc.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/rtc.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/rtc.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/rtt.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/rtt.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/rtt.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/rtt.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/spi.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/spi.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/spi.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/spi.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/supc.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/supc.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/supc.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/supc.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/tc.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/tc.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/tc.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/tc.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/twi.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/twi.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/twi.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/twi.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/twihs.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/twihs.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/twihs.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/twihs.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/uart.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/uart.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/uart.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/uart.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/usart.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/usart.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/usart.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/usart.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/wdt.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/wdt.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/component/wdt.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/component/wdt.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/adc.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/adc.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/adc.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/adc.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/chipid.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/chipid.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/chipid.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/chipid.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/efc.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/efc.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/efc.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/efc.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/gpbr.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/gpbr.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/gpbr.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/gpbr.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/matrix.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/matrix.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/matrix.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/matrix.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/mem2mem.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/mem2mem.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/mem2mem.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/mem2mem.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/pioa.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/pioa.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/pioa.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/pioa.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/piob.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/piob.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/piob.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/piob.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/pmc.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/pmc.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/pmc.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/pmc.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/rstc.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/rstc.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/rstc.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/rstc.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/rtc.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/rtc.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/rtc.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/rtc.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/rtt.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/rtt.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/rtt.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/rtt.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/spi.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/spi.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/spi.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/spi.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/supc.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/supc.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/supc.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/supc.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/tc0.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/tc0.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/tc0.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/tc0.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/twi0.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/twi0.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/twi0.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/twi0.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/twi1.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/twi1.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/twi1.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/twi1.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/twi2.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/twi2.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/twi2.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/twi2.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/uart0.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/uart0.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/uart0.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/uart0.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/uart1.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/uart1.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/uart1.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/uart1.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/usart.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/usart.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/usart.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/usart.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/wdt.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/wdt.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/instance/wdt.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/instance/wdt.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/pio/samg51g18.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/pio/samg51g18.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/pio/samg51g18.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/pio/samg51g18.h diff --git a/ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/pio/samg51n18.h b/ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/pio/samg51n18.h similarity index 100% rename from ARM/gcc_clang/system/src/sam/atsamg51/thirdparty/atsamg51/pio/samg51n18.h rename to ARM/gcc_clang/system/src/sam/samg51/thirdparty/samg51/pio/samg51n18.h diff --git a/scripts/package.py b/scripts/package.py index f0cd8ed4d..681e37bfd 100644 --- a/scripts/package.py +++ b/scripts/package.py @@ -44,7 +44,7 @@ def parse_files_for_paths(cmake_files, source_dir, isGCC=None): if isGCC and 'list(APPEND local_list_include' in line: systemPath = line.split()[-1][:-1].replace("${vendor}", vendor) - if 'doc_ds' in systemPath: + if 'doc_ds' in systemPath or ('sam' in systemPath and re.search('^(at)?sam.+$', file_name)): systemPath = os.path.dirname(systemPath) systemPath = os.path.join(source_dir, systemPath) paths[file_name]['files'].add(systemPath) @@ -576,7 +576,7 @@ async def package_asset(source_dir, output_dir, arch, entry_name, token, repo, t version = get_version_based_on_hash(archiveName, tag_name.replace("v", ""), archiveHash, current_metadata) # Add to packages list name_without_extension = os.path.splitext(os.path.basename(archiveName))[0] - + packages.append({"name" : name_without_extension, "display_name": displayName, "version" : version, "hash" :archiveHash, "vendor" : "MIKROE", "type" : "mcu", "hidden" : False, 'install_location': install_location}) package_changed = (version == tag_name.replace("v", "")) @@ -607,7 +607,7 @@ async def package_asset(source_dir, output_dir, arch, entry_name, token, repo, t 'package_changed': package_changed, 'install_location': install_location } - + resp = es.index(index=index_name, doc_type='necto_package', id=name_without_extension, body=doc) print(f"INDEX RESPONSE: {resp}") @@ -717,7 +717,7 @@ async def main(token, repo, tag_name): # Exit if it fails 10 times, something is wrong with the server raise ValueError("Connection to ES failed!") num_of_retries += 1 - + time.sleep(30) index_name = os.environ['ES_INDEX']