From be63bac74bc7139232524ae0a57781c2b47bea6d Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Wed, 5 Oct 2022 23:48:39 +0200
Subject: gcc 10 is not yet supported by chibios

---
 contrib/Makefile | 11 ++++++++---
 defines.mk       |  2 +-
 sdk.cmake        |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/contrib/Makefile b/contrib/Makefile
index 70488a8..4b3285f 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -26,9 +26,14 @@ CHIBIOS_VERSION := 21.11.2
 CHIBIOS_SHA256SUM := ba74eec6230b66d79c0f0a26e9af00ca46756cb47f7b4a229eb228cbff3a8b48
 FMPP_VERSION := 0.9.16
 FMPP_SHA256SUM := 86561e3f3a2ccb436f5f3df88d79a7dad72549a33191901f49d12a38b53759cd
-GCC_VERSION := 10.3-2021.10
+GCC_VERSION := 9-2020-q2-update
+GCC_VERSION_SHORT := 9-2020q2
 GCC_HOST := $(shell uname -m)-$(shell uname | tr '[:upper:]' '[:lower:]')
-GCC_SHA256SUM := 97dbb4f019ad1650b732faffcc881689cedc14e2b7ee863d390e0a41ef16c9a3
+GCC_SHA256SUM := 5adc2ee03904571c2de79d5cfc0f7fe2a5c5f54f44da5b645c17ee57b217f11f
+# GCC_VERSION := 10.3-2021.10
+# GCC_VERSION_SHORT := $(GCC_VERSION)
+# GCC_HOST := $(shell uname -m)-$(shell uname | tr '[:upper:]' '[:lower:]')
+# GCC_SHA256SUM := 97dbb4f019ad1650b732faffcc881689cedc14e2b7ee863d390e0a41ef16c9a3
 
 
 all: download-sdk download-picoprobe download-flash_nuke clone-openocd download-chibios download-gcc
@@ -93,7 +98,7 @@ clean-chibios:
 download-gcc: gcc-arm-none-eabi-${GCC_VERSION}-${GCC_HOST}.tar.bz2
 
 gcc-arm-none-eabi-${GCC_VERSION}-${GCC_HOST}.tar.bz2:
-	wget "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${GCC_VERSION}/$@" -O "$@"
+	wget "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${GCC_VERSION_SHORT}/$@" -O "$@"
 	echo "${GCC_SHA256SUM} $@" | sha256sum -c
 	tar -xjf $@
 
diff --git a/defines.mk b/defines.mk
index 9af1f53..ea70bce 100644
--- a/defines.mk
+++ b/defines.mk
@@ -24,7 +24,7 @@ ifndef SPREADRPPICO_PATH
 SPREADRPPICO_PATH := ..
 endif
 
-TOOLCHAIN_PATH := $(SPREADRPPICO_PATH)/contrib/gcc-arm-none-eabi-10.3-2021.10/bin
+TOOLCHAIN_PATH := $(SPREADRPPICO_PATH)/contrib/gcc-arm-none-eabi-9-2020-q2-update/bin
 CHIBIOS := ../contrib/ChibiOS_21.11.2
 CHIBIOS_CONTRIB := $(CHIBIOS)/community
 OPENOCD := $(SPREADRPPICO_PATH)/contrib/openocd
diff --git a/sdk.cmake b/sdk.cmake
index 77c0098..c4c1362 100644
--- a/sdk.cmake
+++ b/sdk.cmake
@@ -21,6 +21,6 @@
 ##
 
 set(PICO_SDK_PATH ../contrib/pico-sdk-1.4.0)
-SET(PICO_TOOLCHAIN_PATH ../contrib/gcc-arm-none-eabi-10.3-2021.10)
+SET(PICO_TOOLCHAIN_PATH ../contrib/gcc-arm-none-eabi-9-2020-q2-update)
 
 include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
-- 
cgit v1.2.3