浏览代码

Miscellaneous rules.mk cleanups (#7212)

* Miscellaneous rules.mk cleanups

* Put back ARM bootloader rules
fauxpark 5 年之前
父节点
当前提交
2ce6adff2b

+ 3 - 2
keyboards/converter/usb_usb/ble/rules.mk

@@ -1,5 +1,4 @@
-BLUETOOTH = AdafruitBLE
-ADAFRUIT_BLE_ENABLE = yes
+# Processor frequency
 F_CPU = 8000000
 F_CPU = 8000000
 
 
 BOOTMAGIC_ENABLE = no      # Virtual DIP switch configuration(+1000)
 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
 AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 HD44780_ENABLE = no 		# Enable support for HD44780 based LCDs (+400)
 HD44780_ENABLE = no 		# Enable support for HD44780 based LCDs (+400)
+BLUETOOTH = AdafruitBLE
+ADAFRUIT_BLE_ENABLE = yes
 
 
 EXTRAFLAGS += -flto
 EXTRAFLAGS += -flto

+ 1 - 0
keyboards/converter/usb_usb/hasu/rules.mk

@@ -1 +1,2 @@
+# Processor frequency
 F_CPU = 16000000
 F_CPU = 16000000

+ 1 - 0
keyboards/converter/usb_usb/pro_micro/rules.mk

@@ -1 +1,2 @@
+# Processor frequency
 F_CPU = 8000000
 F_CPU = 8000000

+ 1 - 1
keyboards/handwired/42/rules.mk

@@ -1,7 +1,7 @@
 # MCU name
 # MCU name
 MCU = atmega32u4
 MCU = atmega32u4
 
 
-# Processor frequency.
+# Processor frequency
 F_CPU = 8000000
 F_CPU = 8000000
 
 
 # Bootloader selection
 # Bootloader selection

+ 1 - 1
keyboards/handwired/chiron/rules.mk

@@ -10,7 +10,6 @@ MCU = atmega32u4
 #   ATmega32A    bootloadHID
 #   ATmega32A    bootloadHID
 #   ATmega328P   USBasp
 #   ATmega328P   USBasp
 BOOTLOADER = atmel-dfu
 BOOTLOADER = atmel-dfu
-SPLIT_KEYBOARD = yes
 
 
 # Build Options
 # Build Options
 #   change yes to no to disable
 #   change yes to no to disable
@@ -36,3 +35,4 @@ TAP_DANCE_ENABLE = no
 UCIS_ENABLE = no
 UCIS_ENABLE = no
 UNICODEMAP_ENABLE = no
 UNICODEMAP_ENABLE = no
 UNICODE_ENABLE = no
 UNICODE_ENABLE = no
+SPLIT_KEYBOARD = yes

+ 3 - 3
keyboards/handwired/fruity60/rules.mk

@@ -1,6 +1,9 @@
 # MCU name
 # MCU name
 MCU = atmega32u4
 MCU = atmega32u4
 
 
+# Processor frequency
+F_CPU = 8000000
+
 # Bootloader selection
 # Bootloader selection
 #   Teensy       halfkay
 #   Teensy       halfkay
 #   Pro Micro    caterina
 #   Pro Micro    caterina
@@ -11,9 +14,6 @@ MCU = atmega32u4
 #   ATmega328P   USBasp
 #   ATmega328P   USBasp
 BOOTLOADER = caterina
 BOOTLOADER = caterina
 
 
-# Processor frequency
-F_CPU = 8000000
-
 # Build Options
 # Build Options
 #   change yes to no to disable
 #   change yes to no to disable
 #
 #

+ 1 - 3
keyboards/kbdfans/kbd67/mkii_soldered/rules.mk

@@ -1,7 +1,6 @@
 # MCU name
 # MCU name
 MCU = atmega32u4
 MCU = atmega32u4
 
 
-
 # Bootloader selection
 # Bootloader selection
 #   Teensy       halfkay
 #   Teensy       halfkay
 #   Pro Micro    caterina
 #   Pro Micro    caterina
@@ -12,7 +11,6 @@ MCU = atmega32u4
 #   ATmega328P   USBasp
 #   ATmega328P   USBasp
 BOOTLOADER = atmel-dfu
 BOOTLOADER = atmel-dfu
 
 
-
 # Build Options
 # Build Options
 #   change yes to no to disable
 #   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
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
-HD44780_ENABLE = no         # Enable support for HD44780 based LCDs
+HD44780_ENABLE = no         # Enable support for HD44780 based LCDs