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

author: QMK Bot <hello@qmk.fm> 2021-09-10 03:36:14 +0000
committer: QMK Bot <hello@qmk.fm> 2021-09-10 03:36:14 +0000
commit: e6ff638abf7f400c4e153c69dcb5da0232ba424d (patch)
tree: ce417777585b3f7787b2c509fcc280495315cac2 /keyboards/bpiphany
parent: 504c00c2e14ca4eb0c033063e434323ad81c1b16 (diff)
parent: 7eea780a7da2d9197b78b62b7294a6b2bc2fa572 (diff)
download: qmk_firmware-e6ff638abf7f400c4e153c69dcb5da0232ba424d.tar.gz
qmk_firmware-e6ff638abf7f400c4e153c69dcb5da0232ba424d.zip
6 files changed, 0 insertions, 42 deletions
diff --git a/keyboards/bpiphany/frosty_flake/rules.mk b/keyboards/bpiphany/frosty_flake/rules.mk
index 05aa3dcc7..ab8bc8ac9 100644
--- a/keyboards/bpiphany/frosty_flake/rules.mk
+++ b/keyboards/bpiphany/frosty_flake/rules.mk
@@ -2,13 +2,6 @@
 MCU = atmega32u2
 # Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
 BOOTLOADER = atmel-dfu
 # Build Options
diff --git a/keyboards/bpiphany/kitten_paw/rules.mk b/keyboards/bpiphany/kitten_paw/rules.mk
index 9fe5e488f..caab5b5ff 100644
--- a/keyboards/bpiphany/kitten_paw/rules.mk
+++ b/keyboards/bpiphany/kitten_paw/rules.mk
@@ -2,13 +2,6 @@
 MCU = atmega32u2
 # Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
 BOOTLOADER = atmel-dfu
 # Build Options
diff --git a/keyboards/bpiphany/pegasushoof/rules.mk b/keyboards/bpiphany/pegasushoof/rules.mk
index 4dd5a8908..db6d85f75 100644
--- a/keyboards/bpiphany/pegasushoof/rules.mk
+++ b/keyboards/bpiphany/pegasushoof/rules.mk
@@ -2,13 +2,6 @@
 MCU = atmega32u2
 # Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
 BOOTLOADER = atmel-dfu
 # Build Options
diff --git a/keyboards/bpiphany/sixshooter/rules.mk b/keyboards/bpiphany/sixshooter/rules.mk
index 10d7086bb..96d87d728 100644
--- a/keyboards/bpiphany/sixshooter/rules.mk
+++ b/keyboards/bpiphany/sixshooter/rules.mk
@@ -2,13 +2,6 @@
 MCU = atmega32u4
 # Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
 BOOTLOADER = halfkay
 # Build Options
diff --git a/keyboards/bpiphany/tiger_lily/rules.mk b/keyboards/bpiphany/tiger_lily/rules.mk
index 9fe5e488f..caab5b5ff 100644
--- a/keyboards/bpiphany/tiger_lily/rules.mk
+++ b/keyboards/bpiphany/tiger_lily/rules.mk
@@ -2,13 +2,6 @@
 MCU = atmega32u2
 # Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
 BOOTLOADER = atmel-dfu
 # Build Options
diff --git a/keyboards/bpiphany/unloved_bastard/rules.mk b/keyboards/bpiphany/unloved_bastard/rules.mk
index fbe74c644..c4ed9e285 100644
--- a/keyboards/bpiphany/unloved_bastard/rules.mk
+++ b/keyboards/bpiphany/unloved_bastard/rules.mk
@@ -2,13 +2,6 @@
 MCU = atmega32u2
 # Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
 BOOTLOADER = atmel-dfu
 # Build Options
author	QMK Bot <hello@qmk.fm>	2021-09-10 03:36:14 +0000
committer	QMK Bot <hello@qmk.fm>	2021-09-10 03:36:14 +0000
commit	e6ff638abf7f400c4e153c69dcb5da0232ba424d (patch)
tree	ce417777585b3f7787b2c509fcc280495315cac2 /keyboards/bpiphany
parent	504c00c2e14ca4eb0c033063e434323ad81c1b16 (diff)
parent	7eea780a7da2d9197b78b62b7294a6b2bc2fa572 (diff)
download	qmk_firmware-e6ff638abf7f400c4e153c69dcb5da0232ba424d.tar.gz qmk_firmware-e6ff638abf7f400c4e153c69dcb5da0232ba424d.zip

diff --git a/keyboards/bpiphany/frosty_flake/rules.mk b/keyboards/bpiphany/frosty_flake/rules.mk index 05aa3dcc7..ab8bc8ac9 100644 --- a/keyboards/bpiphany/frosty_flake/rules.mk +++ b/keyboards/bpiphany/frosty_flake/rules.mk
@@ -2,13 +2,6 @@
2	MCU = atmega32u2	2	MCU = atmega32u2
3		3
4	# Bootloader selection	4	# Bootloader selection
5	# Teensy halfkay
6	# Pro Micro caterina
7	# Atmel DFU atmel-dfu
8	# LUFA DFU lufa-dfu
9	# QMK DFU qmk-dfu
10	# ATmega32A bootloadHID
11	# ATmega328P USBasp
12	BOOTLOADER = atmel-dfu	5	BOOTLOADER = atmel-dfu
13		6
14	# Build Options	7	# Build Options


