Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-25 17:25:20 +03:00
Code Issues Wiki Activity

Merge pull request #11680 from haslinghuis/update-arm-sdk

Browse source 
Update ARM SDK to 11.2-2022
This commit is contained in:
J Blackman 2022-07-11 09:53:00 +10:00 • committed by GitHub
commit a100e68dbc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
make/tools.mk
View file

@ -14,9 +14,9 @@
############################## ##############################
# Set up ARM (STM32) SDK # Set up ARM (STM32) SDK
ARM_SDK_DIR ?= $(TOOLS_DIR)/gcc-arm-none-eabi-9-2020-q2-update ARM_SDK_DIR ?= $(TOOLS_DIR)/gcc-arm-11.2-2022.02-x86_64-arm-none-eabi
# Checked below, Should match the output of $(shell arm-none-eabi-gcc -dumpversion) # Checked below, Should match the output of $(shell arm-none-eabi-gcc -dumpversion)
GCC_REQUIRED_VERSION ?= 9.3.1 GCC_REQUIRED_VERSION ?= 11.2
.PHONY: arm_sdk_version .PHONY: arm_sdk_version
@ -26,19 +26,18 @@ arm_sdk_version:
## arm_sdk_install : Install Arm SDK ## arm_sdk_install : Install Arm SDK
.PHONY: arm_sdk_install .PHONY: arm_sdk_install
ARM_SDK_URL_BASE := https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update # source: https://developer.arm.com/downloads/-/gnu-rm
# source: https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads
ifeq ($(OSFAMILY), linux) ifeq ($(OSFAMILY), linux)
ARM_SDK_URL := $(ARM_SDK_URL_BASE)-x86_64-linux.tar.bz2 ARM_SDK_URL := https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-arm-none-eabi.tar.xz
endif endif
ifeq ($(OSFAMILY), macosx) ifeq ($(OSFAMILY), macosx)
ARM_SDK_URL := $(ARM_SDK_URL_BASE)-mac.tar.bz2 ARM_SDK_URL := https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-darwin-x86_64-arm-none-eabi.tar.xz
endif endif
ifeq ($(OSFAMILY), windows) ifeq ($(OSFAMILY), windows)
ARM_SDK_URL := $(ARM_SDK_URL_BASE)-win32.zip ARM_SDK_URL := https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-mingw-w64-i686-arm-none-eabi.zip
endif endif
ARM_SDK_FILE := $(notdir $(ARM_SDK_URL)) ARM_SDK_FILE := $(notdir $(ARM_SDK_URL))
@ -53,7 +52,7 @@ arm_sdk_install: arm_sdk_download $(SDK_INSTALL_MARKER)
$(SDK_INSTALL_MARKER): $(SDK_INSTALL_MARKER):
ifneq ($(OSFAMILY), windows) ifneq ($(OSFAMILY), windows)
# binary only release so just extract it # binary only release so just extract it
$(V1) tar -C $(TOOLS_DIR) -xjf "$(DL_DIR)/$(ARM_SDK_FILE)" $(V1) tar -C $(TOOLS_DIR) -xf "$(DL_DIR)/$(ARM_SDK_FILE)"
else else
$(V1) unzip -q -d $(ARM_SDK_DIR) "$(DL_DIR)/$(ARM_SDK_FILE)" $(V1) unzip -q -d $(ARM_SDK_DIR) "$(DL_DIR)/$(ARM_SDK_FILE)"
endif endif