Swap to 21.6.x

qmk · Sep 22, 2021 · 1e02f56 · 1e02f56
1 parent 03424d8
commit 1e02f56
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/chibios b/lib/chibios
diff --git a/lib/chibios-contrib b/lib/chibios-contrib
diff --git a/util/update_chibios_mirror.sh b/util/update_chibios_mirror.sh
@@ -10,7 +10,7 @@ chibios_branches="trunk stable_20.3.x stable_21.6.x"
 chibios_tags="ver20.3.1 ver20.3.2 ver20.3.3 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
+6 −2		.github/workflows/build.yml
+139 −138		os/common/ext/CMSIS/KINETIS/k64f.h
+117 −0		os/common/startup/ARMCMx/compilers/GCC/ld/RP2040_FLASH.ld
+80 −0		os/common/startup/ARMCMx/compilers/GCC/ld/RP2040_rules_code_with_boot2.ld
+1 −0		os/common/startup/ARMCMx/compilers/GCC/mk/startup_k60x.mk
+8 −10		os/hal/include/usbh/defs.h
+7 −7		os/hal/include/usbh/dev/uvc.h
+1 −0		os/hal/ports/KINETIS/K60x/platform.mk
+8 −8		os/hal/ports/KINETIS/LLD/USBHSv1/hal_usb_lld.c
+9 −0		os/hal/ports/RP/LLD/ADCv1/driver.mk
+300 −0		os/hal/ports/RP/LLD/ADCv1/hal_adc_lld.c
+160 −0		os/hal/ports/RP/LLD/ADCv1/hal_adc_lld.h
+78 −0		os/hal/ports/RP/LLD/ADCv1/rp2040_adc.h
+9 −0		os/hal/ports/RP/LLD/I2Cv1/driver.mk
+504 −0		os/hal/ports/RP/LLD/I2Cv1/hal_i2c_lld.c
+206 −0		os/hal/ports/RP/LLD/I2Cv1/hal_i2c_lld.h
+9 −0		os/hal/ports/RP/LLD/USBDv1/driver.mk
+971 −0		os/hal/ports/RP/LLD/USBDv1/hal_usb_lld.c
+479 −0		os/hal/ports/RP/LLD/USBDv1/hal_usb_lld.h
+472 −0		os/hal/ports/RP/LLD/USBDv1/rp2040_usb.h
+21 −0		os/hal/ports/RP/RP2040/platform.mk
+6 −6		os/hal/src/usbh/hal_usbh_msd.c
+108 −0		testhal/RP/RP2040/RT-RP2040-PICO-ADC/.cproject
+48 −0		testhal/RP/RP2040/RT-RP2040-PICO-ADC/.project
+193 −0		testhal/RP/RP2040/RT-RP2040-PICO-ADC/Makefile
+819 −0		testhal/RP/RP2040/RT-RP2040-PICO-ADC/cfg/chconf.h
+553 −0		testhal/RP/RP2040/RT-RP2040-PICO-ADC/cfg/halconf.h
+180 −0		testhal/RP/RP2040/RT-RP2040-PICO-ADC/cfg/halconf_community.h
+88 −0		testhal/RP/RP2040/RT-RP2040-PICO-ADC/cfg/mcuconf.h
+49 −0		testhal/RP/RP2040/RT-RP2040-PICO-ADC/debug/RT-RP2040-PICO (build-ch.elf)(OpenOCD, Flash and Run).launch
+48 −0		testhal/RP/RP2040/RT-RP2040-PICO-ADC/debug/RT-RP2040-PICO (build-ch.elf)(OpenOCD, Just Run).launch
+130 −0		testhal/RP/RP2040/RT-RP2040-PICO-ADC/main.c
+108 −0		testhal/RP/RP2040/RT-RP2040-PICO-HID/.cproject
+48 −0		testhal/RP/RP2040/RT-RP2040-PICO-HID/.project
+23 −0		testhal/RP/RP2040/RT-RP2040-PICO-HID/Client/Makefile
+180 −0		testhal/RP/RP2040/RT-RP2040-PICO-HID/Client/test-usb-hid.c
+2 −0		testhal/RP/RP2040/RT-RP2040-PICO-HID/Client/udev.rules
+207 −0		testhal/RP/RP2040/RT-RP2040-PICO-HID/Makefile
+119 −0		testhal/RP/RP2040/RT-RP2040-PICO-HID/RP2040_FLASH.ld
+160 −0		testhal/RP/RP2040/RT-RP2040-PICO-HID/c1_main.c
+827 −0		testhal/RP/RP2040/RT-RP2040-PICO-HID/cfg/chconf.h
+553 −0		testhal/RP/RP2040/RT-RP2040-PICO-HID/cfg/halconf.h
+180 −0		testhal/RP/RP2040/RT-RP2040-PICO-HID/cfg/halconf_community.h
+83 −0		testhal/RP/RP2040/RT-RP2040-PICO-HID/cfg/mcuconf.h
+49 −0		testhal/RP/RP2040/RT-RP2040-PICO-HID/debug/RT-RP2040-PICO (build-ch.elf)(OpenOCD, Flash and Run).launch
+48 −0		testhal/RP/RP2040/RT-RP2040-PICO-HID/debug/RT-RP2040-PICO (build-ch.elf)(OpenOCD, Just Run).launch
+94 −0		testhal/RP/RP2040/RT-RP2040-PICO-HID/main.c
+80 −0		testhal/RP/RP2040/RT-RP2040-PICO-HID/rules_code_with_boot2.ld
+418 −0		testhal/RP/RP2040/RT-RP2040-PICO-HID/usbcfg.c
+45 −0		testhal/RP/RP2040/RT-RP2040-PICO-HID/usbcfg.h
+108 −0		testhal/RP/RP2040/RT-RP2040-PICO-I2C-24AA01/.cproject
+48 −0		testhal/RP/RP2040/RT-RP2040-PICO-I2C-24AA01/.project
+193 −0		testhal/RP/RP2040/RT-RP2040-PICO-I2C-24AA01/Makefile
+819 −0		testhal/RP/RP2040/RT-RP2040-PICO-I2C-24AA01/cfg/chconf.h
+553 −0		testhal/RP/RP2040/RT-RP2040-PICO-I2C-24AA01/cfg/halconf.h
+180 −0		testhal/RP/RP2040/RT-RP2040-PICO-I2C-24AA01/cfg/halconf_community.h
+97 −0		testhal/RP/RP2040/RT-RP2040-PICO-I2C-24AA01/cfg/mcuconf.h
+49 −0		testhal/RP/RP2040/RT-RP2040-PICO-I2C-24AA01/debug/RT-RP2040-PICO (build-ch.elf)(OpenOCD, Flash and Run).launch
+48 −0		testhal/RP/RP2040/RT-RP2040-PICO-I2C-24AA01/debug/RT-RP2040-PICO (build-ch.elf)(OpenOCD, Just Run).launch
+142 −0		testhal/RP/RP2040/RT-RP2040-PICO-I2C-24AA01/main.c
+108 −0		testhal/RP/RP2040/RT-RP2040-PICO-SERIAL/.cproject
+48 −0		testhal/RP/RP2040/RT-RP2040-PICO-SERIAL/.project
+208 −0		testhal/RP/RP2040/RT-RP2040-PICO-SERIAL/Makefile
+119 −0		testhal/RP/RP2040/RT-RP2040-PICO-SERIAL/RP2040_FLASH.ld
+160 −0		testhal/RP/RP2040/RT-RP2040-PICO-SERIAL/c1_main.c
+827 −0		testhal/RP/RP2040/RT-RP2040-PICO-SERIAL/cfg/chconf.h
+553 −0		testhal/RP/RP2040/RT-RP2040-PICO-SERIAL/cfg/halconf.h
+180 −0		testhal/RP/RP2040/RT-RP2040-PICO-SERIAL/cfg/halconf_community.h
+83 −0		testhal/RP/RP2040/RT-RP2040-PICO-SERIAL/cfg/mcuconf.h
+49 −0		testhal/RP/RP2040/RT-RP2040-PICO-SERIAL/debug/RT-RP2040-PICO (build-ch.elf)(OpenOCD, Flash and Run).launch
+48 −0		testhal/RP/RP2040/RT-RP2040-PICO-SERIAL/debug/RT-RP2040-PICO (build-ch.elf)(OpenOCD, Just Run).launch
+169 −0		testhal/RP/RP2040/RT-RP2040-PICO-SERIAL/main.c
+80 −0		testhal/RP/RP2040/RT-RP2040-PICO-SERIAL/rules_code_with_boot2.ld
+333 −0		testhal/RP/RP2040/RT-RP2040-PICO-SERIAL/usbcfg.c
+27 −0		testhal/RP/RP2040/RT-RP2040-PICO-SERIAL/usbcfg.h