Skip to content

Commit

Permalink
Clean up remaining rules.mk MCU/BOOTLOADERs (#19778)
Browse files Browse the repository at this point in the history 
Co-authored-by: Nick Brassel <[email protected]>
  • Loading branch information
@fauxpark @tzarc
fauxpark and tzarc authored Feb 17, 2023
1 parent f4ba17c commit 43843e1
Show file tree
Hide file tree
Showing 31 changed files with 50 additions and 79 deletions.
7 changes: 0 additions & 7 deletions keyboards/dztech/dz60rgb/v1/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
# MCU name
MCU = STM32F303
BOARD = QMK_PROTON_C

# Bootloader selection
BOOTLOADER = stm32-dfu

# Build Options
# change yes to no to disable
#
Expand Down
2 changes: 1 addition & 1 deletion keyboards/evyd13/atom47/rev4/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"caps_lock": "D1",
"on_state": 0
},
"processor": "atmega32u4",
"processor": "atmega32u2",
"bootloader": "qmk-dfu",
"layouts": {
"LAYOUT_split_space": {
Expand Down
3 changes: 0 additions & 3 deletions keyboards/evyd13/atom47/rev4/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# MCU name
MCU = atmega32u2

# Build Options
ENCODER_ENABLE = yes
BACKLIGHT_ENABLE = no
Expand Down
2 changes: 2 additions & 0 deletions keyboards/helix/pico/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
"pid": "0x0001",
"device_version": "0.0.2"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
2 changes: 2 additions & 0 deletions keyboards/helix/rev2/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
2 changes: 2 additions & 0 deletions keyboards/helix/rev3_4rows/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
"pid": "0x0004",
"device_version": "0.0.1"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
2 changes: 2 additions & 0 deletions keyboards/helix/rev3_5rows/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
"pid": "0x0003",
"device_version": "0.0.1"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
6 changes: 0 additions & 6 deletions keyboards/helix/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
# MCU name
MCU = atmega32u4

# Bootloader selection
BOOTLOADER = caterina

# Build Options
# change yes to no to disable
#
Expand Down
4 changes: 4 additions & 0 deletions keyboards/hhkb/ansi/32u2/info.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"processor": "atmega32u2",
"bootloader": "atmel-dfu"
}
3 changes: 0 additions & 3 deletions keyboards/hhkb/ansi/32u2/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
# MCU name
MCU = atmega32u2

CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
4 changes: 4 additions & 0 deletions keyboards/hhkb/ansi/32u4/info.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"processor": "atmega32u4",
"bootloader": "atmel-dfu"
}
Empty file added keyboards/hhkb/ansi/32u4/rules.mk
View file
Empty file.
8 changes: 2 additions & 6 deletions keyboards/hhkb/ansi/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
# MCU name
MCU = atmega32u4

# Bootloader selection
BOOTLOADER = atmel-dfu

# Build Options
# change yes to no to disable
#
Expand Down Expand Up @@ -34,3 +28,5 @@ SRC = matrix.c
# debug-off: EXTRAFLAGS += -DNO_DEBUG -DNO_PRINT
# debug-off: OPT_DEFS := $(filter-out -DCONSOLE_ENABLE,$(OPT_DEFS))
# debug-off: all

