From 2ce6adff2b0b4f049b3bd8b4169cda977c057fa5 Mon Sep 17 00:00:00 2001
From: fauxpark <fauxpark@gmail.com>
Date: Fri, 1 Nov 2019 00:11:36 +1100
Subject: [PATCH] Miscellaneous rules.mk cleanups (#7212)

* Miscellaneous rules.mk cleanups

* Put back ARM bootloader rules
---
 keyboards/converter/usb_usb/ble/rules.mk       | 5 +++--
 keyboards/converter/usb_usb/hasu/rules.mk      | 1 +
 keyboards/converter/usb_usb/pro_micro/rules.mk | 1 +
 keyboards/handwired/42/rules.mk                | 2 +-
 keyboards/handwired/chiron/rules.mk            | 2 +-
 keyboards/handwired/fruity60/rules.mk          | 6 +++---
 keyboards/kbdfans/kbd67/mkii_soldered/rules.mk | 4 +---
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/keyboards/converter/usb_usb/ble/rules.mk b/keyboards/converter/usb_usb/ble/rules.mk
index f5ab3880bfcf37d3a43232e2dfee004fb26e713f..a882bd1458854fa117cf16c9f2d8987d34c08280 100644
--- a/keyboards/converter/usb_usb/ble/rules.mk
+++ b/keyboards/converter/usb_usb/ble/rules.mk
@@ -1,5 +1,4 @@
-BLUETOOTH = AdafruitBLE
-ADAFRUIT_BLE_ENABLE = yes
+# Processor frequency
 F_CPU = 8000000
 
 BOOTMAGIC_ENABLE = no      # Virtual DIP switch configuration(+1000)
@@ -19,5 +18,7 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 HD44780_ENABLE = no 		# Enable support for HD44780 based LCDs (+400)
+BLUETOOTH = AdafruitBLE
+ADAFRUIT_BLE_ENABLE = yes
 
 EXTRAFLAGS += -flto
diff --git a/keyboards/converter/usb_usb/hasu/rules.mk b/keyboards/converter/usb_usb/hasu/rules.mk
index 27d8af7683e8d80138ae6333eae982e04415804f..c2ee0bc86f978b7fbb1163ae7a5e16b69dd7b63d 100644
--- a/keyboards/converter/usb_usb/hasu/rules.mk
+++ b/keyboards/converter/usb_usb/hasu/rules.mk
@@ -1 +1,2 @@
+# Processor frequency
 F_CPU = 16000000
diff --git a/keyboards/converter/usb_usb/pro_micro/rules.mk b/keyboards/converter/usb_usb/pro_micro/rules.mk
index 7c04fa34fd24a498577dec621f735f388a2ebd28..3437a35bdf1d396646ebb3ac285788fb68a6f115 100644
--- a/keyboards/converter/usb_usb/pro_micro/rules.mk
+++ b/keyboards/converter/usb_usb/pro_micro/rules.mk
@@ -1 +1,2 @@
+# Processor frequency
 F_CPU = 8000000
diff --git a/keyboards/handwired/42/rules.mk b/keyboards/handwired/42/rules.mk
index b44a0a518cbd30ee5488085787e2683da9751a23..f2306f310fc1dfee8febca23b460070da971d2c1 100644
--- a/keyboards/handwired/42/rules.mk
+++ b/keyboards/handwired/42/rules.mk
@@ -1,7 +1,7 @@
 # MCU name
 MCU = atmega32u4
 
-# Processor frequency.
+# Processor frequency
 F_CPU = 8000000
 
 # Bootloader selection
diff --git a/keyboards/handwired/chiron/rules.mk b/keyboards/handwired/chiron/rules.mk
index a5bbb30e18a9ceb4f38c7a249f6951f892c8f484..96f64227004ebe4d5943d8622423794fc6ca4064 100644
--- a/keyboards/handwired/chiron/rules.mk
+++ b/keyboards/handwired/chiron/rules.mk
@@ -10,7 +10,6 @@ MCU = atmega32u4
 #   ATmega32A    bootloadHID
 #   ATmega328P   USBasp
 BOOTLOADER = atmel-dfu
-SPLIT_KEYBOARD = yes
 
 # Build Options
 #   change yes to no to disable
@@ -36,3 +35,4 @@ TAP_DANCE_ENABLE = no
 UCIS_ENABLE = no
 UNICODEMAP_ENABLE = no
 UNICODE_ENABLE = no
+SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/fruity60/rules.mk b/keyboards/handwired/fruity60/rules.mk
index 8c9bc95e504ebbd9c2bdfcf6aef3e16b2e699d3b..9e64f161af952274776f411258068cd72659256f 100644
--- a/keyboards/handwired/fruity60/rules.mk
+++ b/keyboards/handwired/fruity60/rules.mk
@@ -1,6 +1,9 @@
 # MCU name
 MCU = atmega32u4
 
+# Processor frequency
+F_CPU = 8000000
+
 # Bootloader selection
 #   Teensy       halfkay
 #   Pro Micro    caterina
@@ -11,9 +14,6 @@ MCU = atmega32u4
 #   ATmega328P   USBasp
 BOOTLOADER = caterina
 
-# Processor frequency
-F_CPU = 8000000
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/rules.mk b/keyboards/kbdfans/kbd67/mkii_soldered/rules.mk
index bf65a7a74e3583bb4408c1b7bf4044f5b0e0fe07..a945af726a630d162899ce6fb87188314f06a628 100644
--- a/keyboards/kbdfans/kbd67/mkii_soldered/rules.mk
+++ b/keyboards/kbdfans/kbd67/mkii_soldered/rules.mk
@@ -1,7 +1,6 @@
 # MCU name
 MCU = atmega32u4
 
-
 # Bootloader selection
 #   Teensy       halfkay
 #   Pro Micro    caterina
@@ -12,7 +11,6 @@ MCU = atmega32u4
 #   ATmega328P   USBasp
 BOOTLOADER = atmel-dfu
 
-
 # Build Options
 #   change yes to no to disable
 #
@@ -32,4 +30,4 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
-HD44780_ENABLE = no         # Enable support for HD44780 based LCDs
\ No newline at end of file
+HD44780_ENABLE = no         # Enable support for HD44780 based LCDs