Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 01:35:41 +03:00
Code Issues Wiki Activity

Revert "Update ARM SDK to 11.3rel1" (#12285)

Browse source
This commit is contained in:
Mark Haslinghuis 2023-02-02 11:13:53 +01:00 • committed by GitHub
parent 8ca013dfc5
commit 7207892ab1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

30
make/tools.mk
View file

@ -16,38 +16,36 @@
############################## ##############################
# Set up ARM (STM32) SDK # Set up ARM (STM32) SDK
ARM_SDK_DIR ?= $(TOOLS_DIR)/arm-gnu-toolchain-11.3.rel1 ARM_SDK_DIR ?= $(TOOLS_DIR)/gcc-arm-none-eabi-10.3-2021.10
# 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 ?= 11.3.1 GCC_REQUIRED_VERSION ?= 10.3.1
.PHONY: arm_sdk_version
arm_sdk_version:
$(V1) $(ARM_SDK_PREFIX)gcc --version
## arm_sdk_install : Install Arm SDK ## arm_sdk_install : Install Arm SDK
.PHONY: arm_sdk_install .PHONY: arm_sdk_install
# source: https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads ARM_SDK_URL_BASE := https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.10/gcc-arm-none-eabi-10.3-2021.10
# source: https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads
ifeq ($(OSFAMILY), linux) ifeq ($(OSFAMILY), linux)
ARM_SDK_URL := https://developer.arm.com/-/media/Files/downloads/gnu/11.3.rel1/binrel/arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi.tar.xz?rev=95edb5e17b9d43f28c74ce824f9c6f10&hash=D5ACE3A6F75F603551D7702E00ED7B29 ARM_SDK_URL := $(ARM_SDK_URL_BASE)-x86_64-linux.tar.bz2
ARM_SDK_DIR := $(ARM_SDK_DIR)-x86_64-arm-none-eabi
endif endif
ifeq ($(OSFAMILY), macosx) ifeq ($(OSFAMILY), macosx)
ARM_SDK_URL := https://developer.arm.com/-/media/Files/downloads/gnu/11.3.rel1/binrel/arm-gnu-toolchain-11.3.rel1-darwin-x86_64-arm-none-eabi.tar.xz?rev=0f93cc5b9df1473dabc1f39b06feb468&hash=7DF6BEF69DFDF7226B812B30BF45F552 ARM_SDK_URL := $(ARM_SDK_URL_BASE)-mac.tar.bz2
ARM_SDK_DIR := $(ARM_SDK_DIR)-darwin-x86_64-arm-none-eabi
endif endif
ifeq ($(OSFAMILY), windows) ifeq ($(OSFAMILY), windows)
ARM_SDK_URL := https://developer.arm.com/-/media/Files/downloads/gnu/11.3.rel1/binrel/arm-gnu-toolchain-11.3.rel1-mingw-w64-i686-arm-none-eabi.zip?rev=82f0e95b5a7740d9899e6ce375df8106&hash=E8C79FCFC43534AC1D691CBEE00F34D0 ARM_SDK_URL := $(ARM_SDK_URL_BASE)-win32.zip
ARM_SDK_DIR := $(ARM_SDK_DIR)-mingw-w64-i686-arm-none-eabi
endif endif
ARM_SDK_FILE := $(notdir $(ARM_SDK_URL)) ARM_SDK_FILE := $(notdir $(ARM_SDK_URL))
SDK_INSTALL_MARKER := $(ARM_SDK_DIR)/bin/arm-none-eabi-gcc-$(GCC_REQUIRED_VERSION) SDK_INSTALL_MARKER := $(ARM_SDK_DIR)/bin/arm-none-eabi-gcc-$(GCC_REQUIRED_VERSION)
.PHONY: arm_sdk_version
arm_sdk_version: | $(ARM_SDK_DIR)
$(V1) $(ARM_SDK_DIR)/bin/arm-none-eabi-gcc --version
# order-only prereq on directory existance: # order-only prereq on directory existance:
arm_sdk_install: | $(TOOLS_DIR) arm_sdk_install: | $(TOOLS_DIR)
@ -55,8 +53,8 @@ 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) -xf "$(DL_DIR)/$(ARM_SDK_FILE)" $(V1) tar -C $(TOOLS_DIR) -xjf "$(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