From 482c9fbbf28c7e871145cacd01f22c9edf7d1ddf Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 1 Oct 2020 04:10:02 +1000
Subject: MSYS2: Switch to arm-none-eabi-gcc package (#10421)

---
 util/activate_msys2.sh |  1 -
 util/msys2_install.sh  | 47 ++++++-----------------------------------------
 2 files changed, 6 insertions(+), 42 deletions(-)

(limited to 'util')

diff --git a/util/activate_msys2.sh b/util/activate_msys2.sh
index 3fc149dbb6..b37bee8597 100755
--- a/util/activate_msys2.sh
+++ b/util/activate_msys2.sh
@@ -3,7 +3,6 @@
 function export_variables {
     local util_dir=~/qmk_utils
     export PATH=$PATH:$util_dir
-    export PATH=$PATH:$util_dir/gcc-arm-none-eabi/bin
 }
 
 export_variables
diff --git a/util/msys2_install.sh b/util/msys2_install.sh
index b92199647d..c223e52fae 100755
--- a/util/msys2_install.sh
+++ b/util/msys2_install.sh
@@ -2,53 +2,18 @@
 
 dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
 download_dir=~/qmk_utils
-armtools=gcc-arm-none-eabi
 util_dir=$(dirname "$0")
 
 echo "Installing dependencies needed for the installation"
-pacman --needed --noconfirm --disable-download-timeout -Sy base-devel mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang git mingw-w64-x86_64-python3-pip unzip
+pacman --needed --noconfirm --disable-download-timeout -Sy \
+    base-devel mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang git unzip \
+    mingw-w64-x86_64-python-pip \
+    mingw-w64-x86_64-avr-binutils mingw-w64-x86_64-avr-gcc mingw-w64-x86_64-avr-libc \
+    mingw-w64-x86_64-arm-none-eabi-binutils mingw-w64-x86_64-arm-none-eabi-gcc mingw-w64-x86_64-arm-none-eabi-newlib \
+    mingw-w64-x86_64-avrdude mingw-w64-x86_64-bootloadhid mingw-w64-x86_64-dfu-programmer mingw-w64-x86_64-dfu-util mingw-w64-x86_64-teensy-loader-cli
 
 source "$dir/win_shared_install.sh"
 
-function install_avr {
-    pacman --needed --noconfirm --disable-download-timeout -S \
-        mingw-w64-x86_64-avr-binutils mingw-w64-x86_64-avr-gcc mingw-w64-x86_64-avr-libc \
-        mingw-w64-x86_64-avrdude mingw-w64-x86_64-bootloadhid mingw-w64-x86_64-dfu-programmer mingw-w64-x86_64-teensy-loader-cli
-}
-
-function install_arm {
-    rm -f -r "$armtools"
-    wget -O gcc-arm-none-eabi-8-2019-q3-update-win32.zip "https://developer.arm.com/-/media/Files/downloads/gnu-rm/8-2019q3/RC1.1/gcc-arm-none-eabi-8-2019-q3-update-win32.zip"
-    echo "Extracting ARM toolchain..."
-    unzip -q -d gcc-arm-none-eabi gcc-arm-none-eabi-8-2019-q3-update-win32.zip
-    rm gcc-arm-none-eabi-8-2019-q3-update-win32.zip
-
-    pacman --needed --noconfirm --disable-download-timeout -S mingw-w64-x86_64-dfu-util
-}
-
-pushd "$download_dir"
-
-install_avr
-
-if [ ! -d "$armtools" ]; then
-    echo
-    echo "The ARM toolchain is not installed."
-    echo "This is needed for building ARM based keyboards."
-    install_arm
-else
-    while true; do
-        echo
-        echo "The ARM toolchain is already installed"
-        read -p "Do you want to reinstall? (Y/N) " res
-        case $res in
-            [Yy]* ) install_arm; break;;
-            [Nn]* ) break;;
-            * ) echo "Invalid answer";;
-        esac
-    done
-fi
-popd
-
 pip3 install -r "${util_dir}/../requirements.txt"
 
 cp -f "$dir/activate_msys2.sh" "$download_dir/"
-- 
cgit v1.2.1