commit 5bdeb7dad11c1566cf35ea2c70db20f66d1823a8
parent 8347a6688f479edb3c46fba91d79ac1d5848586b
Author: Joel Challis <git@zvecr.com>
Date: Tue, 10 Jun 2025 22:20:34 +0100
Migrate remaining `DEFAULT_FOLDER` to keyboard aliases (#25291)
Diffstat:
20 files changed, 49 insertions(+), 39 deletions(-)
diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
@@ -2258,5 +2258,54 @@
},
"zsa/planck_ez": {
"target": "zsa/planck_ez/base"
+ },
+ // DEFAULT_FOLDER removed during 2025 Q3 cycle
+ "cannonkeys/satisfaction75": {
+ "target": "cannonkeys/satisfaction75/rev1"
+ },
+ "converter/adb_usb": {
+ "target": "converter/adb_usb/rev1"
+ },
+ "converter/sun_usb": {
+ "target": "converter/sun_usb/type5"
+ },
+ "converter/usb_usb": {
+ "target": "converter/usb_usb/hasu"
+ },
+ "durgod/dgk6x": {
+ "target": "durgod/dgk6x/hades_ansi"
+ },
+ "ergodox_ez": {
+ "target": "ergodox_ez/base"
+ },
+ "ferris/0_2": {
+ "target": "ferris/0_2/base"
+ },
+ "handwired/dygma/raise": {
+ "target": "handwired/dygma/raise/ansi"
+ },
+ "helix/pico": {
+ "target": "helix/pico/base"
+ },
+ "helix": {
+ "target": "helix/rev2/base"
+ },
+ "helix/rev2": {
+ "target": "helix/rev2/base"
+ },
+ "ibm/model_m/mschwingen": {
+ "target": "ibm/model_m/mschwingen/led_wired"
+ },
+ "mechwild/sugarglider": {
+ "target": "mechwild/sugarglider/wide_oled/f401"
+ },
+ "mechwild/sugarglider/wide_oled": {
+ "target": "mechwild/sugarglider/wide_oled/f401"
+ },
+ "novelkeys/nk65": {
+ "target": "novelkeys/nk65/base"
+ },
+ "sirius/uni660/rev2": {
+ "target": "sirius/uni660/rev2/ansi"
}
}
diff --git a/keyboards/cannonkeys/satisfaction75/rules.mk b/keyboards/cannonkeys/satisfaction75/rules.mk
@@ -5,5 +5,3 @@ VPATH += keyboards/cannonkeys/lib/satisfaction75
SRC += satisfaction_encoder.c \
satisfaction_oled.c \
satisfaction_core.c
-
-DEFAULT_FOLDER = cannonkeys/satisfaction75/rev1
-\ No newline at end of file
diff --git a/keyboards/converter/adb_usb/rules.mk b/keyboards/converter/adb_usb/rules.mk
@@ -3,5 +3,3 @@ CUSTOM_MATRIX = yes
SRC += matrix.c adb.c led.c
# OPT_DEFS += -DADB_MOUSE_ENABLE -DMOUSE_ENABLE
-
-DEFAULT_FOLDER = converter/adb_usb/rev1
diff --git a/keyboards/converter/sun_usb/rules.mk b/keyboards/converter/sun_usb/rules.mk
@@ -3,5 +3,3 @@ CUSTOM_MATRIX = yes
SRC += matrix.c led.c
UART_DRIVER_REQUIRED = yes
-
-DEFAULT_FOLDER = converter/sun_usb/type5
diff --git a/keyboards/converter/usb_usb/rules.mk b/keyboards/converter/usb_usb/rules.mk
@@ -1,5 +1,3 @@
CUSTOM_MATRIX = yes
SRC += custom_matrix.cpp
-
-DEFAULT_FOLDER = converter/usb_usb/hasu
diff --git a/keyboards/durgod/dgk6x/rules.mk b/keyboards/durgod/dgk6x/rules.mk
@@ -1,4 +1,2 @@
# Do not put the microcontroller into power saving mode
NO_SUSPEND_POWER_DOWN = yes
-
-DEFAULT_FOLDER=durgod/dgk6x/hades_ansi
diff --git a/keyboards/ergodox_ez/rules.mk b/keyboards/ergodox_ez/rules.mk
@@ -14,5 +14,3 @@ AUDIO_SUPPORTED = no
BACKLIGHT_SUPPORTED = no
MOUSE_SHARED_EP = no
-
-DEFAULT_FOLDER = ergodox_ez/base
diff --git a/keyboards/ferris/0_2/rules.mk b/keyboards/ferris/0_2/rules.mk
@@ -2,5 +2,3 @@ CUSTOM_MATRIX = lite
SRC += matrix.c
I2C_DRIVER_REQUIRED = yes
-
-DEFAULT_FOLDER = ferris/0_2/base
diff --git a/keyboards/handwired/dygma/raise/rules.mk b/keyboards/handwired/dygma/raise/rules.mk
@@ -7,5 +7,3 @@ CUSTOM_MATRIX = lite
I2C_DRIVER_REQUIRED = yes
SRC += matrix.c
-
-DEFAULT_FOLDER = handwired/dygma/raise/ansi
diff --git a/keyboards/helix/pico/rules.mk b/keyboards/helix/pico/rules.mk
@@ -3,5 +3,3 @@ LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.)
LED_ANIMATIONS = yes # LED animations
IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
-
-DEFAULT_FOLDER = helix/pico/base
diff --git a/keyboards/helix/rev2/rules.mk b/keyboards/helix/rev2/rules.mk
@@ -7,5 +7,3 @@ LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.)
LED_ANIMATIONS = yes # LED animations
IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
-
-DEFAULT_FOLDER = helix/rev2/base
diff --git a/keyboards/helix/rules.mk b/keyboards/helix/rules.mk
@@ -1,3 +1 @@
-DEFAULT_FOLDER = helix/rev2
-
HELIX_TOP_DIR := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
diff --git a/keyboards/ibm/model_m/mschwingen/rules.mk b/keyboards/ibm/model_m/mschwingen/rules.mk
@@ -5,5 +5,3 @@ UART_DRIVER_REQUIRED = yes
SPI_DRIVER_REQUIRED = yes
OPT_DEFS += -DSLEEP_LED_ENABLE
-
-DEFAULT_FOLDER = ibm/model_m/mschwingen/led_wired
diff --git a/keyboards/mechwild/sugarglider/rules.mk b/keyboards/mechwild/sugarglider/rules.mk
@@ -7,5 +7,3 @@ CUSTOM_MATRIX = lite
VPATH += drivers/gpio
SRC += mcp23018.c matrix.c
I2C_DRIVER_REQUIRED = yes
-
-DEFAULT_FOLDER = mechwild/sugarglider/wide_oled
diff --git a/keyboards/mechwild/sugarglider/wide_oled/rules.mk b/keyboards/mechwild/sugarglider/wide_oled/rules.mk
@@ -2,5 +2,3 @@
# change yes to no to disable
#
WIDE_OLED_ENABLE = yes
-
-DEFAULT_FOLDER = mechwild/sugarglider/wide_oled/f401
diff --git a/keyboards/novelkeys/nk65/rules.mk b/keyboards/novelkeys/nk65/rules.mk
@@ -11,5 +11,3 @@ SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
drivers/led/issi/is31fl3733.c \
quantum/color.c
-
-DEFAULT_FOLDER = novelkeys/nk65/base
diff --git a/keyboards/redox/rules.mk b/keyboards/redox/rules.mk
@@ -1,5 +1,3 @@
-DEFAULT_FOLDER = redox/rev1/base
-
# Disable unsupported hardware
AUDIO_SUPPORTED = no
BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/sirius/uni660/rev2/rules.mk b/keyboards/sirius/uni660/rev2/rules.mk
@@ -3,5 +3,3 @@ CUSTOM_MATRIX = lite
# project specific files
SRC += matrix.c
UART_DRIVER_REQUIRED = yes
-
-DEFAULT_FOLDER = sirius/uni660/rev2/ansi
diff --git a/keyboards/tzarc/djinn/rules.mk b/keyboards/tzarc/djinn/rules.mk
@@ -8,5 +8,3 @@ SRC += \
djinn_portscan_matrix.c \
djinn_split_sync.c \
djinn_usbpd.c
-
-DEFAULT_FOLDER = tzarc/djinn/rev2
diff --git a/keyboards/tzarc/ghoul/rules.mk b/keyboards/tzarc/ghoul/rules.mk
@@ -1,6 +1,4 @@
CUSTOM_MATRIX = lite
QUANTUM_PAINTER_DRIVERS = ssd1351_spi
-DEFAULT_FOLDER = tzarc/ghoul/rev1/stm32
-
ANALOG_DRIVER_REQUIRED = yes
