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/0xcb/static/rules.mk
+++ b/keyboards/0xcb/static/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

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

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = yes
@@ -19,4 +19,4 @@ AUDIO_ENABLE = no
 FAUXCLICKY_ENABLE = no
 LAYOUTS_HAS_RGB = no
 ENCODER_ENABLE = yes
-LEADER_ENABLE = yes
+LEADER_ENABLE = yes
--- a/keyboards/amag23/rules.mk
+++ b/keyboards/amag23/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

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

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # Build Options
 #   change yes to no to disable
--- a/keyboards/axolstudio/helpo/rules.mk
+++ b/keyboards/axolstudio/helpo/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

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

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/basketweave/rules.mk
+++ b/keyboards/basketweave/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

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

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # build options
 BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
--- a/keyboards/chidori/rules.mk
+++ b/keyboards/chidori/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

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

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/coseyfannitutti/discipline/rules.mk
+++ b/keyboards/coseyfannitutti/discipline/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/coseyfannitutti/mysterium/rules.mk
+++ b/keyboards/coseyfannitutti/mysterium/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

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

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/db/db63/rules.mk
+++ b/keyboards/db/db63/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
--- a/keyboards/dm9records/plaid/rules.mk
+++ b/keyboards/dm9records/plaid/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

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

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/donutcables/budget96/rules.mk
+++ b/keyboards/donutcables/budget96/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
--- a/keyboards/draytronics/daisy/rules.mk
+++ b/keyboards/draytronics/daisy/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/draytronics/scarlet/rules.mk
+++ b/keyboards/draytronics/scarlet/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/ericrlau/numdiscipline/rev1/rules.mk
+++ b/keyboards/ericrlau/numdiscipline/rev1/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/eve/meteor/rules.mk
+++ b/keyboards/eve/meteor/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
--- a/keyboards/exclusive/e6v2/le_bmc/rules.mk
+++ b/keyboards/exclusive/e6v2/le_bmc/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # Build Options
 #   change yes to no to disable
--- a/keyboards/exclusive/e6v2/oe_bmc/rules.mk
+++ b/keyboards/exclusive/e6v2/oe_bmc/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

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

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

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

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
--- a/keyboards/foxlab/time80/rules.mk
+++ b/keyboards/foxlab/time80/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # Build Options
 #   change yes to no to disable
--- a/keyboards/ft/mars80/rules.mk
+++ b/keyboards/ft/mars80/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
--- a/keyboards/gingham/rules.mk
+++ b/keyboards/gingham/rules.mk
@@ -5,7 +5,7 @@ SRC = matrix.c \
 MCU = atmega328p

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/gray_studio/hb85/rules.mk
+++ b/keyboards/gray_studio/hb85/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
--- 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
--- a/keyboards/j80/rules.mk
+++ b/keyboards/j80/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # Build Options
 #   change yes to no to disable
--- a/keyboards/jc65/v32a/rules.mk
+++ b/keyboards/jc65/v32a/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # build options
 BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
--- a/keyboards/kb_elmo/aek2_usb/rules.mk
+++ b/keyboards/kb_elmo/aek2_usb/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/kb_elmo/elmopad/rules.mk
+++ b/keyboards/kb_elmo/elmopad/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega328p
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/kb_elmo/m0110a_usb/rules.mk
+++ b/keyboards/kb_elmo/m0110a_usb/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/kb_elmo/m0116_usb/rules.mk
+++ b/keyboards/kb_elmo/m0116_usb/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/kb_elmo/sesame/rules.mk
+++ b/keyboards/kb_elmo/sesame/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/kb_elmo/twelvekey/rules.mk
+++ b/keyboards/kb_elmo/twelvekey/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega328p
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/kbdfans/kbdpad/mk1/rules.mk
+++ b/keyboards/kbdfans/kbdpad/mk1/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
--- a/keyboards/keycapsss/plaid_pad/rules.mk
+++ b/keyboards/keycapsss/plaid_pad/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

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

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # Build Options
 #   change yes to no to disable
--- a/keyboards/kprepublic/jj40/rules.mk
+++ b/keyboards/kprepublic/jj40/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # Build Options
 #   change yes to no to disable
--- a/keyboards/kprepublic/jj4x4/rules.mk
+++ b/keyboards/kprepublic/jj4x4/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # Build Options
 #   change yes to no to disable
--- a/keyboards/kprepublic/jj50/rules.mk
+++ b/keyboards/kprepublic/jj50/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # build options
 BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
--- a/keyboards/lattice60/rules.mk
+++ b/keyboards/lattice60/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Processor frequency
 F_CPU = 12000000
--- a/keyboards/lck75/rules.mk
+++ b/keyboards/lck75/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
@@ -30,4 +30,3 @@ ENCODER_ENABLE = yes
 WPM_ENABLE = yes
 LTO_ENABLE = no
 AUTO_SHIFT_ENABLE = no
-
--- a/keyboards/leeku/finger65/rules.mk
+++ b/keyboards/leeku/finger65/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # Build Options
 #   change yes to no to disable
--- a/keyboards/mechlovin/hex4b/rules.mk
+++ b/keyboards/mechlovin/hex4b/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Processor frequency
 F_CPU = 16000000
