Migrate some DEFAULT_FOLDER to keyboard_aliases.hjson (#24915)

data/mappings/keyboard_aliases.hjson

@@ -1626,9 +1626,15 @@
     "buzzard": {
         "target": "buzzard/rev1"
     },
+    "cannonkeys/db60": {
+        "target": "cannonkeys/db60/rev2"
+    },
     "clickety_split/leeloo": {
         "target": "clickety_split/leeloo/rev3"
     },
+    "converter/palm_usb": {
+        "target": "converter/palm_usb/stowaway"
+    },
     "crkbd": {
         "target": "crkbd/rev1"
     },
@@ -1713,6 +1719,9 @@
     "handwired/dactyl_manuform/6x6": {
         "target": "handwired/dactyl_manuform/6x6/promicro"
     },
+    "handwired/meck_tkl": {
+        "target": "handwired/meck_tkl/blackpill_f401"
+    },
     "handwired/ms_sculpt_mobile": {
         "target": "handwired/ms_sculpt_mobile/teensy2pp"
     },
@@ -1752,6 +1761,9 @@
     "hillside/46": {
         "target": "hillside/46/0_1"
     },
+    "hhkb/ansi": {
+        "target": "hhkb/ansi/32u4"
+    },
     "hillside/48": {
         "target": "hillside/48/0_1"
     },
@@ -1797,6 +1809,9 @@
     "kakunpc/angel17": {
         "target": "kakunpc/angel17/rev1"
     },
+    "kakunpc/angel64": {
+        "target": "kakunpc/angel64/rev1"
+    },
     "kakunpc/business_card": {
         "target": "kakunpc/business_card/beta"
     },
@@ -2148,6 +2163,9 @@
     "takashiski/namecard2x4": {
         "target": "takashiski/namecard2x4/rev2"
     },
+    "teleport/native": {
+        "target": "teleport/native/iso"
+    },
     "themadnoodle/noodlepad": {
         "target": "themadnoodle/noodlepad/v1"
     },
@@ -2181,6 +2199,21 @@
     "vitamins_included": {
         "target": "vitamins_included/rev2"
     },
+    "westm/westm68": {
+        "target": "westm/westm68/rev2"
+    },
+    "westm/westm9": {
+        "target": "westm/westm9/rev2"
+    },
+    "woodkeys/meira": {
+        "target": "woodkeys/meira/promicro"
+    },
+    "work_louder/loop": {
+        "target": "work_louder/loop/rev3"
+    },
+    "work_louder/work_board": {
+        "target": "work_louder/work_board/rev3"
+    },
     "yanghu/unicorne": {
         "target": "yanghu/unicorne/f411"
     },
@@ -2195,5 +2228,8 @@
     },
     "yynmt/acperience12": {
         "target": "yynmt/acperience12/rev1"
+    },
+    "zsa/planck_ez": {
+        "target": "zsa/planck_ez/base"
     }
 }

keyboards/westm/westm9/rules.mk → keyboards/cannonkeys/db60/hotswap/rules.mk

@@ -1,4 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-DEFAULT_FOLDER = westm/westm9/rev2

keyboards/westm/westm68/rules.mk → keyboards/cannonkeys/db60/j02/rules.mk

@@ -1,4 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-DEFAULT_FOLDER = westm/westm68/rev2

keyboards/cannonkeys/db60/rules.mk → keyboards/cannonkeys/db60/rev2/rules.mk

@@ -1,4 +1,2 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-DEFAULT_FOLDER = cannonkeys/db60/rev2

keyboards/converter/palm_usb/info.json

@@ -1,20 +0,0 @@
-{
-    "keyboard_name": "Stowaway Converter",
-    "manufacturer": "QMK",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0001",
-        "device_version": "1.0.0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
-    "features": {
-        "bootmagic": false,
-        "mousekey": false,
-        "extrakey": false,
-        "console": true,
-        "command": true
-    }
-}

keyboards/converter/palm_usb/stowaway/keyboard.json