diff --git a/keyboards/bpiphany/kitten_paw/rules.mk b/keyboards/bpiphany/kitten_paw/rules.mk index 9fe5e488f..caab5b5ff 100644 --- a/keyboards/bpiphany/kitten_paw/rules.mk +++ b/keyboards/bpiphany/kitten_paw/rules.mk
@@ -2,13 +2,6 @@
2	MCU = atmega32u2	2	MCU = atmega32u2
3		3
4	# Bootloader selection	4	# Bootloader selection
5	# Teensy halfkay
6	# Pro Micro caterina
7	# Atmel DFU atmel-dfu
8	# LUFA DFU lufa-dfu
9	# QMK DFU qmk-dfu
10	# ATmega32A bootloadHID
11	# ATmega328P USBasp
12	BOOTLOADER = atmel-dfu	5	BOOTLOADER = atmel-dfu
13		6
14	# Build Options	7	# Build Options


diff --git a/keyboards/bpiphany/pegasushoof/rules.mk b/keyboards/bpiphany/pegasushoof/rules.mk index 4dd5a8908..db6d85f75 100644 --- a/keyboards/bpiphany/pegasushoof/rules.mk +++ b/keyboards/bpiphany/pegasushoof/rules.mk
@@ -2,13 +2,6 @@
2	MCU = atmega32u2	2	MCU = atmega32u2
3		3
4	# Bootloader selection	4	# Bootloader selection
5	# Teensy halfkay
6	# Pro Micro caterina
7	# Atmel DFU atmel-dfu
8	# LUFA DFU lufa-dfu
9	# QMK DFU qmk-dfu
10	# ATmega32A bootloadHID
11	# ATmega328P USBasp
12	BOOTLOADER = atmel-dfu	5	BOOTLOADER = atmel-dfu
13		6
14	# Build Options	7	# Build Options


diff --git a/keyboards/bpiphany/sixshooter/rules.mk b/keyboards/bpiphany/sixshooter/rules.mk index 10d7086bb..96d87d728 100644 --- a/keyboards/bpiphany/sixshooter/rules.mk +++ b/keyboards/bpiphany/sixshooter/rules.mk
@@ -2,13 +2,6 @@
2	MCU = atmega32u4	2	MCU = atmega32u4
3		3
4	# Bootloader selection	4	# Bootloader selection
5	# Teensy halfkay
6	# Pro Micro caterina
7	# Atmel DFU atmel-dfu
8	# LUFA DFU lufa-dfu
9	# QMK DFU qmk-dfu
10	# ATmega32A bootloadHID
11	# ATmega328P USBasp
12	BOOTLOADER = halfkay	5	BOOTLOADER = halfkay
13		6
14	# Build Options	7	# Build Options


diff --git a/keyboards/bpiphany/tiger_lily/rules.mk b/keyboards/bpiphany/tiger_lily/rules.mk index 9fe5e488f..caab5b5ff 100644 --- a/keyboards/bpiphany/tiger_lily/rules.mk +++ b/keyboards/bpiphany/tiger_lily/rules.mk
@@ -2,13 +2,6 @@
2	MCU = atmega32u2	2	MCU = atmega32u2
3		3
4	# Bootloader selection	4	# Bootloader selection
5	# Teensy halfkay
6	# Pro Micro caterina
7	# Atmel DFU atmel-dfu
8	# LUFA DFU lufa-dfu
9	# QMK DFU qmk-dfu
10	# ATmega32A bootloadHID
11	# ATmega328P USBasp
12	BOOTLOADER = atmel-dfu	5	BOOTLOADER = atmel-dfu
13		6
14	# Build Options	7	# Build Options


diff --git a/keyboards/bpiphany/unloved_bastard/rules.mk b/keyboards/bpiphany/unloved_bastard/rules.mk index fbe74c644..c4ed9e285 100644 --- a/keyboards/bpiphany/unloved_bastard/rules.mk +++ b/keyboards/bpiphany/unloved_bastard/rules.mk
@@ -2,13 +2,6 @@
2	MCU = atmega32u2	2	MCU = atmega32u2
3		3
4	# Bootloader selection	4	# Bootloader selection
5	# Teensy halfkay
6	# Pro Micro caterina
7	# Atmel DFU atmel-dfu
8	# LUFA DFU lufa-dfu
9	# QMK DFU qmk-dfu
10	# ATmega32A bootloadHID
11	# ATmega328P USBasp
12	BOOTLOADER = atmel-dfu	5	BOOTLOADER = atmel-dfu
13		6
14	# Build Options	7	# Build Options