aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2020-12-04 10:45:39 +1100
committerGitHub <noreply@github.com>2020-12-04 10:45:39 +1100
commit4444f3cc55f246e484c6893f88d891c4c00c2166 (patch)
tree1f868d1744e85b561675e884c9718cac4277c0ca /util
parent7e2ba2784e8848f65c8385806fb1a2cdbe13a0cc (diff)
downloadqmk_firmware-4444f3cc55f246e484c6893f88d891c4c00c2166.tar.gz
qmk_firmware-4444f3cc55f246e484c6893f88d891c4c00c2166.zip
Disable almost all ChibiOS subsystems in default configs (#11111)
* Disable almost all ChibiOS subsystems. * Modify ChibiOS config updater script to fixup mcuconf include, use develop as base instead of master. * Add default early-init bootloader to F042/F072. * Back to 100k freq.
Diffstat (limited to 'util')
-rwxr-xr-xutil/chibios_conf_updater.sh (renamed from util/chibios-upgrader.sh)10
1 files changed, 9 insertions, 1 deletions
diff --git a/util/chibios-upgrader.sh b/util/chibios_conf_updater.sh
index ebc12abe7..70bd80da1 100755
--- a/util/chibios-upgrader.sh
+++ b/util/chibios_conf_updater.sh
@@ -51,7 +51,7 @@ revert_chibi_files() {
51 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 51 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
52 pushd "$search_path" >/dev/null 2>&1 52 pushd "$search_path" >/dev/null 2>&1
53 local relpath=$(realpath --relative-to="$search_path" "$file") 53 local relpath=$(realpath --relative-to="$search_path" "$file")
54 git checkout upstream/master -- "$relpath" || git checkout origin/master -- "$relpath" || true 54 git checkout upstream/develop -- "$relpath" || git checkout origin/develop -- "$relpath" || true
55 popd >/dev/null 2>&1 55 popd >/dev/null 2>&1
56 done 56 done
57} 57}
@@ -132,6 +132,14 @@ upgrade_chconf_files() {
132 132
133upgrade_halconf_files() { 133upgrade_halconf_files() {
134 upgrade_conf_files_generic halconf.h update_halconf.sh 134 upgrade_conf_files_generic halconf.h update_halconf.sh
135
136 OIFS=$IFS
137 IFS=$'\n'
138 for file in $(find_chibi_files "$qmk_firmware_dir" -name halconf.h) ; do
139 echo $file
140 sed -i 's@#include "mcuconf.h"@#include <mcuconf.h>@g' "$file"
141 done
142 IFS=$OIFS
135} 143}
136 144
137upgrade_mcuconf_files() { 145upgrade_mcuconf_files() {