--- a/keyboards/mechlovin/infinity87/rev2/rules.mk
+++ b/keyboards/mechlovin/infinity87/rev2/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/mechlovin/mechlovin9/rev2/rules.mk
+++ b/keyboards/mechlovin/mechlovin9/rev2/rules.mk
@@ -5,5 +5,4 @@ MCU = atmega32a
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = bootloadHID
-
+BOOTLOADER = bootloadhid
--- a/keyboards/mechlovin/th1800/rules.mk
+++ b/keyboards/mechlovin/th1800/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

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

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

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

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # Build Options
 #   comment out to disable the options.
--- a/keyboards/mt40/rules.mk
+++ b/keyboards/mt40/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # build options
 BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
--- a/keyboards/nullbitsco/scramble/rules.mk
+++ b/keyboards/nullbitsco/scramble/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/oddforge/vea/rules.mk
+++ b/keyboards/oddforge/vea/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # Build Options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
--- a/keyboards/ortho5by12/rules.mk
+++ b/keyboards/ortho5by12/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/orthocode/rules.mk
+++ b/keyboards/orthocode/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

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

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
--- a/keyboards/pearl/rules.mk
+++ b/keyboards/pearl/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
--- a/keyboards/peej/lumberjack/rules.mk
+++ b/keyboards/peej/lumberjack/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/percent/canoe/rules.mk
+++ b/keyboards/percent/canoe/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # build options
 BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
--- a/keyboards/percent/skog/rules.mk
+++ b/keyboards/percent/skog/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # build options
 BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
--- a/keyboards/percent/skog_lite/rules.mk
+++ b/keyboards/percent/skog_lite/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # Build Options
 #   change yes to no to disable
--- a/keyboards/planck/thk/rules.mk
+++ b/keyboards/planck/thk/rules.mk
@@ -20,7 +20,7 @@ MCU = atmega32a
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/punk75/rules.mk
+++ b/keyboards/punk75/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/ramonimbao/aelith/rules.mk
+++ b/keyboards/ramonimbao/aelith/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/ramonimbao/chevron/rules.mk
+++ b/keyboards/ramonimbao/chevron/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/ramonimbao/herringbone/pro/rules.mk
+++ b/keyboards/ramonimbao/herringbone/pro/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/ramonimbao/herringbone/v1/rules.mk
+++ b/keyboards/ramonimbao/herringbone/v1/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

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

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

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

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/rart/rartland/rules.mk
+++ b/keyboards/rart/rartland/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/rgbkb/pan/rev1/32a/rules.mk
+++ b/keyboards/rgbkb/pan/rev1/32a/rules.mk
@@ -5,4 +5,4 @@ MCU = atmega32a
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
--- a/keyboards/seigaiha/rules.mk
+++ b/keyboards/seigaiha/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

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

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
--- a/keyboards/skergo/rules.mk
+++ b/keyboards/skergo/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

 # Build Options
 #   change yes to no to disable
--- a/keyboards/spiderisland/split78/rules.mk
+++ b/keyboards/spiderisland/split78/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # Build Options
 #   change yes to no to disable
--- a/keyboards/tgr/910/rules.mk
+++ b/keyboards/tgr/910/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
--- a/keyboards/tgr/910ce/rules.mk
+++ b/keyboards/tgr/910ce/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # Build Options
 #   change yes to no to disable
@@ -16,4 +16,4 @@ BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 WS2812_DRIVER = i2c

-LAYOUTS = 65_ansi_blocker 65_iso_blocker
+LAYOUTS = 65_ansi_blocker 65_iso_blocker
--- a/keyboards/tgr/alice/rules.mk
+++ b/keyboards/tgr/alice/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # build options
 BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
--- a/keyboards/tgr/jane/rules.mk
+++ b/keyboards/tgr/jane/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
--- a/keyboards/tgr/tris/rules.mk
+++ b/keyboards/tgr/tris/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # Build Options
 #   change yes to no to disable
--- a/keyboards/tkw/stoutgat/v1/rules.mk
+++ b/keyboards/tkw/stoutgat/v1/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

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

 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader

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

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
--- a/keyboards/wheatfield/split75/rules.mk
+++ b/keyboards/wheatfield/split75/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # Build Options
 #   change yes to no to disable
--- a/keyboards/winkeyless/bface/rules.mk
+++ b/keyboards/winkeyless/bface/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
--- a/keyboards/winkeyless/bmini/rules.mk
+++ b/keyboards/winkeyless/bmini/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # build options
 BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
--- a/keyboards/winkeyless/bminiex/rules.mk
+++ b/keyboards/winkeyless/bminiex/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # build options
 BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
--- a/keyboards/ymd75/rev1/rules.mk
+++ b/keyboards/ymd75/rev1/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # build options
 BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
--- a/keyboards/ymd75/rev2/rules.mk
+++ b/keyboards/ymd75/rev2/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # build options
 BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
--- a/keyboards/ymd96/rules.mk
+++ b/keyboards/ymd96/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
--- a/keyboards/ymdk/bface/rules.mk
+++ b/keyboards/ymdk/bface/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # build options
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
--- a/keyboards/ymdk/sp64/rules.mk
+++ b/keyboards/ymdk/sp64/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

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

 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid

 # Build Options
 #   change yes to no to disable