Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update gcc/gdb version #548

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@ workspace.code-workspace
*.pro.shared

.vscode
*.log
null.d
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is null.d?

Copy link
Contributor Author

@Teslafly Teslafly Nov 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's generated by the makefile extension.
https://marketplace.visualstudio.com/items?itemName=ms-vscode.makefile-tools

I can't figure out how to suppress it's generation so it goes into the gitignore.

Copy link
Contributor

@kalvdans kalvdans Nov 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't find any reference to null.d on the help page. It is strange that they choose NUL.D is a reserved filename on msdos / command.com. https://answers.microsoft.com/en-us/windows/forum/all/unable-to-rename-a-folder-to-com-errorthe/ff48c793-ab97-4881-952a-df195321c11c

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah. i haven't been able to figure it out. i just know it gets generated when they generate the list of make options. and it's not consistent either.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove from PR then, and complain to microsoft :)

nul.d
18 changes: 9 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -73,37 +73,37 @@ endif
##############################
.PHONY: help
help:
@echo
@echo ""
@echo " This Makefile is known to work on Linux and Mac in a standard shell environment."
@echo
@echo ""
@echo " Here is a summary of the available targets:"
@echo
@echo ""
@echo " [Tool Installers]"
@echo " arm_sdk_install - Install the GNU ARM gcc toolchain"
@echo " qt_install - Install the all tools for Qt"
@echo
@echo ""
@echo " [Big Hammer]"
@echo " all_fw - Build firmware for all boards"
@echo " all_fw_package - Packaage firmware for boards in package list"
@echo
@echo ""
@echo " [Unit Tests]"
@echo " all_ut - Build all unit tests"
@echo " all_ut_xml - Run all unit tests and capture all XML output to files"
@echo " all_ut_run - Run all unit tests and dump XML output to console"
@echo
@echo ""
@echo " [Firmware]"
@echo " fw - Build firmware for default target"
@echo " supported boards are: $(ALL_BOARD_NAMES)"
@echo " fw_<board> - Build firmware for target <board>"
@echo " PROJECT=<target> fw - Build firmware for <target>"
@echo " fw_<board>_clean - Remove firmware for <board>"
@echo " fw_<board>_flash - Use OpenOCD + SWD/JTAG to write firmware to <target>"
@echo
@echo ""
@echo " Hint: Add V=1 to your command line to see verbose build output."
@echo
@echo ""
@echo " Note: All tools will be installed into $(TOOLS_DIR)"
@echo " All build output will be placed in $(BUILD_DIR)"
@echo
@echo ""


$(DL_DIR):
Expand Down
10 changes: 5 additions & 5 deletions make/tools.mk
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@
####################
# ARM (Cortex) SDK #
####################
ARM_SDK_DIR := $(TOOLS_DIR)/gcc-arm-none-eabi-7-2018-q2-update
ARM_SDK_DIR := $(TOOLS_DIR)/gcc-arm-none-eabi-10.3-2021.10

.PHONY: arm_sdk_install
ifdef LINUX
arm_sdk_install: ARM_SDK_URL := https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2
arm_sdk_install: ARM_SDK_URL := https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.10/gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2
endif

ifdef MACOS
arm_sdk_install: ARM_SDK_URL := https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-mac.tar.bz2
arm_sdk_install: ARM_SDK_URL := https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.10/gcc-arm-none-eabi-10.3-2021.10-mac.tar.bz2
endif

ifdef WINDOWS
arm_sdk_install: ARM_SDK_URL := https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-win32.zip
arm_sdk_install: ARM_SDK_URL := https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.10/gcc-arm-none-eabi-10.3-2021.10-win32.zip
endif

arm_sdk_install: ARM_SDK_FILE := $(notdir $(ARM_SDK_URL))
Expand All @@ -38,7 +38,7 @@ ifneq ($(OSFAMILY), windows)
$(V1) tar -C $(TOOLS_DIR) -xjf "$(DL_DIR)/$(ARM_SDK_FILE)"
else
$(V1) curl --continue - --location --insecure --output "$(DL_DIR)/$(ARM_SDK_FILE)" "$(ARM_SDK_URL)"
$(V1) powershell -noprofile -command Expand-Archive -DestinationPath $(ARM_SDK_DIR) -LiteralPath "$(DL_DIR)/$(ARM_SDK_FILE)"
$(V1) powershell -noprofile -command Expand-Archive -DestinationPath $(TOOLS_DIR) -LiteralPath "$(DL_DIR)/$(ARM_SDK_FILE)"

endif

Expand Down