Merge remote-tracking branch 'origin/master' into matrixportal

Author: ladyada

boards.txt

@@ -1321,6 +1321,7 @@ adafruit_hallowing_m4.menu.debug.off=Off
 adafruit_hallowing_m4.menu.debug.on=On
 adafruit_hallowing_m4.menu.debug.on.build.flags.debug=-g
 
+<<<<<<< HEAD
 # Adafruit Matrix Portal M4 (SAMD51)
 # ------------------------------
 adafruit_matrixportal_m4.name=Adafruit Matrix Portal M4 (SAMD51)
@@ -1414,7 +1415,7 @@ adafruit_blm_badge.build.variant_system_lib=
 adafruit_blm_badge.build.vid=0x239A
 adafruit_blm_badge.build.pid=0x80BF
 adafruit_blm_badge.bootloader.tool=openocd
-adafruit_blm_badge.bootloader.file=gemmaM0/bootloader-gemma_m0-v2.0.0-adafruit.5.bin
+adafruit_blm_badge.bootloader.file=blmbadge/bootloader-blm_badge.bin
 adafruit_blm_badge.menu.usbstack.arduino=Arduino
 adafruit_blm_badge.menu.usbstack.tinyusb=TinyUSB
 adafruit_blm_badge.menu.usbstack.tinyusb.build.flags.usbstack=-DUSE_TINYUSB