DEFAULT_FOLDER = hhkb/ansi/32u4
3 changes: 3 additions & 0 deletions keyboards/mechlovin/adelais/rgb_led/rev1/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
"usb": {
"pid": "0xAEC1"
},
"processor": "STM32F303",
"board": "QMK_PROTON_C",
"bootloader": "stm32-dfu",
"indicators": {
"caps_lock": "B2",
"num_lock": "C15",
Expand Down
3 changes: 3 additions & 0 deletions keyboards/mechlovin/adelais/rgb_led/rev2/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
"usb": {
"pid": "0xAEC2"
},
"processor": "STM32F303",
"board": "QMK_PROTON_C",
"bootloader": "stm32-dfu",
"indicators": {
"caps_lock": "B2",
"num_lock": "C15",
Expand Down
2 changes: 2 additions & 0 deletions keyboards/mechlovin/adelais/rgb_led/rev3/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
"usb": {
"pid": "0xAEC3"
},
"processor": "STM32F103",
"bootloader": "stm32duino",
"indicators": {
"caps_lock": "C14",
"num_lock": "A0",
Expand Down
6 changes: 0 additions & 6 deletions keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
# MCU name
MCU = STM32F103

# Bootloader selection
BOOTLOADER = stm32duino

# Build Options
# change yes to no to disable
#
Expand Down
7 changes: 0 additions & 7 deletions keyboards/mechlovin/adelais/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
# MCU name
MCU = STM32F303
BOARD = QMK_PROTON_C

# Bootloader selection
BOOTLOADER = stm32-dfu

# Build Options
# change yes to no to disable
#
Expand Down
5 changes: 4 additions & 1 deletion keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"usb": {
"pid": "0xAD01"
}
},
"processor": "STM32F303",
"board": "QMK_PROTON_C",
"bootloader": "stm32-dfu"
}
5 changes: 4 additions & 1 deletion keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"usb": {
"pid": "0xAD02"
}
},
"processor": "STM32F303",
"board": "QMK_PROTON_C",
"bootloader": "stm32-dfu"
}
4 changes: 4 additions & 0 deletions keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/info.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"processor": "STM32F103",
"bootloader": "stm32duino"
}
5 changes: 0 additions & 5 deletions keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +0,0 @@
# MCU name
MCU = STM32F103

# Bootloader selection
BOOTLOADER = stm32duino
2 changes: 2 additions & 0 deletions keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
ENCODER_ENABLE = yes

DEFAULT_FOLDER = mechlovin/adelais/standard_led/arm/rev4/stm32f303
5 changes: 5 additions & 0 deletions keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/info.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"processor": "STM32F303",
"board": "QMK_PROTON_C",
"bootloader": "stm32-dfu"
}
6 changes: 0 additions & 6 deletions keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,6 +0,0 @@
# MCU name
MCU = STM32F303
BOARD = QMK_PROTON_C

# Bootloader selection
BOOTLOADER = stm32-dfu
2 changes: 2 additions & 0 deletions keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
"usb": {
"pid": "0xAD04"
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"indicators": {
"caps_lock": "E6",
"num_lock": "D7",
Expand Down
6 changes: 0 additions & 6 deletions keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
# MCU name
MCU = atmega32u4

# Bootloader selection
BOOTLOADER = atmel-dfu

CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
Expand Down
7 changes: 0 additions & 7 deletions keyboards/splitkb/kyria/rev1/proton_c/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
# MCU name
MCU = STM32F303
BOARD = QMK_PROTON_C

# Bootloader selection
BOOTLOADER = stm32-dfu

WS2812_DRIVER = pwm
SERIAL_DRIVER = usart
AUDIO_ENABLE = no
Expand Down
7 changes: 0 additions & 7 deletions keyboards/splitkb/kyria/rev2/proton_c/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
# MCU name
MCU = STM32F303
BOARD = QMK_PROTON_C

# Bootloader selection
BOOTLOADER = stm32-dfu

WS2812_DRIVER = pwm
SERIAL_DRIVER = usart
AUDIO_ENABLE = no
Expand Down
2 changes: 2 additions & 0 deletions keyboards/ymdk/ymd40/air40/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
"pid": "0x0911",
"device_version": "0.0.1"
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_ortho_4x12": {
"layout": [
Expand Down
7 changes: 0 additions & 7 deletions keyboards/ymdk/ymd40/air40/rules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
# MCU name
MCU = atmega32u4

# Bootloader selection
BOOTLOADER = atmel-dfu

# Build Options
# change yes to no to disable
#
Expand All @@ -23,4 +17,3 @@ AUDIO_SUPPORTED = no
KEY_LOCK_ENABLE = no

LAYOUTS = ortho_4x12

0 comments on commit 43843e1

Please sign in to comment.