Merge branch 'ArteryTek_master' into support_3rd_chip

# Conflicts:
#	.github/workflows/snapshot.yml
#	src/flash/nor/drivers.c

Author: talpachen

contrib/60-openocd.rules

@@ -262,4 +262,7 @@ ATTRS{idVendor}=="c251", ATTRS{idProduct}=="2750", MODE="660", GROUP="plugdev",
 # CMSIS-DAP compatible adapters
 ATTRS{product}=="*CMSIS-DAP*", MODE="660", GROUP="plugdev", TAG+="uaccess"
 
+# Artery ATLINK
+ATTRS{idVendor}=="2e3c", ATTRS{idProduct}=="f000, MODE="660", GROUP="plugdev", TAG+="uaccess"
+
 LABEL="openocd_rules_end"

src/flash/nor/Makefile.am

@@ -85,7 +85,10 @@ NOR_DRIVERS = \
 	%D%/w600.c \
 	%D%/xcf.c \
 	%D%/xmc1xxx.c \
-	%D%/xmc4xxx.c
+	%D%/xmc4xxx.c \
+	%D%/at32f4xx.c \
+	%D%/at32xx.c \
+	%D%/at32qspi.c
 
 NORHEADERS = \
 	%D%/core.h \
@@ -102,4 +105,5 @@ NORHEADERS = \
 	%D%/spi.h \
 	%D%/stm32l4x.h \
 	%D%/stmqspi.h \
-	%D%/msp432.h
+	%D%/msp432.h \
+	%D%/at32qspi.h