Merge remote-tracking branch 'upstream/master' into develop

2021-09-10 17:36:17 +10:00
parent c94cc1effa d5cb7de5e4
commit a7c972b329
106 changed files with 154 additions and 156 deletions
--- a/keyboards/handwired/axon/rules.mk
+++ b/keyboards/handwired/axon/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/handwired/hnah40/rules.mk
+++ b/keyboards/handwired/hnah40/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable