3 files changed, 21 insertions, 134 deletions
diff --git a/keyboards/alf/dc60/rules.mk b/keyboards/alf/dc60/rules.mk
index 0e8f52e2b..8df6c4c7c 100644
--- a/keyboards/alf/dc60/rules.mk
+++ b/keyboards/alf/dc60/rules.mk
@@ -1,51 +1,15 @@
 # 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
+BOOTLOADER = atmel-dfu
-#     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)
-# Interrupt driven control endpoint task(+60)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-# Boot Section Size in *bytes*
-#   Teensy halfKay   512
-#   Teensy++ halfKay 1024
-#   Atmel DFU loader 4096
-#   LUFA bootloader  4096
-#   USBaspLoader     2048
-OPT_DEFS += -DBOOTLOADER_SIZE=4096
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/alf/x11/rules.mk b/keyboards/alf/x11/rules.mk
index d19b7c1ba..3439ac47f 100644
--- a/keyboards/alf/x11/rules.mk
+++ b/keyboards/alf/x11/rules.mk
@@ -1,63 +1,16 @@
 # MCU name
 MCU = atmega32u4
-# Processor frequency.
-#     This will define a symbol, F_CPU, in all source code files equal to the
-#     processor frequency in Hz. You can then use this symbol in your source code to
-#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
-#     automatically to create a 32-bit value in your source code.
-#
-#     This will be an integer division of F_USB below, as it is sourced by
-#     F_USB after it has run through any CPU prescalers. Note that this value
-#     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)
-# Interrupt driven control endpoint task(+60)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 # Bootloader selection
 #   Teensy       halfkay
 #   Pro Micro    caterina
 #   Atmel DFU    atmel-dfu
 #   LUFA DFU     lufa-dfu
 #   QMK DFU      qmk-dfu
-#   atmega32a    bootloadHID
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
 BOOTLOADER = atmel-dfu
-# If you don't know the bootloader type, then you can specify the
-# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line
-#   Teensy halfKay      512
-#   Teensy++ halfKay    1024
-#   Atmel DFU loader    4096
-#   LUFA bootloader     4096
-#   USBaspLoader        2048
-# OPT_DEFS += -DBOOTLOADER_SIZE=4096
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/alf/x2/rules.mk b/keyboards/alf/x2/rules.mk
index 9c4082da2..1e6d4bb7c 100644
--- a/keyboards/alf/x2/rules.mk
+++ b/keyboards/alf/x2/rules.mk
@@ -1,45 +1,15 @@
 # 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
+BOOTLOADER = atmel-dfu
-#     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)
-# Interrupt driven control endpoint task(+60)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-# Boot Section Size in *bytes*
-OPT_DEFS += -DBOOTLOADER_SIZE=4096
 # Build Options
 #   comment out to disable the options.
@@ -53,4 +23,4 @@ SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes               # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
 AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = yes
-\ No newline at end of file
+RGBLIGHT_ENABLE = yes

diff --git a/keyboards/alf/dc60/rules.mk b/keyboards/alf/dc60/rules.mk index 0e8f52e2b..8df6c4c7c 100644 --- a/keyboards/alf/dc60/rules.mk +++ b/keyboards/alf/dc60/rules.mk
@@ -1,51 +1,15 @@
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	12	BOOTLOADER = atmel-dfu
13	# reflect the processor speed set externally so that the code can use accurate
14	# software delays.
15	F_CPU = 16000000
16
17
18	#
19	# LUFA specific
20	#
21	# Target architecture (see library "Board Types" documentation).
22	ARCH = AVR8
23
24	# Input clock frequency.
25	# This will define a symbol, F_USB, in all source code files equal to the
26	# input clock frequency (before any prescaling is performed) in Hz. This value may
27	# differ from F_CPU if prescaling is used on the latter, and is required as the
28	# raw input clock is fed directly to the PLL sections of the AVR for high speed
29	# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
30	# at the end, this will be done automatically to create a 32-bit value in your
31	# source code.
32	#
33	# If no clock division is performed on the input clock inside the AVR (via the
34	# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
35	F_USB = $(F_CPU)
36
37	# Interrupt driven control endpoint task(+60)
38	OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
39
40
41	# Boot Section Size in bytes
42	# Teensy halfKay 512
43	# Teensy++ halfKay 1024
44	# Atmel DFU loader 4096
45	# LUFA bootloader 4096
46	# USBaspLoader 2048
47	OPT_DEFS += -DBOOTLOADER_SIZE=4096
48
49		13
50	# Build Options	14	# Build Options
51	# change yes to no to disable	15	# change yes to no to disable


