From fd4184c5e9d8a908406bd202afabfa94ef2b78b8 Mon Sep 17 00:00:00 2001 From: Tom Hensel <80815+gretel@users.noreply.github.com> Date: Sun, 14 Jun 2020 16:36:31 +0200 Subject: [PATCH] upgrade toolchain to '2020-q2-update' (#282) * upgrade toolchain to '2020-q2-update' * remove `-update`, https://github.com/fiam/arm-none-eabi-gcc/pull/2#issuecomment-643602074 ; v1.0.2 Co-authored-by: nerdCopter <56646290+nerdCopter@users.noreply.github.com> --- .github/workflows/build.yml | 4 ++-- make/tools.mk | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 287e0b469c..0ac02b8389 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,9 +43,9 @@ jobs: uses: actions/setup-python@v1 - name: Setup Toolchain - uses: fiam/arm-none-eabi-gcc@v1 + uses: fiam/arm-none-eabi-gcc@v1.0.2 with: - release: '9-2019-q4' # The arm-none-eabi-gcc release to use. + release: '9-2020-q2' # The arm-none-eabi-gcc release to use. - name: Get code version id: get_version diff --git a/make/tools.mk b/make/tools.mk index e10ca3dec2..4cca50d560 100644 --- a/make/tools.mk +++ b/make/tools.mk @@ -16,7 +16,11 @@ arm_sdk_version: ## arm_sdk_install : Install Arm SDK .NOTPARALLEL .PHONY: arm_sdk_install -ARM_SDK_URL_BASE := https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/9-2019q4/gcc-arm-none-eabi-9-2019-q4-major +# source: https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads +ARM_SDK_URL_BASE := https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update + +# Set up ARM (STM32) SDK +ARM_SDK_DIR ?= $(TOOLS_DIR)/gcc-arm-none-eabi-9-2020-q2-update # source: https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads ifdef LINUX @@ -33,14 +37,11 @@ endif ARM_SDK_FILE := $(notdir $(ARM_SDK_URL)) -# Set up ARM (STM32) SDK -ARM_SDK_DIR ?= $(TOOLS_DIR)/gcc-arm-none-eabi-9-2019-q4-major - # add toolchain binaries to PATH export PATH := $(ARM_SDK_DIR)/bin:$(PATH) # Checked below, Should match the output of $(shell arm-none-eabi-gcc -dumpversion) -GCC_REQUIRED_VERSION ?= 9.2.1 +GCC_REQUIRED_VERSION ?= 9.3.1 SDK_INSTALL_MARKER := $(ARM_SDK_DIR)/bin/arm-none-eabi-gcc-$(GCC_REQUIRED_VERSION)