summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rwxr-xr-xutil/chibios_conf_updater.sh103
-rwxr-xr-xutil/install/arch.sh3
-rwxr-xr-xutil/install/debian.sh11
-rwxr-xr-xutil/update_chibios_mirror.sh4
4 files changed, 25 insertions, 96 deletions
diff --git a/util/chibios_conf_updater.sh b/util/chibios_conf_updater.sh
index 5ba8aa677b..a5699ca3cb 100755
--- a/util/chibios_conf_updater.sh
+++ b/util/chibios_conf_updater.sh
@@ -3,6 +3,17 @@
set -eEuo pipefail
umask 022
+#####################
+# You will need to get an older JDK -- JDK 8
+#
+# !!!!!!!! DO NOT INSTALL THIS IF YOU HAVE AN EXISTING JDK OR JRE INSTALLED !!!!!!!!
+#
+# For Debian 10-ish distro's:
+# wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add -
+# sudo add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
+# sudo apt-get update && sudo apt-get install adoptopenjdk-8-hotspot
+
+
sinfo() { echo "$@" >&2 ; }
shead() { sinfo "" ; sinfo "---------------------------------" ; sinfo "-- $@" ; sinfo "---------------------------------" ; }
havecmd() { command command type "${1}" >/dev/null 2>&1 || return 1 ; }
@@ -11,8 +22,6 @@ this_script="$(realpath "${BASH_SOURCE[0]}")"
script_dir="$(realpath "$(dirname "$this_script")")"
qmk_firmware_dir="$(realpath "$script_dir/../")"
-declare -A file_hashes
-
export PATH="$PATH:$script_dir/fmpp/bin"
build_fmpp() {
@@ -38,74 +47,13 @@ find_chibi_files() {
local search_path="$1"
shift
local conditions=( "$@" )
- for file in $(find -L "$search_path" -not -path '*/lib/chibios*' -and -not -path '*/lib/ugfx*' -and -not -path '*/util/*' -and \( "${conditions[@]}" \) | sort) ; do
+ for file in $(find -L "$search_path" -not -path '*/lib/chibios*' -and -not -path '*/util/*' -and \( "${conditions[@]}" \) | sort) ; do
if [ -z "$(grep 'include_next' "$file")" ] ; then
echo $file
fi
done
}
-revert_chibi_files() {
- local search_path="$1"
- shead "Reverting ChibiOS config/board files..."
- for file in $(find_chibi_files "$search_path" -name chconf.h -or -name halconf.h -or -name mcuconf.h -or -name board.c -or -name board.h -or -name board.mk -or -name board.chcfg) ; do
- pushd "$search_path" >/dev/null 2>&1
- local relpath=$(realpath --relative-to="$search_path" "$file")
- git checkout upstream/develop -- "$relpath" || git checkout origin/develop -- "$relpath" || true
- popd >/dev/null 2>&1
- done
-}
-
-populate_file_hashes() {
- local search_path="$1"
- shead "Determining duplicate config/board files..."
- for file in $(find_chibi_files "$search_path" -name chconf.h -or -name halconf.h -or -name mcuconf.h -or -name board.c -or -name board.h) ; do
- local key="file_$(clang-format "$file" | sha1sum | cut -d' ' -f1)"
- local relpath=$(realpath --relative-to="$search_path" "$file")
- file_hashes[$key]="${file_hashes[$key]:-} $relpath"
- done
- for file in $(find_chibi_files "$search_path" -name board.mk -or -name board.chcfg) ; do
- local key="file_$(cat "$file" | sha1sum | cut -d' ' -f1)"
- local relpath=$(realpath --relative-to="$search_path" "$file")
- file_hashes[$key]="${file_hashes[$key]:-} $relpath"
- done
-}
-
-determine_equivalent_files() {
- local search_file="$1"
- for K in "${!file_hashes[@]}"; do
- for V in ${file_hashes[$K]}; do
- if [[ "$V" == "$search_file" ]] ; then
- for V in ${file_hashes[$K]}; do
- echo "$V"
- done
- return 0
- fi
- done
- done
- return 1
-}
-
-deploy_staged_files() {
- shead "Deploying staged files..."
- for file in $(find "$qmk_firmware_dir/util/chibios-upgrade-staging" -type f) ; do
- local relpath=$(realpath --relative-to="$qmk_firmware_dir/util/chibios-upgrade-staging" "$file")
- sinfo "Deploying staged file: $relpath"
- for other in $(determine_equivalent_files "$relpath") ; do
- sinfo " => $other"
- cp "$qmk_firmware_dir/util/chibios-upgrade-staging/$relpath" "$qmk_firmware_dir/$other"
- done
- done
-}
-
-swap_mcuconf_f3xx_f303() {
- shead "Swapping STM32F3xx_MCUCONF -> STM32F303_MCUCONF..."
- for file in $(find_chibi_files "$qmk_firmware_dir" -name mcuconf.h) ; do
- sed -i 's#STM32F3xx_MCUCONF#STM32F303_MCUCONF#g' "$file"
- dos2unix "$file" >/dev/null 2>&1
- done
-}
-
upgrade_conf_files_generic() {
local search_filename="$1"
local update_script="$2"
@@ -150,35 +98,8 @@ upgrade_mcuconf_files() {
popd >/dev/null 2>&1
}
-update_staged_files() {
- shead "Updating staged files with ChibiOS upgraded versions..."
- for file in $(find "$qmk_firmware_dir/util/chibios-upgrade-staging" -type f) ; do
- local relpath=$(realpath --relative-to="$qmk_firmware_dir/util/chibios-upgrade-staging" "$file")
- sinfo "Updating staged file: $relpath"
- cp "$qmk_firmware_dir/$relpath" "$qmk_firmware_dir/util/chibios-upgrade-staging/$relpath"
- done
-}
-
havecmd fmpp || build_fmpp
-revert_chibi_files "$qmk_firmware_dir"
-populate_file_hashes "$qmk_firmware_dir"
-
-shead "Showing duplicate ChibiOS files..."
-for K in "${!file_hashes[@]}"; do
- sinfo ${K#file_}:
- for V in ${file_hashes[$K]}; do
- sinfo " $V"
- done
-done
-
-if [ "${1:-}" == "-r" ] ; then
- exit 0
-fi
-
-swap_mcuconf_f3xx_f303
-deploy_staged_files
upgrade_mcuconf_files
upgrade_chconf_files
upgrade_halconf_files
-update_staged_files
diff --git a/util/install/arch.sh b/util/install/arch.sh
index bef98ac37f..33c39212d3 100755
--- a/util/install/arch.sh
+++ b/util/install/arch.sh
@@ -6,7 +6,8 @@ _qmk_install() {
sudo pacman --needed --noconfirm -S \
base-devel clang diffutils gcc git unzip wget zip python-pip \
avr-binutils arm-none-eabi-binutils arm-none-eabi-gcc \
- arm-none-eabi-newlib avrdude dfu-programmer dfu-util
+ arm-none-eabi-newlib avrdude dfu-programmer dfu-util \
+ riscv64-elf-binutils riscv64-elf-gcc riscv64-elf-newlib
sudo pacman --needed --noconfirm -U https://archive.archlinux.org/packages/a/avr-gcc/avr-gcc-8.3.0-1-x86_64.pkg.tar.xz
sudo pacman --needed --noconfirm -S avr-libc # Must be installed after the above, or it will bring in the latest avr-gcc instead
diff --git a/util/install/debian.sh b/util/install/debian.sh
index 57588e371a..3e02919bdd 100755
--- a/util/install/debian.sh
+++ b/util/install/debian.sh
@@ -11,11 +11,18 @@ _qmk_install_prepare() {
_qmk_install() {
echo "Installing dependencies"
- sudo apt-get -yq install \
+ sudo apt-get --quiet --yes install \
build-essential clang-format diffutils gcc git unzip wget zip \
python3-pip binutils-avr gcc-avr avr-libc binutils-arm-none-eabi \
gcc-arm-none-eabi libnewlib-arm-none-eabi avrdude dfu-programmer \
dfu-util teensy-loader-cli libhidapi-hidraw0 libusb-dev
- python3 -m pip install --user -r $QMK_FIRMWARE_DIR/requirements.txt
+ # RISC-V toolchains with picolibc support are only available for distributions based on Debian 11+.
+ if sudo apt-get install --simulate --quiet --yes picolibc-riscv64-unknown-elf gcc-riscv64-unknown-elf binutils-riscv64-unknown-elf > /dev/null 2>&1; then
+ sudo apt-get --quiet --yes install picolibc-riscv64-unknown-elf \
+ gcc-riscv64-unknown-elf \
+ binutils-riscv64-unknown-elf
+ fi
+
+ python3 -m pip install --user -r "$QMK_FIRMWARE_DIR"/requirements.txt
}
diff --git a/util/update_chibios_mirror.sh b/util/update_chibios_mirror.sh
index 83aee22817..0bf648ebfd 100755
--- a/util/update_chibios_mirror.sh
+++ b/util/update_chibios_mirror.sh
@@ -7,10 +7,10 @@
chibios_branches="trunk stable_20.3.x stable_21.6.x"
# The ChibiOS tags to mirror
-chibios_tags="ver20.3.1 ver20.3.2 ver20.3.3 ver21.6.0"
+chibios_tags="ver20.3.1 ver20.3.2 ver20.3.3 ver20.3.4 ver21.6.0"
# The ChibiOS-Contrib branches to mirror
-contrib_branches="chibios-20.3.x"
+contrib_branches="chibios-20.3.x chibios-21.6.x"
################################
# Actions