From 8c9acccb5f97ae1c24dfa93b71e1dc591161dc2b Mon Sep 17 00:00:00 2001
From: Mark Haslinghuis <mark@numloq.nl>
Date: Mon, 20 Jan 2025 16:53:24 +0100
Subject: [PATCH 1/3] Bump ARM SDK

---
 mk/tools.mk | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/mk/tools.mk b/mk/tools.mk
index 3dc42ab47a..b26d4b83f4 100644
--- a/mk/tools.mk
+++ b/mk/tools.mk
@@ -4,9 +4,9 @@
 #
 # NOTE: These are not tied to the default goals and must be invoked manually
 #
-# ARM SDK Version: 13.3.Rel1
+# ARM SDK Version: 14.2.Rel1
 #
-# Release date: July 04, 2024
+# Release date: December 10, 2024
 #
 ###############################################################
 
@@ -19,24 +19,26 @@
 # Set up ARM (STM32) SDK
 # Checked below, Should match the output of $(shell arm-none-eabi-gcc -dumpversion)
 # must match arm-none-eabi-gcc-<version> file in arm sdk distribution
-GCC_REQUIRED_VERSION ?= 13.3.1
+GCC_REQUIRED_VERSION ?= 14.2.1
+ARM_SDK_VERSION := 14.2.rel1
 
 ## arm_sdk_install   : Install Arm SDK
 .PHONY: arm_sdk_install
 
 # source: https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads
+ARM_BASE_URL := https://developer.arm.com/-/media/Files/downloads/gnu/$(ARM_SDK_VERSION)/binrel/arm-gnu-toolchain-$(ARM_SDK_VERSION)
 ifeq ($(OSFAMILY)-$(ARCHFAMILY), linux-x86_64)
-  ARM_SDK_URL := https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz
-  DL_CHECKSUM = 0601a9588bc5b9c99ad2b56133b7f118
+  ARM_SDK_URL := $(ARM_BASE_URL)-x86_64-arm-none-eabi.tar.xz
+  DL_CHECKSUM = fcdcd7c8d5b22d2d0cc6bf3721686e69
 else ifeq ($(OSFAMILY)-$(ARCHFAMILY), macosx-x86_64)
-  ARM_SDK_URL := https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-darwin-x86_64-arm-none-eabi.tar.xz
-  DL_CHECKSUM = 4bb141e44b831635fde4e8139d470f1f
+  ARM_SDK_URL := $(ARM_BASE_URL)-darwin-x86_64-arm-none-eabi.tar.xz
+  DL_CHECKSUM = d5fb1ae60e4d67eb2986837dbcd6a066
 else ifeq ($(OSFAMILY)-$(ARCHFAMILY), macosx-arm64)
-  ARM_SDK_URL := https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-darwin-arm64-arm-none-eabi.tar.xz
-  DL_CHECKSUM = f1c18320bb3121fa89dca11399273f4e
+  ARM_SDK_URL := $(ARM_BASE_URL)-darwin-arm64-arm-none-eabi.tar.xz
+  DL_CHECKSUM = 40d1c9208aed7fab08b0f27e5383dcef
 else ifeq ($(OSFAMILY), windows)
-  ARM_SDK_URL := https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-mingw-w64-i686-arm-none-eabi.zip
-  DL_CHECKSUM = 39d9882ca0eb475e81170ae826c1435d
+  ARM_SDK_URL := $(ARM_BASE_URL)-mingw-w64-i686-arm-none-eabi.zip
+  DL_CHECKSUM = 42ab20ec8d5c52cbcb07e3fb27791ecd
 else
   $(error No toolchain URL defined for $(OSFAMILY)-$(ARCHFAMILY))
 endif

From edee329097813141a2b6bb8f5be9dd4b0314c800 Mon Sep 17 00:00:00 2001
From: Mark Haslinghuis <mark@numloq.nl>
Date: Mon, 20 Jan 2025 23:10:04 +0100
Subject: [PATCH 2/3] Refactor

---
 mk/tools.mk | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/mk/tools.mk b/mk/tools.mk
index b26d4b83f4..e565c11e96 100644
--- a/mk/tools.mk
+++ b/mk/tools.mk
@@ -27,22 +27,25 @@ ARM_SDK_VERSION := 14.2.rel1
 
 # source: https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads
 ARM_BASE_URL := https://developer.arm.com/-/media/Files/downloads/gnu/$(ARM_SDK_VERSION)/binrel/arm-gnu-toolchain-$(ARM_SDK_VERSION)
+
 ifeq ($(OSFAMILY)-$(ARCHFAMILY), linux-x86_64)
-  ARM_SDK_URL := $(ARM_BASE_URL)-x86_64-arm-none-eabi.tar.xz
-  DL_CHECKSUM = fcdcd7c8d5b22d2d0cc6bf3721686e69
+	ARM_SDK_SUFFIX := -x86_64-arm-none-eabi.tar.xz
+	DL_CHECKSUM = fcdcd7c8d5b22d2d0cc6bf3721686e69
 else ifeq ($(OSFAMILY)-$(ARCHFAMILY), macosx-x86_64)
