~ruther/qmk_firmware

43843e19b630da894e7d5b92edbce8dbdf7f288c — Ryan 2 years ago f4ba17c
Clean up remaining rules.mk `MCU`/`BOOTLOADER`s (#19778)

Co-authored-by: Nick Brassel <nick@tzarc.org>
31 files changed, 50 insertions(+), 79 deletions(-)

M keyboards/dztech/dz60rgb/v1/rules.mk
M keyboards/evyd13/atom47/rev4/info.json
M keyboards/evyd13/atom47/rev4/rules.mk
M keyboards/helix/pico/info.json
M keyboards/helix/rev2/info.json
M keyboards/helix/rev3_4rows/info.json
M keyboards/helix/rev3_5rows/info.json
M keyboards/helix/rules.mk
A keyboards/hhkb/ansi/32u2/info.json
M keyboards/hhkb/ansi/32u2/rules.mk
A keyboards/hhkb/ansi/32u4/info.json
A keyboards/hhkb/ansi/32u4/rules.mk
M keyboards/hhkb/ansi/rules.mk
M keyboards/mechlovin/adelais/rgb_led/rev1/info.json
M keyboards/mechlovin/adelais/rgb_led/rev2/info.json
M keyboards/mechlovin/adelais/rgb_led/rev3/info.json
M keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk
M keyboards/mechlovin/adelais/rules.mk
M keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json
M keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json
A keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/info.json
M keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk
M keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk
A keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/info.json
M keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk
M keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
M keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk
M keyboards/splitkb/kyria/rev1/proton_c/rules.mk
M keyboards/splitkb/kyria/rev2/proton_c/rules.mk
M keyboards/ymdk/ymd40/air40/info.json
M keyboards/ymdk/ymd40/air40/rules.mk
M keyboards/dztech/dz60rgb/v1/rules.mk => keyboards/dztech/dz60rgb/v1/rules.mk +0 -7
@@ 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
#

M keyboards/evyd13/atom47/rev4/info.json => keyboards/evyd13/atom47/rev4/info.json +1 -1
@@ 12,7 12,7 @@
        "caps_lock": "D1",
        "on_state": 0
    },
    "processor": "atmega32u4",
    "processor": "atmega32u2",
    "bootloader": "qmk-dfu",
    "layouts": {
        "LAYOUT_split_space": {

M keyboards/evyd13/atom47/rev4/rules.mk => keyboards/evyd13/atom47/rev4/rules.mk +0 -3
@@ 1,6 1,3 @@
# MCU name
MCU = atmega32u2

# Build Options
ENCODER_ENABLE = yes
BACKLIGHT_ENABLE = no

M keyboards/helix/pico/info.json => keyboards/helix/pico/info.json +2 -0
@@ 8,6 8,8 @@
        "pid": "0x0001",
        "device_version": "0.0.2"
    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
        "LAYOUT": {
            "layout": [

M keyboards/helix/rev2/info.json => keyboards/helix/rev2/info.json +2 -0
@@ 8,6 8,8 @@
        "pid": "0x0000",
        "device_version": "0.0.1"
    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
        "LAYOUT": {
            "layout": [

M keyboards/helix/rev3_4rows/info.json => keyboards/helix/rev3_4rows/info.json +2 -0
@@ 8,6 8,8 @@
    "pid": "0x0004",
    "device_version": "0.0.1"
  },
  "processor": "atmega32u4",
  "bootloader": "caterina",
  "layouts": {
    "LAYOUT": {
      "layout": [

M keyboards/helix/rev3_5rows/info.json => keyboards/helix/rev3_5rows/info.json +2 -0
@@ 8,6 8,8 @@
    "pid": "0x0003",
    "device_version": "0.0.1"
  },
  "processor": "atmega32u4",
  "bootloader": "caterina",
  "layouts": {
    "LAYOUT": {
      "layout": [

M keyboards/helix/rules.mk => keyboards/helix/rules.mk +0 -6
@@ 1,9 1,3 @@
# MCU name
MCU = atmega32u4

# Bootloader selection
BOOTLOADER = caterina

# Build Options
#   change yes to no to disable
#

A keyboards/hhkb/ansi/32u2/info.json => keyboards/hhkb/ansi/32u2/info.json +4 -0
@@ 0,0 1,4 @@
{
    "processor": "atmega32u2",
    "bootloader": "atmel-dfu"
}

M keyboards/hhkb/ansi/32u2/rules.mk => keyboards/hhkb/ansi/32u2/rules.mk +0 -3
@@ 1,5 1,2 @@
# MCU name
MCU = atmega32u2

CONSOLE_ENABLE = no   # Console for debug
COMMAND_ENABLE = no   # Commands for debug and configuration

A keyboards/hhkb/ansi/32u4/info.json => keyboards/hhkb/ansi/32u4/info.json +4 -0
@@ 0,0 1,4 @@
{
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu"
}

A keyboards/hhkb/ansi/32u4/rules.mk => keyboards/hhkb/ansi/32u4/rules.mk +0 -0
M keyboards/hhkb/ansi/rules.mk => keyboards/hhkb/ansi/rules.mk +2 -6
@@ 1,9 1,3 @@
# MCU name
MCU = atmega32u4

# Bootloader selection
BOOTLOADER = atmel-dfu

# Build Options
#   change yes to no to disable
#


@@ 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

M keyboards/mechlovin/adelais/rgb_led/rev1/info.json => keyboards/mechlovin/adelais/rgb_led/rev1/info.json +3 -0
@@ 3,6 3,9 @@
    "usb": {
        "pid": "0xAEC1"
    },
    "processor": "STM32F303",
    "board": "QMK_PROTON_C",
    "bootloader": "stm32-dfu",
    "indicators": {
        "caps_lock": "B2",
        "num_lock": "C15",

M keyboards/mechlovin/adelais/rgb_led/rev2/info.json => keyboards/mechlovin/adelais/rgb_led/rev2/info.json +3 -0
@@ 3,6 3,9 @@
    "usb": {
        "pid": "0xAEC2"
    },
    "processor": "STM32F303",
    "board": "QMK_PROTON_C",
    "bootloader": "stm32-dfu",
    "indicators": {
        "caps_lock": "B2",
        "num_lock": "C15",

M keyboards/mechlovin/adelais/rgb_led/rev3/info.json => keyboards/mechlovin/adelais/rgb_led/rev3/info.json +2 -0
@@ 3,6 3,8 @@
    "usb": {
        "pid": "0xAEC3"
    },
    "processor": "STM32F103",
    "bootloader": "stm32duino",
    "indicators": {
        "caps_lock": "C14",
        "num_lock": "A0",

M keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk => keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk +0 -6
@@ 1,9 1,3 @@
# MCU name
MCU = STM32F103

# Bootloader selection
BOOTLOADER = stm32duino

# Build Options
#   change yes to no to disable
#

M keyboards/mechlovin/adelais/rules.mk => keyboards/mechlovin/adelais/rules.mk +0 -7
@@ 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
#

M keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json => keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json +4 -1
@@ 1,5 1,8 @@
{
    "usb": {
        "pid": "0xAD01"
    }
    },
    "processor": "STM32F303",
    "board": "QMK_PROTON_C",
    "bootloader": "stm32-dfu"
}

M keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json => keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json +4 -1
@@ 1,5 1,8 @@
{
    "usb": {
        "pid": "0xAD02"
    }
    },
    "processor": "STM32F303",
    "board": "QMK_PROTON_C",
    "bootloader": "stm32-dfu"
}

A keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/info.json => keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/info.json +4 -0
@@ 0,0 1,4 @@
{
    "processor": "STM32F103",
    "bootloader": "stm32duino"
}

M keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk => keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk +0 -5
@@ 1,5 0,0 @@
# MCU name
MCU = STM32F103

# Bootloader selection
BOOTLOADER = stm32duino

M keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk => keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk +2 -0
@@ 1,1 1,3 @@
ENCODER_ENABLE = yes

DEFAULT_FOLDER = mechlovin/adelais/standard_led/arm/rev4/stm32f303

A keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/info.json => keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/info.json +5 -0
@@ 0,0 1,5 @@
{
    "processor": "STM32F303",
    "board": "QMK_PROTON_C",
    "bootloader": "stm32-dfu"
}

M keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk => keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk +0 -6
@@ 1,6 0,0 @@
# MCU name
MCU = STM32F303
BOARD = QMK_PROTON_C

# Bootloader selection
BOOTLOADER = stm32-dfu

M keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json => keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json +2 -0
@@ 3,6 3,8 @@
    "usb": {
        "pid": "0xAD04"
    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "indicators": {
        "caps_lock": "E6",
        "num_lock": "D7",

M keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk => keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk +0 -6
@@ 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

M keyboards/splitkb/kyria/rev1/proton_c/rules.mk => keyboards/splitkb/kyria/rev1/proton_c/rules.mk +0 -7
@@ 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

M keyboards/splitkb/kyria/rev2/proton_c/rules.mk => keyboards/splitkb/kyria/rev2/proton_c/rules.mk +0 -7
@@ 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

M keyboards/ymdk/ymd40/air40/info.json => keyboards/ymdk/ymd40/air40/info.json +2 -0
@@ 8,6 8,8 @@
        "pid": "0x0911",
        "device_version": "0.0.1"
    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
        "LAYOUT_ortho_4x12": {
            "layout": [

M keyboards/ymdk/ymd40/air40/rules.mk => keyboards/ymdk/ymd40/air40/rules.mk +0 -7
@@ 1,9 1,3 @@
# MCU name
MCU = atmega32u4

# Bootloader selection
BOOTLOADER = atmel-dfu

# Build Options
#   change yes to no to disable
#


@@ 23,4 17,3 @@ AUDIO_SUPPORTED = no
KEY_LOCK_ENABLE = no

LAYOUTS = ortho_4x12