ChibiOS and ChibiOS-Contrib need to be updated in tandem -- the latter has a branch tied to the ChibiOS version in use and should not be mixed with different versions.
svn Initialisation:
git-svn package in your OS's package managergit svn init --stdlayout --prefix='svn/' http://svn.osdn.net/svnroot/chibios/git remote add qmk git@github.com:qmk/ChibiOS.gitgit svn fetchgit tag -a ver20.3.4 -m ver20.3.4 svn/tags/ver20.3.4git push qmk ver20.3.4git tag -a develop_YYYY_qN -m develop_YYYY_qN svn/tags/ver20.3.4git push qmk develop_YYYY_qNgit Initialisation:
git clone git@github.com:qmk/ChibiOS-Contribgit remote add upstream https://github.com/ChibiOS/ChibiOS-Contribgit checkout -b chibios-20.3.x upstream/chibios-20.3.xgit fetch --all --tags --prunegit checkout chibios-20.3.xgit pull --ff-onlygit push origin chibios-20.3.xgit tag -a develop_YYYY_qN -m develop_YYYY_qN chibios-20.3.xgit push origin develop_YYYY_qNcd $QMK_FIRMWAREgit checkout developgit pull --ff-onlygit checkout -b chibios-version-bumpcd lib/chibiosgit fetch --all --tags --prunegit checkout develop_YYYY_qNcd ../chibios-contribgit fetch --all --tags --prunegit checkout develop_YYYY_qNcd $QMK_FIRMWARE./util/chibios_conf_updater.shcd $QMK_FIRMWAREqmk mass-compile -j 4git commit -am 'Update ChibiOS to 99.9.9'git push --set-upstream origin chibios-version-bump