diff --git a/keyboards/alf/x11/rules.mk b/keyboards/alf/x11/rules.mk index d19b7c1ba..3439ac47f 100644 --- a/keyboards/alf/x11/rules.mk +++ b/keyboards/alf/x11/rules.mk
@@ -1,63 +1,16 @@
1	# MCU name	1	# MCU name
2	MCU = atmega32u4	2	MCU = atmega32u4
3		3
4	# Processor frequency.
5	# This will define a symbol, F_CPU, in all source code files equal to the
6	# processor frequency in Hz. You can then use this symbol in your source code to
7	# calculate timings. Do NOT tack on a 'UL' at the end, this will be done
8	# automatically to create a 32-bit value in your source code.
9	#
10	# This will be an integer division of F_USB below, as it is sourced by
11	# F_USB after it has run through any CPU prescalers. Note that this value
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	#
19	# LUFA specific
20	#
21	# Target architecture (see library "Board Types" documentation).
22	ARCH = AVR8
23
24	# Input clock frequency.
25	# This will define a symbol, F_USB, in all source code files equal to the
26	# input clock frequency (before any prescaling is performed) in Hz. This value may
27	# differ from F_CPU if prescaling is used on the latter, and is required as the
28	# raw input clock is fed directly to the PLL sections of the AVR for high speed
29	# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
30	# at the end, this will be done automatically to create a 32-bit value in your
31	# source code.
32	#
33	# If no clock division is performed on the input clock inside the AVR (via the
34	# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
35	F_USB = $(F_CPU)
36
37	# Interrupt driven control endpoint task(+60)
38	OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
39
40
41	# Bootloader selection	4	# Bootloader selection
42	# Teensy halfkay	5	# Teensy halfkay
43	# Pro Micro caterina	6	# Pro Micro caterina
44	# Atmel DFU atmel-dfu	7	# Atmel DFU atmel-dfu
45	# LUFA DFU lufa-dfu	8	# LUFA DFU lufa-dfu
46	# QMK DFU qmk-dfu	9	# QMK DFU qmk-dfu
47	# atmega32a bootloadHID	10	# ATmega32A bootloadHID
		11	# ATmega328P USBasp
48	BOOTLOADER = atmel-dfu	12	BOOTLOADER = atmel-dfu
49		13
50
51	# If you don't know the bootloader type, then you can specify the
52	# Boot Section Size in bytes by uncommenting out the OPT_DEFS line
53	# Teensy halfKay 512
54	# Teensy++ halfKay 1024
55	# Atmel DFU loader 4096
56	# LUFA bootloader 4096
57	# USBaspLoader 2048
58	# OPT_DEFS += -DBOOTLOADER_SIZE=4096
59
60
61	# Build Options	14	# Build Options
62	# change yes to no to disable	15	# change yes to no to disable
63	#	16	#


diff --git a/keyboards/alf/x2/rules.mk b/keyboards/alf/x2/rules.mk index 9c4082da2..1e6d4bb7c 100644 --- a/keyboards/alf/x2/rules.mk +++ b/keyboards/alf/x2/rules.mk
@@ -1,45 +1,15 @@
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	12	BOOTLOADER = atmel-dfu
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	# Interrupt driven control endpoint task(+60)
37	OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
38
39
40	# Boot Section Size in bytes
41	OPT_DEFS += -DBOOTLOADER_SIZE=4096
42
43		13
44	# Build Options	14	# Build Options
45	# comment out to disable the options.	15	# comment out to disable the options.
@@ -53,4 +23,4 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
53	NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work	23	NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
54	BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality	24	BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
55	AUDIO_ENABLE = no	25	AUDIO_ENABLE = no
56	RGBLIGHT_ENABLE = yes \ No newline at end of file	26	RGBLIGHT_ENABLE = yes