drop SD in linker name

Author: hathach

.github/workflows/githubci.yml

@@ -24,9 +24,6 @@ jobs:
     - name: Install Toolchains
       run: |
         pip3 install adafruit-nrfutil uritemplate requests intelhex
-        #wget https://www.nordicsemi.com/api/sitecore/Products/DownloadPlatform --post-data=fileid=8F19D314130548209E75EFFADD9348DB -O cli-tools.tar
-        #tar -xv -f cli-tools.tar
-        #echo "::add-path::$GITHUB_WORKSPACE/mergehex"
         npm install --global xpm
         xpm install --global @xpack-dev-tools/arm-none-eabi-gcc@latest
         echo "::add-path::`echo $HOME/opt/xPacks/@xpack-dev-tools/arm-none-eabi-gcc/*/.content/bin`"

Makefile

@@ -19,8 +19,8 @@ SD_HEX       = $(SD_PATH)/$(SD_FILENAME)_softdevice.hex
 
 MBR_HEX			 = lib/softdevice/mbr/hex/mbr_nrf52_2.4.1_mbr.hex
 
-# linker by MCU and SoftDevice eg. nrf52840_s140_v6.ld
-LD_FILE      = linker/$(MCU_SUB_VARIANT)_$(SD_NAME)_v$(word 1, $(subst ., ,$(SD_VERSION))).ld
+# linker by MCU eg. nrf52840.ld
+LD_FILE      = linker/$(MCU_SUB_VARIANT).ld
 
 GIT_VERSION = $(shell git describe --dirty --always --tags)
 GIT_SUBMODULE_VERSIONS = $(shell git submodule status | cut -d' ' -f3,4 | paste -s -d" " -)

linker/nrf52_s132_v6.ld renamed to linker/nrf52.ld

@@ -56,9 +56,10 @@
         fail_count += 1
 
     for entry in os.scandir("_build/build-{}".format(board)):
-        for extension in ["zip", "hex"]:
-            if entry.name.endswith(extension) and "nosd" not in entry.name:
-                shutil.copy(entry.path, bin_directory)
+        for extension in ["zip", "hex", "uf2"]:
+            if entry.name.endswith(extension):
+                if ("nosd" in entry.name) or ("s140" in entry.name) or ("s132" in entry.name):
+                    shutil.copy(entry.path, bin_directory)
 
     print(build_format.format(board, success, "{:.2f}s".format(build_duration), flash_size, sram_size))