1 files changed, 9 insertions, 42 deletions
diff --git a/keyboards/handwired/rs60/rules.mk b/keyboards/handwired/rs60/rules.mk
index 7b4ec69d0..ee10944c6 100644
--- a/keyboards/handwired/rs60/rules.mk
+++ b/keyboards/handwired/rs60/rules.mk
@@ -1,50 +1,16 @@
 # MCU name
 MCU = atmega32u4
-# Processor frequency.
+# Bootloader selection
-#     This will define a symbol, F_CPU, in all source code files equal to the
+#   Teensy       halfkay
-#     processor frequency in Hz. You can then use this symbol in your source code to
+#   Pro Micro    caterina
-#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
+#   Atmel DFU    atmel-dfu
-#     automatically to create a 32-bit value in your source code.
+#   LUFA DFU     lufa-dfu
-#
+#   QMK DFU      qmk-dfu
-#     This will be an integer division of F_USB below, as it is sourced by
+#   ATmega32A    bootloadHID
-#     F_USB after it has run through any CPU prescalers. Note that this value
+#   ATmega328P   USBasp
-#     does not *change* the processor frequency - it should merely be updated to
-#     reflect the processor speed set externally so that the code can use accurate
-#     software delays.
-F_CPU = 16000000
-#
-# LUFA specific
-#
-# Target architecture (see library "Board Types" documentation).
-ARCH = AVR8
-# Input clock frequency.
-#     This will define a symbol, F_USB, in all source code files equal to the
-#     input clock frequency (before any prescaling is performed) in Hz. This value may
-#     differ from F_CPU if prescaling is used on the latter, and is required as the
-#     raw input clock is fed directly to the PLL sections of the AVR for high speed
-#     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
-#     at the end, this will be done automatically to create a 32-bit value in your
-#     source code.
-#
-#     If no clock division is performed on the input clock inside the AVR (via the
-#     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
-F_USB = $(F_CPU)
-# Bootloader
 BOOTLOADER = qmk-dfu
-# Interrupt driven control endpoint task(+60)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-LAYOUTS = ortho_5x12
-# Boot Section Size in *bytes*
-#OPT_DEFS += -DBOOTLOADER_SIZE=4096
 # Build Options
 #   comment out to disable the options.
 #
@@ -59,3 +25,4 @@ BACKLIGHT_ENABLE  = no  # Custom backlighting code is used, so this should not b
 AUDIO_ENABLE      = no  # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below
 RGBLIGHT_ENABLE   = no  # This can be enabled if a ws2812 strip is connected to the expansion port.
+LAYOUTS = ortho_5x12

diff --git a/keyboards/handwired/rs60/rules.mk b/keyboards/handwired/rs60/rules.mk index 7b4ec69d0..ee10944c6 100644 --- a/keyboards/handwired/rs60/rules.mk +++ b/keyboards/handwired/rs60/rules.mk
@@ -1,50 +1,16 @@
1	# MCU name	1	# MCU name
2	MCU = atmega32u4	2	MCU = atmega32u4
3		3
4	# Processor frequency.	4	# Bootloader selection
5	# This will define a symbol, F_CPU, in all source code files equal to the	5	# Teensy halfkay
6	# processor frequency in Hz. You can then use this symbol in your source code to	6	# Pro Micro caterina
7	# calculate timings. Do NOT tack on a 'UL' at the end, this will be done	7	# Atmel DFU atmel-dfu
8	# automatically to create a 32-bit value in your source code.	8	# LUFA DFU lufa-dfu
9	#	9	# QMK DFU qmk-dfu
10	# This will be an integer division of F_USB below, as it is sourced by	10	# ATmega32A bootloadHID
11	# F_USB after it has run through any CPU prescalers. Note that this value	11	# ATmega328P USBasp
12	# does not change the processor frequency - it should merely be updated to
13	# reflect the processor speed set externally so that the code can use accurate
14	# software delays.
15	F_CPU = 16000000
16
17	#
18	# LUFA specific
19	#
20	# Target architecture (see library "Board Types" documentation).
21	ARCH = AVR8
22
23	# Input clock frequency.
24	# This will define a symbol, F_USB, in all source code files equal to the
25	# input clock frequency (before any prescaling is performed) in Hz. This value may
26	# differ from F_CPU if prescaling is used on the latter, and is required as the
27	# raw input clock is fed directly to the PLL sections of the AVR for high speed
28	# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
29	# at the end, this will be done automatically to create a 32-bit value in your
30	# source code.
31	#
32	# If no clock division is performed on the input clock inside the AVR (via the
33	# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
34	F_USB = $(F_CPU)
35
36	# Bootloader
37	BOOTLOADER = qmk-dfu	12	BOOTLOADER = qmk-dfu
38		13
39	# Interrupt driven control endpoint task(+60)
40	OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
41
42	LAYOUTS = ortho_5x12
43
44	# Boot Section Size in bytes
45	#OPT_DEFS += -DBOOTLOADER_SIZE=4096
46
47
48	# Build Options	14	# Build Options
49	# comment out to disable the options.	15	# comment out to disable the options.
50	#	16	#
@@ -59,3 +25,4 @@ BACKLIGHT_ENABLE = no # Custom backlighting code is used, so this should not b
59	AUDIO_ENABLE = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below	25	AUDIO_ENABLE = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below
60	RGBLIGHT_ENABLE = no # This can be enabled if a ws2812 strip is connected to the expansion port.	26	RGBLIGHT_ENABLE = no # This can be enabled if a ws2812 strip is connected to the expansion port.
61		27
		28	LAYOUTS = ortho_5x12