@@ -1,4 +1,22 @@
 {
+    "keyboard_name": "Stowaway Converter",
+    "manufacturer": "QMK",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0001",
+        "device_version": "1.0.0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "features": {
+        "bootmagic": false,
+        "mousekey": false,
+        "extrakey": false,
+        "console": true,
+        "command": true
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/converter/palm_usb/rules.mk → keyboards/converter/palm_usb/stowaway/rules.mk

@@ -3,5 +3,3 @@ CUSTOM_MATRIX = yes
 
 SRC += matrix.c
 UART_DRIVER_REQUIRED = yes
-
-DEFAULT_FOLDER = converter/palm_usb/stowaway

keyboards/handwired/meck_tkl/blackpill_f401/rules.mk

@@ -0,0 +1,2 @@
+AUDIO_SUPPORTED = no
+BACKLIGHT_SUPPORTED = no

keyboards/handwired/meck_tkl/rules.mk

@@ -1,4 +0,0 @@
-AUDIO_SUPPORTED = no
-BACKLIGHT_SUPPORTED = no
-
-DEFAULT_FOLDER = handwired/meck_tkl/blackpill_f401

keyboards/hhkb/ansi/rules.mk → keyboards/hhkb/ansi/32u2/rules.mk

@@ -2,5 +2,3 @@ CUSTOM_MATRIX = yes
 
 # project specific files
 SRC = matrix.c
-
-DEFAULT_FOLDER = hhkb/ansi/32u4

keyboards/hhkb/ansi/32u4/rules.mk

@@ -0,0 +1,4 @@
+CUSTOM_MATRIX = yes
+
+# project specific files
+SRC = matrix.c

keyboards/kakunpc/angel64/alpha/rules.mk

@@ -0,0 +1,3 @@
+CUSTOM_MATRIX = yes
+
+SRC += matrix.c

keyboards/kakunpc/angel64/rev1/rules.mk

@@ -0,0 +1,3 @@
+CUSTOM_MATRIX = yes
+
+SRC += matrix.c

keyboards/kakunpc/angel64/rules.mk

@@ -1,5 +0,0 @@
-CUSTOM_MATRIX = yes
-
-SRC += matrix.c
-
-DEFAULT_FOLDER = kakunpc/angel64/rev1

keyboards/oddball/rules.mk → keyboards/oddball/v1/rules.mk

@@ -1,3 +1 @@
 POINTING_DEVICE_DRIVER = adns9800
-
-DEFAULT_FOLDER = oddball/v1

keyboards/oddball/v2/rules.mk

@@ -0,0 +1 @@
+POINTING_DEVICE_DRIVER = adns9800

keyboards/oddball/v2_1/rules.mk

@@ -0,0 +1 @@
+POINTING_DEVICE_DRIVER = adns9800

keyboards/teleport/native/ansi/rules.mk

@@ -0,0 +1 @@
+RGB_MATRIX_CUSTOM_KB = yes

keyboards/teleport/native/iso/rules.mk

@@ -0,0 +1 @@
+RGB_MATRIX_CUSTOM_KB = yes

keyboards/teleport/native/rules.mk

@@ -1,3 +0,0 @@
-RGB_MATRIX_CUSTOM_KB = yes
-
-DEFAULT_FOLDER = teleport/native/iso

keyboards/westm/westm68/rev1/rules.mk

@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF

keyboards/westm/westm68/rev2/rules.mk

@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF

keyboards/westm/westm9/rev1/rules.mk

@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF

keyboards/westm/westm9/rev2/rules.mk

@@ -0,0 +1,2 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF

keyboards/woodkeys/meira/featherble/rules.mk

@@ -1,2 +1,5 @@
 # Processor frequency
 F_CPU = 8000000
+
+CUSTOM_MATRIX = yes
+SRC += matrix.c

keyboards/woodkeys/meira/promicro/rules.mk

@@ -1,3 +1,6 @@
+CUSTOM_MATRIX = yes
+SRC += matrix.c
+
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
 AUDIO_SUPPORTED = no

keyboards/woodkeys/meira/rules.mk

@@ -1,4 +0,0 @@
-CUSTOM_MATRIX = yes
-SRC += matrix.c
-
-DEFAULT_FOLDER = woodkeys/meira/promicro

keyboards/work_louder/loop/post_rules.mk

@@ -0,0 +1 @@
+SRC += rgb_functions.c

keyboards/work_louder/loop/rules.mk

@@ -1,3 +0,0 @@
-SRC += rgb_functions.c
-
-DEFAULT_FOLDER = work_louder/loop/rev3

keyboards/work_louder/work_board/post_rules.mk

@@ -0,0 +1 @@
+SRC += rgb_functions.c

keyboards/work_louder/work_board/rules.mk

@@ -1,3 +0,0 @@
-SRC += rgb_functions.c
-
-DEFAULT_FOLDER = work_louder/work_board/rev3

keyboards/zsa/planck_ez/base/rules.mk

@@ -0,0 +1,2 @@
+RGBLIGHT_SUPPORTED = no
+BACKLIGHT_SUPPORTED = no

keyboards/zsa/planck_ez/glow/rules.mk

@@ -0,0 +1,2 @@
+RGBLIGHT_SUPPORTED = no
+BACKLIGHT_SUPPORTED = no

keyboards/zsa/planck_ez/rules.mk

@@ -1,4 +0,0 @@
-RGBLIGHT_SUPPORTED = no
-BAKCLIGHT_SUPPORTED = no
-
-DEFAULT_FOLDER = zsa/planck_ez/base