-  ARM_SDK_URL := $(ARM_BASE_URL)-darwin-x86_64-arm-none-eabi.tar.xz
-  DL_CHECKSUM = d5fb1ae60e4d67eb2986837dbcd6a066
+	ARM_SDK_SUFFIX := -darwin-x86_64-arm-none-eabi.tar.xz
+	DL_CHECKSUM = d5fb1ae60e4d67eb2986837dbcd6a066
 else ifeq ($(OSFAMILY)-$(ARCHFAMILY), macosx-arm64)
-  ARM_SDK_URL := $(ARM_BASE_URL)-darwin-arm64-arm-none-eabi.tar.xz
-  DL_CHECKSUM = 40d1c9208aed7fab08b0f27e5383dcef
+	ARM_SDK_SUFFIX := -darwin-arm64-arm-none-eabi.tar.xz
+	DL_CHECKSUM = 40d1c9208aed7fab08b0f27e5383dcef
 else ifeq ($(OSFAMILY), windows)
-  ARM_SDK_URL := $(ARM_BASE_URL)-mingw-w64-i686-arm-none-eabi.zip
-  DL_CHECKSUM = 42ab20ec8d5c52cbcb07e3fb27791ecd
+	ARM_SDK_SUFFIX := -mingw-w64-i686-arm-none-eabi.zip
+	DL_CHECKSUM = 42ab20ec8d5c52cbcb07e3fb27791ecd
 else
-  $(error No toolchain URL defined for $(OSFAMILY)-$(ARCHFAMILY))
+	$(error No toolchain URL defined for $(OSFAMILY)-$(ARCHFAMILY))
 endif
 
+ARM_SDK_URL := $(ARM_BASE_URL)$(ARM_SDK_SUFFIX)
+
 ARM_SDK_FILE := $(notdir $(ARM_SDK_URL))
 # remove compression suffixes
 ARM_SDK_DIR := $(TOOLS_DIR)/$(patsubst %.zip,%, 	\

From 900d7fabb7827f12854f5d42ebae7d700c80a9f8 Mon Sep 17 00:00:00 2001
From: Mark Haslinghuis <mark@numloq.nl>
Date: Tue, 21 Jan 2025 21:55:45 +0100
Subject: [PATCH 3/3] Move out minus sign from suffix

---
 mk/tools.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mk/tools.mk b/mk/tools.mk
index e565c11e96..389577aeef 100644
--- a/mk/tools.mk
+++ b/mk/tools.mk
@@ -29,22 +29,22 @@ ARM_SDK_VERSION := 14.2.rel1
 ARM_BASE_URL := https://developer.arm.com/-/media/Files/downloads/gnu/$(ARM_SDK_VERSION)/binrel/arm-gnu-toolchain-$(ARM_SDK_VERSION)
 
 ifeq ($(OSFAMILY)-$(ARCHFAMILY), linux-x86_64)
-	ARM_SDK_SUFFIX := -x86_64-arm-none-eabi.tar.xz
+	ARM_SDK_SUFFIX := x86_64-arm-none-eabi.tar.xz
 	DL_CHECKSUM = fcdcd7c8d5b22d2d0cc6bf3721686e69
 else ifeq ($(OSFAMILY)-$(ARCHFAMILY), macosx-x86_64)
-	ARM_SDK_SUFFIX := -darwin-x86_64-arm-none-eabi.tar.xz
+	ARM_SDK_SUFFIX := darwin-x86_64-arm-none-eabi.tar.xz
 	DL_CHECKSUM = d5fb1ae60e4d67eb2986837dbcd6a066
 else ifeq ($(OSFAMILY)-$(ARCHFAMILY), macosx-arm64)
-	ARM_SDK_SUFFIX := -darwin-arm64-arm-none-eabi.tar.xz
+	ARM_SDK_SUFFIX := darwin-arm64-arm-none-eabi.tar.xz
 	DL_CHECKSUM = 40d1c9208aed7fab08b0f27e5383dcef
 else ifeq ($(OSFAMILY), windows)
-	ARM_SDK_SUFFIX := -mingw-w64-i686-arm-none-eabi.zip
+	ARM_SDK_SUFFIX := mingw-w64-i686-arm-none-eabi.zip
 	DL_CHECKSUM = 42ab20ec8d5c52cbcb07e3fb27791ecd
 else
 	$(error No toolchain URL defined for $(OSFAMILY)-$(ARCHFAMILY))
 endif
 
-ARM_SDK_URL := $(ARM_BASE_URL)$(ARM_SDK_SUFFIX)
+ARM_SDK_URL := $(ARM_BASE_URL)-$(ARM_SDK_SUFFIX)
 
 ARM_SDK_FILE := $(notdir $(ARM_SDK_URL))
 # remove compression suffixes