From 47b9b110097a864d6ab76516b2213afd59948527 Mon Sep 17 00:00:00 2001
From: Zach White <skullydazed@gmail.com>
Date: Wed, 30 Dec 2020 10:27:37 -0800
Subject: Configure keyboard matrix from info.json (#10817)

* Make parameters from info.json available to the build system

* move all clueboard settings to info.json

* code formatting

* make flake8 happy

* make flake8 happy

* make qmk lint happy

* Add support for specifying led indicators in json

* move led indicators to the clueboard info.json

* Apply suggestions from code review

Co-authored-by: Erovia <Erovia@users.noreply.github.com>

* add missing docstring

Co-authored-by: Erovia <Erovia@users.noreply.github.com>
---
 lib/python/qmk/cli/c2json.py              |   3 +-
 lib/python/qmk/cli/chibios/confmigrate.py |   8 +-
 lib/python/qmk/cli/generate/__init__.py   |   4 +
 lib/python/qmk/cli/generate/api.py        |  14 +-
 lib/python/qmk/cli/generate/config_h.py   | 277 ++++++++++++++++++++++++++++++
 lib/python/qmk/cli/generate/info_json.py  |  49 ++++++
 lib/python/qmk/cli/generate/layouts.py    |  93 ++++++++++
 lib/python/qmk/cli/generate/rules_mk.py   |  59 +++++++
 lib/python/qmk/cli/info.py                |   7 +-
 lib/python/qmk/cli/kle2json.py            |  51 ++----
 10 files changed, 517 insertions(+), 48 deletions(-)
 create mode 100755 lib/python/qmk/cli/generate/config_h.py
 create mode 100755 lib/python/qmk/cli/generate/info_json.py
 create mode 100755 lib/python/qmk/cli/generate/layouts.py
 create mode 100755 lib/python/qmk/cli/generate/rules_mk.py

(limited to 'lib/python/qmk/cli')

diff --git a/lib/python/qmk/cli/c2json.py b/lib/python/qmk/cli/c2json.py
index 2b3bb774f..8f9d8dc38 100644
--- a/lib/python/qmk/cli/c2json.py
+++ b/lib/python/qmk/cli/c2json.py
@@ -6,6 +6,7 @@ from milc import cli
 
 import qmk.keymap
 import qmk.path
+from qmk.info_json_encoder import InfoJSONEncoder
 
 
 @cli.argument('--no-cpp', arg_only=True, action='store_false', help='Do not use \'cpp\' on keymap.c')
@@ -47,7 +48,7 @@ def c2json(cli):
         cli.args.output.parent.mkdir(parents=True, exist_ok=True)
         if cli.args.output.exists():
             cli.args.output.replace(cli.args.output.name + '.bak')
-        cli.args.output.write_text(json.dumps(keymap_json))
+        cli.args.output.write_text(json.dumps(keymap_json, cls=InfoJSONEncoder))
 
         if not cli.args.quiet:
             cli.log.info('Wrote keymap to %s.', cli.args.output)
diff --git a/lib/python/qmk/cli/chibios/confmigrate.py b/lib/python/qmk/cli/chibios/confmigrate.py
index eae294a0c..b9cfda961 100644
--- a/lib/python/qmk/cli/chibios/confmigrate.py
+++ b/lib/python/qmk/cli/chibios/confmigrate.py
@@ -13,7 +13,7 @@ def eprint(*args, **kwargs):
     print(*args, file=sys.stderr, **kwargs)
 
 
-fileHeader = """\
+file_header = """\
 /* Copyright 2020 QMK
  *
  * This program is free software: you can redistribute it and/or modify
@@ -77,7 +77,7 @@ def check_diffs(input_defs, reference_defs):
 
 
 def migrate_chconf_h(to_override, outfile):
-    print(fileHeader.format(cli.args.input.relative_to(QMK_FIRMWARE), cli.args.reference.relative_to(QMK_FIRMWARE)), file=outfile)
+    print(file_header.format(cli.args.input.relative_to(QMK_FIRMWARE), cli.args.reference.relative_to(QMK_FIRMWARE)), file=outfile)
 
     for override in to_override:
         print("#define %s %s" % (override[0], override[1]), file=outfile)
@@ -87,7 +87,7 @@ def migrate_chconf_h(to_override, outfile):
 
 
 def migrate_halconf_h(to_override, outfile):
-    print(fileHeader.format(cli.args.input.relative_to(QMK_FIRMWARE), cli.args.reference.relative_to(QMK_FIRMWARE)), file=outfile)
+    print(file_header.format(cli.args.input.relative_to(QMK_FIRMWARE), cli.args.reference.relative_to(QMK_FIRMWARE)), file=outfile)
 
     for override in to_override:
         print("#define %s %s" % (override[0], override[1]), file=outfile)
@@ -97,7 +97,7 @@ def migrate_halconf_h(to_override, outfile):
 
 
 def migrate_mcuconf_h(to_override, outfile):
-    print(fileHeader.format(cli.args.input.relative_to(QMK_FIRMWARE), cli.args.reference.relative_to(QMK_FIRMWARE)), file=outfile)
+    print(file_header.format(cli.args.input.relative_to(QMK_FIRMWARE), cli.args.reference.relative_to(QMK_FIRMWARE)), file=outfile)
 
     print("#include_next <mcuconf.h>\n", file=outfile)
 
diff --git a/lib/python/qmk/cli/generate/__init__.py b/lib/python/qmk/cli/generate/__init__.py
index f9585bfb5..bd75b044c 100644
--- a/lib/python/qmk/cli/generate/__init__.py
+++ b/lib/python/qmk/cli/generate/__init__.py
@@ -1,3 +1,7 @@
 from . import api
+from . import config_h
 from . import docs
+from . import info_json
+from . import layouts
 from . import rgb_breathe_table
+from . import rules_mk
diff --git a/lib/python/qmk/cli/generate/api.py b/lib/python/qmk/cli/generate/api.py
index 66db37cb5..6d111f244 100755
--- a/lib/python/qmk/cli/generate/api.py
+++ b/lib/python/qmk/cli/generate/api.py
@@ -8,6 +8,7 @@ from milc import cli
 
 from qmk.datetime import current_datetime
 from qmk.info import info_json
+from qmk.info_json_encoder import InfoJSONEncoder
 from qmk.keyboard import list_keyboards
 
 
@@ -44,15 +45,16 @@ def generate_api(cli):
         if 'usb' in kb_all['keyboards'][keyboard_name]:
             usb = kb_all['keyboards'][keyboard_name]['usb']
 
-            if usb['vid'] not in usb_list['devices']:
+            if 'vid' in usb and usb['vid'] not in usb_list['devices']:
                 usb_list['devices'][usb['vid']] = {}
 
-            if usb['pid'] not in usb_list['devices'][usb['vid']]:
+            if 'pid' in usb and usb['pid'] not in usb_list['devices'][usb['vid']]:
                 usb_list['devices'][usb['vid']][usb['pid']] = {}
 
-            usb_list['devices'][usb['vid']][usb['pid']][keyboard_name] = usb
+            if 'vid' in usb and 'pid' in usb:
+                usb_list['devices'][usb['vid']][usb['pid']][keyboard_name] = usb
 
     # Write the global JSON files
-    keyboard_list.write_text(json.dumps({'last_updated': current_datetime(), 'keyboards': sorted(kb_all['keyboards'])}))
-    keyboard_all.write_text(json.dumps(kb_all))
-    usb_file.write_text(json.dumps(usb_list))
+    keyboard_list.write_text(json.dumps({'last_updated': current_datetime(), 'keyboards': sorted(kb_all['keyboards'])}, cls=InfoJSONEncoder))
+    keyboard_all.write_text(json.dumps(kb_all, cls=InfoJSONEncoder))
+    usb_file.write_text(json.dumps(usb_list, cls=InfoJSONEncoder))
diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py
new file mode 100755
index 000000000..4d734017a
--- /dev/null
+++ b/lib/python/qmk/cli/generate/config_h.py
@@ -0,0 +1,277 @@
+"""Used by the make system to generate info_config.h from info.json.
+"""
+from milc import cli
+
+from qmk.constants import LED_INDICATORS
+from qmk.decorators import automagic_keyboard, automagic_keymap
+from qmk.info import info_json, rgblight_animations, rgblight_properties, rgblight_toggles
+from qmk.path import is_keyboard, normpath
+
+usb_properties = {
+    'vid': 'VENDOR_ID',
+    'pid': 'PRODUCT_ID',
+    'device_ver': 'DEVICE_VER',
+}
+
+
+def debounce(debounce):
+    """Return the config.h lines that set debounce
+    """
+    return """
+#ifndef DEBOUNCE
+#   define DEBOUNCE %s
+#endif // DEBOUNCE
+""" % debounce
+
+
+def diode_direction(diode_direction):
+    """Return the config.h lines that set diode direction
+    """
+    return """
+#ifndef DIODE_DIRECTION
+#   define DIODE_DIRECTION %s
+#endif // DIODE_DIRECTION
+""" % diode_direction
+
+
+def keyboard_name(keyboard_name):
+    """Return the config.h lines that set the keyboard's name.
+    """
+    return """
+#ifndef DESCRIPTION
+#    define DESCRIPTION %s
+#endif // DESCRIPTION
+
+#ifndef PRODUCT
+#    define PRODUCT %s
+#endif // PRODUCT
+""" % (keyboard_name, keyboard_name)
+
+
+def manufacturer(manufacturer):
+    """Return the config.h lines that set the manufacturer.
+    """
+    return """
+#ifndef MANUFACTURER
+#    define MANUFACTURER %s
+#endif // MANUFACTURER
+""" % (manufacturer)
+
+
+def direct_pins(direct_pins):
+    """Return the config.h lines that set the direct pins.
+    """
+    rows = []
+
+    for row in direct_pins:
+        cols = ','.join([col or 'NO_PIN' for col in row])
+        rows.append('{' + cols + '}')
+
+    col_count = len(direct_pins[0])
+    row_count = len(direct_pins)
+
+    return """
+#ifndef MATRIX_COLS
+#    define MATRIX_COLS %s
+#endif // MATRIX_COLS
+
+#ifndef MATRIX_ROWS
+#    define MATRIX_ROWS %s
+#endif // MATRIX_ROWS
+
+#ifndef DIRECT_PINS
+#    define DIRECT_PINS {%s}
+#endif // DIRECT_PINS
+""" % (col_count, row_count, ','.join(rows))
+
+
+def col_pins(col_pins):
+    """Return the config.h lines that set the column pins.
+    """
+    cols = ','.join(col_pins)
+    col_num = len(col_pins)
+
+    return """
+#ifndef MATRIX_COLS
+#    define MATRIX_COLS %s
+#endif // MATRIX_COLS
+
+#ifndef MATRIX_COL_PINS
+#    define MATRIX_COL_PINS {%s}
+#endif // MATRIX_COL_PINS
+""" % (col_num, cols)
+
+
+def row_pins(row_pins):
+    """Return the config.h lines that set the row pins.
+    """
+    rows = ','.join(row_pins)
+    row_num = len(row_pins)
+
+    return """
+#ifndef MATRIX_ROWS
+#    define MATRIX_ROWS %s
+#endif // MATRIX_ROWS
+
+#ifndef MATRIX_ROW_PINS
+#    define MATRIX_ROW_PINS {%s}
+#endif // MATRIX_ROW_PINS
+""" % (row_num, rows)
+
+
+def indicators(config):
+    """Return the config.h lines that setup LED indicators.
+    """
+    defines = []
+
+    for led, define in LED_INDICATORS.items():
+        if led in config:
+            defines.append('')
+            defines.append('#ifndef %s' % (define,))
+            defines.append('#   define %s %s' % (define, config[led]))
+            defines.append('#endif // %s' % (define,))
+
+    return '\n'.join(defines)
+
+
+def layout_aliases(layout_aliases):
+    """Return the config.h lines that setup layout aliases.
+    """
+    defines = []
+
+    for alias, layout in layout_aliases.items():
+        defines.append('')
+        defines.append('#ifndef %s' % (alias,))
+        defines.append('#   define %s %s' % (alias, layout))
+        defines.append('#endif // %s' % (alias,))
+
+    return '\n'.join(defines)
+
+
+def matrix_pins(matrix_pins):
+    """Add the matrix config to the config.h.
+    """
+    pins = []
+
+    if 'direct' in matrix_pins:
+        pins.append(direct_pins(matrix_pins['direct']))
+
+    if 'cols' in matrix_pins:
+        pins.append(col_pins(matrix_pins['cols']))
+
+    if 'rows' in matrix_pins:
+        pins.append(row_pins(matrix_pins['rows']))
+
+    return '\n'.join(pins)
+
+
+def rgblight(config):
+    """Return the config.h lines that setup rgblight.
+    """
+    rgblight_config = []
+
+    for json_key, config_key in rgblight_properties.items():
+        if json_key in config:
+            rgblight_config.append('')
+            rgblight_config.append('#ifndef %s' % (config_key,))
+            rgblight_config.append('#   define %s %s' % (config_key, config[json_key]))
+            rgblight_config.append('#endif // %s' % (config_key,))
+
+    for json_key, config_key in rgblight_toggles.items():
+        if config.get(json_key):
+            rgblight_config.append('')
+            rgblight_config.append('#ifndef %s' % (config_key,))
+            rgblight_config.append('#   define %s' % (config_key,))
+            rgblight_config.append('#endif // %s' % (config_key,))
+
+    for json_key, config_key in rgblight_animations.items():
+        if 'animations' in config and config['animations'].get(json_key):
+            rgblight_config.append('')
+            rgblight_config.append('#ifndef %s' % (config_key,))
+            rgblight_config.append('#   define %s' % (config_key,))
+            rgblight_config.append('#endif // %s' % (config_key,))
+
+    return '\n'.join(rgblight_config)
+
+
+def usb_properties(usb_props):
+    """Return the config.h lines that setup USB params.
+    """
+    usb_lines = []
+
+    for info_name, config_name in usb_props.items():
+        if info_name in usb_props:
+            usb_lines.append('')
+            usb_lines.append('#ifndef ' + config_name)
+            usb_lines.append('#    define %s %s' % (config_name, usb_props[info_name]))
+            usb_lines.append('#endif // ' + config_name)
+
+    return '\n'.join(usb_lines)
+
+
+@cli.argument('-o', '--output', arg_only=True, type=normpath, help='File to write to')
+@cli.argument('-q', '--quiet', arg_only=True, action='store_true', help="Quiet mode, only output error messages")
+@cli.argument('-kb', '--keyboard', help='Keyboard to generate config.h for.')
+@cli.subcommand('Used by the make system to generate info_config.h from info.json', hidden=True)
+@automagic_keyboard
+@automagic_keymap
+def generate_config_h(cli):
+    """Generates the info_config.h file.
+    """
+    # Determine our keyboard(s)
+    if not cli.config.generate_config_h.keyboard:
+        cli.log.error('Missing paramater: --keyboard')
+        cli.subcommands['info'].print_help()
+        return False
+
+    if not is_keyboard(cli.config.generate_config_h.keyboard):
+        cli.log.error('Invalid keyboard: "%s"', cli.config.generate_config_h.keyboard)
+        return False
+
+    # Build the info.json file
+    kb_info_json = info_json(cli.config.generate_config_h.keyboard)
+
+    # Build the info_config.h file.
+    config_h_lines = ['/* This file was generated by `qmk generate-config-h`. Do not edit or copy.' ' */', '', '#pragma once']
+
+    if 'debounce' in kb_info_json:
+        config_h_lines.append(debounce(kb_info_json['debounce']))
+
+    if 'diode_direction' in kb_info_json:
+        config_h_lines.append(diode_direction(kb_info_json['diode_direction']))
+
+    if 'indicators' in kb_info_json:
+        config_h_lines.append(indicators(kb_info_json['indicators']))
+
+    if 'keyboard_name' in kb_info_json:
+        config_h_lines.append(keyboard_name(kb_info_json['keyboard_name']))
+
+    if 'layout_aliases' in kb_info_json:
+        config_h_lines.append(layout_aliases(kb_info_json['layout_aliases']))
+
+    if 'manufacturer' in kb_info_json:
+        config_h_lines.append(manufacturer(kb_info_json['manufacturer']))
+
+    if 'rgblight' in kb_info_json:
+        config_h_lines.append(rgblight(kb_info_json['rgblight']))
+
+    if 'matrix_pins' in kb_info_json:
+        config_h_lines.append(matrix_pins(kb_info_json['matrix_pins']))
+
+    if 'usb' in kb_info_json:
+        config_h_lines.append(usb_properties(kb_info_json['usb']))
+
+    # Show the results
+    config_h = '\n'.join(config_h_lines)
+
+    if cli.args.output:
+        cli.args.output.parent.mkdir(parents=True, exist_ok=True)
+        if cli.args.output.exists():
+            cli.args.output.replace(cli.args.output.name + '.bak')
+        cli.args.output.write_text(config_h)
+
+        if not cli.args.quiet:
+            cli.log.info('Wrote info_config.h to %s.', cli.args.output)
+
+    else:
+        print(config_h)
diff --git a/lib/python/qmk/cli/generate/info_json.py b/lib/python/qmk/cli/generate/info_json.py
new file mode 100755
index 000000000..7e6654e45
--- /dev/null
+++ b/lib/python/qmk/cli/generate/info_json.py
@@ -0,0 +1,49 @@
+"""Keyboard information script.
+
+Compile an info.json for a particular keyboard and pretty-print it.
+"""
+import json
+
+from milc import cli
+
+from qmk.info_json_encoder import InfoJSONEncoder
+from qmk.decorators import automagic_keyboard, automagic_keymap
+from qmk.info import info_json
+from qmk.path import is_keyboard
+
+
+@cli.argument('-kb', '--keyboard', help='Keyboard to show info for.')
+@cli.argument('-km', '--keymap', help='Show the layers for a JSON keymap too.')
+@cli.subcommand('Generate an info.json file for a keyboard.', hidden=False if cli.config.user.developer else True)
+@automagic_keyboard
+@automagic_keymap
+def generate_info_json(cli):
+    """Generate an info.json file for a keyboard
+    """
+    # Determine our keyboard(s)
+    if not cli.config.generate_info_json.keyboard:
+        cli.log.error('Missing paramater: --keyboard')
+        cli.subcommands['info'].print_help()
+        return False
+
+    if not is_keyboard(cli.config.generate_info_json.keyboard):
+        cli.log.error('Invalid keyboard: "%s"', cli.config.generate_info_json.keyboard)
+        return False
+
+    # Build the info.json file
+    kb_info_json = info_json(cli.config.generate_info_json.keyboard)
+    pared_down_json = {}
+
+    for key in ('manufacturer', 'maintainer', 'usb', 'keyboard_name', 'width', 'height', 'debounce', 'diode_direction', 'features', 'community_layouts', 'layout_aliases', 'matrix_pins', 'rgblight', 'url'):
+        if key in kb_info_json:
+            pared_down_json[key] = kb_info_json[key]
+
+    pared_down_json['layouts'] = {}
+    if 'layouts' in pared_down_json:
+        for layout_name, layout in kb_info_json['layouts'].items():
+            pared_down_json['layouts'][layout_name] = {}
+            pared_down_json['layouts'][layout_name]['key_count'] = layout.get('key_count', len(layout['layout']))
+            pared_down_json['layouts'][layout_name]['layout'] = layout['layout']
+
+    # Display the results
+    print(json.dumps(pared_down_json, indent=2, cls=InfoJSONEncoder))
diff --git a/lib/python/qmk/cli/generate/layouts.py b/lib/python/qmk/cli/generate/layouts.py
new file mode 100755
index 000000000..809f0ef7e
--- /dev/null
+++ b/lib/python/qmk/cli/generate/layouts.py
@@ -0,0 +1,93 @@
+"""Used by the make system to generate layouts.h from info.json.
+"""
+from milc import cli
+
+from qmk.constants import COL_LETTERS, ROW_LETTERS
+from qmk.decorators import automagic_keyboard, automagic_keymap
+from qmk.info import info_json
+from qmk.path import is_keyboard, normpath
+
+usb_properties = {
+    'vid': 'VENDOR_ID',
+    'pid': 'PRODUCT_ID',
+    'device_ver': 'DEVICE_VER',
+}
+
+
+@cli.argument('-o', '--output', arg_only=True, type=normpath, help='File to write to')
+@cli.argument('-q', '--quiet', arg_only=True, action='store_true', help="Quiet mode, only output error messages")
+@cli.argument('-kb', '--keyboard', help='Keyboard to generate config.h for.')
+@cli.subcommand('Used by the make system to generate layouts.h from info.json', hidden=True)
+@automagic_keyboard
+@automagic_keymap
+def generate_layouts(cli):
+    """Generates the layouts.h file.
+    """
+    # Determine our keyboard(s)
+    if not cli.config.generate_layouts.keyboard:
+        cli.log.error('Missing paramater: --keyboard')
+        cli.subcommands['info'].print_help()
+        return False
+
+    if not is_keyboard(cli.config.generate_layouts.keyboard):
+        cli.log.error('Invalid keyboard: "%s"', cli.config.generate_layouts.keyboard)
+        return False
+
+    # Build the info.json file
+    kb_info_json = info_json(cli.config.generate_layouts.keyboard)
+
+    # Build the layouts.h file.
+    layouts_h_lines = ['/* This file was generated by `qmk generate-layouts`. Do not edit or copy.' ' */', '', '#pragma once']
+
+    if 'direct' in kb_info_json['matrix_pins']:
+        col_num = len(kb_info_json['matrix_pins']['direct'][0])
+        row_num = len(kb_info_json['matrix_pins']['direct'])
+    elif 'cols' in kb_info_json['matrix_pins'] and 'rows' in kb_info_json['matrix_pins']:
+        col_num = len(kb_info_json['matrix_pins']['cols'])
+        row_num = len(kb_info_json['matrix_pins']['rows'])
+    else:
+        cli.log.error('%s: Invalid matrix config.', cli.config.generate_layouts.keyboard)
+        return False
+
+    for layout_name in kb_info_json['layouts']:
+        if kb_info_json['layouts'][layout_name]['c_macro']:
+            continue
+
+        layout_keys = []
+        layout_matrix = [['KC_NO' for i in range(col_num)] for i in range(row_num)]
+
+        for i, key in enumerate(kb_info_json['layouts'][layout_name]['layout']):
+            row = key['matrix'][0]
+            col = key['matrix'][1]
+            identifier = 'k%s%s' % (ROW_LETTERS[row], COL_LETTERS[col])
+
+            try:
+                layout_matrix[row][col] = identifier
+                layout_keys.append(identifier)
+            except IndexError:
+                key_name = key.get('label', identifier)
+                cli.log.error('Matrix data out of bounds for layout %s at index %s (%s): %s, %s', layout_name, i, key_name, row, col)
+                return False
+
+        layouts_h_lines.append('')
+        layouts_h_lines.append('#define %s(%s) {\\' % (layout_name, ', '.join(layout_keys)))
+
+        rows = ', \\\n'.join(['\t {' + ', '.join(row) + '}' for row in layout_matrix])
+        rows += ' \\'
+        layouts_h_lines.append(rows)
+        layouts_h_lines.append('}')
+
+    # Show the results
+    layouts_h = '\n'.join(layouts_h_lines) + '\n'
+
+    if cli.args.output:
+        cli.args.output.parent.mkdir(parents=True, exist_ok=True)
+        if cli.args.output.exists():
+            cli.args.output.replace(cli.args.output.name + '.bak')
+        cli.args.output.write_text(layouts_h)
+
+        if not cli.args.quiet:
+            cli.log.info('Wrote info_config.h to %s.', cli.args.output)
+
+    else:
+        print(layouts_h)
diff --git a/lib/python/qmk/cli/generate/rules_mk.py b/lib/python/qmk/cli/generate/rules_mk.py
new file mode 100755
index 000000000..4268ae047
--- /dev/null
+++ b/lib/python/qmk/cli/generate/rules_mk.py
@@ -0,0 +1,59 @@
+"""Used by the make system to generate a rules.mk
+"""
+from milc import cli
+
+from qmk.decorators import automagic_keyboard, automagic_keymap
+from qmk.info import info_json
+from qmk.path import is_keyboard, normpath
+
+
+@cli.argument('-o', '--output', arg_only=True, type=normpath, help='File to write to')
+@cli.argument('-q', '--quiet', arg_only=True, action='store_true', help="Quiet mode, only output error messages")
+@cli.argument('-kb', '--keyboard', help='Keyboard to generate config.h for.')
+@cli.subcommand('Used by the make system to generate info_config.h from info.json', hidden=True)
+@automagic_keyboard
+@automagic_keymap
+def generate_rules_mk(cli):
+    """Generates a rules.mk file from info.json.
+    """
+    # Determine our keyboard(s)
+    if not cli.config.generate_rules_mk.keyboard:
+        cli.log.error('Missing paramater: --keyboard')
+        cli.subcommands['info'].print_help()
+        return False
+
+    if not is_keyboard(cli.config.generate_rules_mk.keyboard):
+        cli.log.error('Invalid keyboard: "%s"', cli.config.generate_rules_mk.keyboard)
+        return False
+
+    # Build the info.json file
+    kb_info_json = info_json(cli.config.generate_rules_mk.keyboard)
+    rules_mk_lines = ['# This file was generated by `qmk generate-rules-mk`. Do not edit or copy.', '']
+
+    # Find features that should be enabled
+    if 'features' in kb_info_json:
+        for feature, enabled in kb_info_json['features'].items():
+            feature = feature.upper()
+            enabled = 'yes' if enabled else 'no'
+            rules_mk_lines.append(f'{feature}_ENABLE := {enabled}')
+
+    # Add community layouts
+    if 'community_layouts' in kb_info_json:
+        rules_mk_lines.append(f'LAYOUTS = {" ".join(kb_info_json["community_layouts"])}')
+
+    # Show the results
+    rules_mk = '\n'.join(rules_mk_lines) + '\n'
+
+    if cli.args.output:
+        cli.args.output.parent.mkdir(parents=True, exist_ok=True)
+        if cli.args.output.exists():
+            cli.args.output.replace(cli.args.output.name + '.bak')
+        cli.args.output.write_text(rules_mk)
+
+        if cli.args.quiet:
+            print(cli.args.output)
+        else:
+            cli.log.info('Wrote info_config.h to %s.', cli.args.output)
+
+    else:
+        print(rules_mk)
diff --git a/lib/python/qmk/cli/info.py b/lib/python/qmk/cli/info.py
index 9ab299a21..87d7253d4 100755
--- a/lib/python/qmk/cli/info.py
+++ b/lib/python/qmk/cli/info.py
@@ -7,6 +7,8 @@ import platform
 
 from milc import cli
 
+from qmk.info_json_encoder import InfoJSONEncoder
+from qmk.constants import COL_LETTERS, ROW_LETTERS
 from qmk.decorators import automagic_keyboard, automagic_keymap
 from qmk.keyboard import render_layouts, render_layout
 from qmk.keymap import locate_keymap
@@ -15,9 +17,6 @@ from qmk.path import is_keyboard
 
 platform_id = platform.platform().lower()
 
-ROW_LETTERS = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnop'
-COL_LETTERS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijilmnopqrstuvwxyz'
-
 
 def show_keymap(kb_info_json, title_caps=True):
     """Render the keymap in ascii art.
@@ -149,7 +148,7 @@ def info(cli):
 
     # Output in the requested format
     if cli.args.format == 'json':
-        print(json.dumps(kb_info_json))
+        print(json.dumps(kb_info_json, cls=InfoJSONEncoder))
     elif cli.args.format == 'text':
         print_text_output(kb_info_json)
     elif cli.args.format == 'friendly':
diff --git a/lib/python/qmk/cli/kle2json.py b/lib/python/qmk/cli/kle2json.py
index 3d1bb8c43..66d504bfc 100755
--- a/lib/python/qmk/cli/kle2json.py
+++ b/lib/python/qmk/cli/kle2json.py
@@ -3,25 +3,12 @@
 import json
 import os
 from pathlib import Path
-from decimal import Decimal
-from collections import OrderedDict
 
 from milc import cli
 from kle2xy import KLE2xy
 
 from qmk.converter import kle2qmk
-
-
-class CustomJSONEncoder(json.JSONEncoder):
-    def default(self, obj):
-        try:
-            if isinstance(obj, Decimal):
-                if obj % 2 in (Decimal(0), Decimal(1)):
-                    return int(obj)
-                return float(obj)
-        except TypeError:
-            pass
-        return json.JSONEncoder.default(self, obj)
+from qmk.info_json_encoder import InfoJSONEncoder
 
 
 @cli.argument('filename', help='The KLE raw txt to convert')
@@ -52,24 +39,22 @@ def kle2json(cli):
         cli.log.error('Could not parse KLE raw data: %s', raw_code)
         cli.log.exception(e)
         return False
-    keyboard = OrderedDict(
-        keyboard_name=kle.name,
-        url='',
-        maintainer='qmk',
-        width=kle.columns,
-        height=kle.rows,
-        layouts={'LAYOUT': {
-            'layout': 'LAYOUT_JSON_HERE'
-        }},
-    )
-    # Initialize keyboard with json encoded from ordered dict
-    keyboard = json.dumps(keyboard, indent=4, separators=(', ', ': '), sort_keys=False, cls=CustomJSONEncoder)
-    # Initialize layout with kle2qmk from converter module
-    layout = json.dumps(kle2qmk(kle), separators=(', ', ':'), cls=CustomJSONEncoder)
-    # Replace layout in keyboard json
-    keyboard = keyboard.replace('"LAYOUT_JSON_HERE"', layout)
+    keyboard = {
+        'keyboard_name': kle.name,
+        'url': '',
+        'maintainer': 'qmk',
+        'width': kle.columns,
+        'height': kle.rows,
+        'layouts': {
+            'LAYOUT': {
+                'layout': kle2qmk(kle)
+            }
+        },
+    }
+
     # Write our info.json
-    file = open(out_path / "info.json", "w")
-    file.write(keyboard)
-    file.close()
+    keyboard = json.dumps(keyboard, indent=4, separators=(', ', ': '), sort_keys=False, cls=InfoJSONEncoder)
+    info_json_file = out_path / 'info.json'
+
+    info_json_file.write_text(keyboard)
     cli.log.info('Wrote out {fg_cyan}%s/info.json', out_path)
-- 
cgit v1.3.1


From f27d8d94489342d4ce7ba9955cd062c725350db9 Mon Sep 17 00:00:00 2001
From: Zach White <skullydazed@gmail.com>
Date: Sat, 2 Jan 2021 12:05:56 -0800
Subject: Fix compiling on develop (#11409)

---
 lib/python/qmk/cli/generate/config_h.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/python/qmk/cli')

diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py
index 4d734017a..e160ffea8 100755
--- a/lib/python/qmk/cli/generate/config_h.py
+++ b/lib/python/qmk/cli/generate/config_h.py
@@ -7,7 +7,7 @@ from qmk.decorators import automagic_keyboard, automagic_keymap
 from qmk.info import info_json, rgblight_animations, rgblight_properties, rgblight_toggles
 from qmk.path import is_keyboard, normpath
 
-usb_properties = {
+usb_prop_map = {
     'vid': 'VENDOR_ID',
     'pid': 'PRODUCT_ID',
     'device_ver': 'DEVICE_VER',
@@ -199,7 +199,7 @@ def usb_properties(usb_props):
     """
     usb_lines = []
 
-    for info_name, config_name in usb_props.items():
+    for info_name, config_name in usb_prop_map.items():
         if info_name in usb_props:
             usb_lines.append('')
             usb_lines.append('#ifndef ' + config_name)
-- 
cgit v1.3.1


From 11bd98f684148ed9577b263189121e52027d66d9 Mon Sep 17 00:00:00 2001
From: Zach White <skullydazed@gmail.com>
Date: Sat, 2 Jan 2021 18:08:17 -0800
Subject: Fix broken keyboards (#11412)

* Fix a couple errors

* add a dependency for the generated headers
---
 keyboards/jm60/jm60.h                  |  4 +++-
 lib/python/qmk/cli/generate/layouts.py | 19 ++++++++++---------
 lib/python/qmk/info.py                 |  3 +++
 tmk_core/rules.mk                      |  8 ++++----
 4 files changed, 20 insertions(+), 14 deletions(-)

(limited to 'lib/python/qmk/cli')

diff --git a/keyboards/jm60/jm60.h b/keyboards/jm60/jm60.h
index f83b94f90..34ca4d3d6 100644
--- a/keyboards/jm60/jm60.h
+++ b/keyboards/jm60/jm60.h
@@ -35,7 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    * | 40 | 41 | 42 |           46          | 4a | 4b | 4c | 4d  |
    * `-----------------------------------------------------------'
  */
-#define KEYMAP_ANSI( \
+#define LAYOUT_ansi( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
 	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
 	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2c,      k2d, \
@@ -51,3 +51,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 }
 
 #endif
+
+#define KEYMAP_ANSI LAYOUT_ansi
diff --git a/lib/python/qmk/cli/generate/layouts.py b/lib/python/qmk/cli/generate/layouts.py
index 809f0ef7e..273870e15 100755
--- a/lib/python/qmk/cli/generate/layouts.py
+++ b/lib/python/qmk/cli/generate/layouts.py
@@ -39,15 +39,16 @@ def generate_layouts(cli):
     # Build the layouts.h file.
     layouts_h_lines = ['/* This file was generated by `qmk generate-layouts`. Do not edit or copy.' ' */', '', '#pragma once']
 
-    if 'direct' in kb_info_json['matrix_pins']:
-        col_num = len(kb_info_json['matrix_pins']['direct'][0])
-        row_num = len(kb_info_json['matrix_pins']['direct'])
-    elif 'cols' in kb_info_json['matrix_pins'] and 'rows' in kb_info_json['matrix_pins']:
-        col_num = len(kb_info_json['matrix_pins']['cols'])
-        row_num = len(kb_info_json['matrix_pins']['rows'])
-    else:
-        cli.log.error('%s: Invalid matrix config.', cli.config.generate_layouts.keyboard)
-        return False
+    if 'matrix_pins' in kb_info_json:
+        if 'direct' in kb_info_json['matrix_pins']:
+            col_num = len(kb_info_json['matrix_pins']['direct'][0])
+            row_num = len(kb_info_json['matrix_pins']['direct'])
+        elif 'cols' in kb_info_json['matrix_pins'] and 'rows' in kb_info_json['matrix_pins']:
+            col_num = len(kb_info_json['matrix_pins']['cols'])
+            row_num = len(kb_info_json['matrix_pins']['rows'])
+        else:
+            cli.log.error('%s: Invalid matrix config.', cli.config.generate_layouts.keyboard)
+            return False
 
     for layout_name in kb_info_json['layouts']:
         if kb_info_json['layouts'][layout_name]['c_macro']:
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index d7b128aa6..2954a17e0 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -134,6 +134,9 @@ def _extract_indicators(info_data, config_c):
             _log_warning(info_data, f'Indicator {json_key} is specified in both info.json and config.h, the config.h value wins.')
 
         if config_key in config_c:
+            if 'indicators' not in info_data:
+                info_data['indicators'] = {}
+
             info_data['indicators'][json_key] = config_c.get(config_key)
 
     return info_data
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index a77e55dd1..b595ddb1d 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -324,27 +324,27 @@ $1_CXXFLAGS = $$(ALL_CXXFLAGS) $$($1_DEFS) $$($1_INCFLAGS) $$($1_CONFIG_FLAGS) $
 $1_ASFLAGS = $$(ALL_ASFLAGS) $$($1_DEFS) $$($1_INCFLAGS) $$($1_CONFIG_FLAGS)
 
 # Compile: create object files from C source files.
-$1/%.o : %.c $1/%.d $1/cflags.txt $1/compiler.txt | $(BEGIN)
+$1/%.o : %.c $1/%.d $1/cflags.txt $1/compiler.txt $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/layouts.h | $(BEGIN)
 	@mkdir -p $$(@D)
 	@$$(SILENT) || printf "$$(MSG_COMPILING) $$<" | $$(AWK_CMD)
 	$$(eval CMD := $$(CC) -c $$($1_CFLAGS) $$(INIT_HOOK_CFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP))
 	@$$(BUILD_CMD)
 
 # Compile: create object files from C++ source files.
-$1/%.o : %.cpp $1/%.d $1/cxxflags.txt $1/compiler.txt | $(BEGIN)
+$1/%.o : %.cpp $1/%.d $1/cxxflags.txt $1/compiler.txt $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/layouts.h | $(BEGIN)
 	@mkdir -p $$(@D)
 	@$$(SILENT) || printf "$$(MSG_COMPILING_CXX) $$<" | $$(AWK_CMD)
 	$$(eval CMD=$$(CC) -c $$($1_CXXFLAGS) $$(INIT_HOOK_CFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP))
 	@$$(BUILD_CMD)
 
-$1/%.o : %.cc $1/%.d $1/cxxflags.txt $1/compiler.txt | $(BEGIN)
+$1/%.o : %.cc $1/%.d $1/cxxflags.txt $1/compiler.txt $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/layouts.h | $(BEGIN)
 	@mkdir -p $$(@D)
 	@$$(SILENT) || printf "$$(MSG_COMPILING_CXX) $$<" | $$(AWK_CMD)
 	$$(eval CMD=$$(CC) -c $$($1_CXXFLAGS) $$(INIT_HOOK_CFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP))
 	@$$(BUILD_CMD)
 
 # Assemble: create object files from assembler source files.
-$1/%.o : %.S $1/asflags.txt $1/compiler.txt | $(BEGIN)
+$1/%.o : %.S $1/asflags.txt $1/compiler.txt $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/layouts.h | $(BEGIN)
 	@mkdir -p $$(@D)
 	@$(SILENT) || printf "$$(MSG_ASSEMBLING) $$<" | $$(AWK_CMD)
 	$$(eval CMD=$$(CC) -c $$($1_ASFLAGS) $$< -o $$@)
-- 
cgit v1.3.1


From 6daa204363dfaa7f31d935a9913d6b35ec22e971 Mon Sep 17 00:00:00 2001
From: Zach White <skullydazed@gmail.com>
Date: Sun, 3 Jan 2021 15:45:06 -0800
Subject: fix keyboards with apostrophes in their names

---
 lib/python/qmk/cli/generate/config_h.py | 4 ++--
 lib/python/qmk/info.py                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/python/qmk/cli')

diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py
index e160ffea8..09aa0041f 100755
--- a/lib/python/qmk/cli/generate/config_h.py
+++ b/lib/python/qmk/cli/generate/config_h.py
@@ -45,7 +45,7 @@ def keyboard_name(keyboard_name):
 #ifndef PRODUCT
 #    define PRODUCT %s
 #endif // PRODUCT
-""" % (keyboard_name, keyboard_name)
+""" % (keyboard_name.replace("'", ""), keyboard_name.replace("'", ""))
 
 
 def manufacturer(manufacturer):
@@ -55,7 +55,7 @@ def manufacturer(manufacturer):
 #ifndef MANUFACTURER
 #    define MANUFACTURER %s
 #endif // MANUFACTURER
-""" % (manufacturer)
+""" % (manufacturer.replace("'", ""))
 
 
 def direct_pins(direct_pins):
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 2954a17e0..4611874e8 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -345,7 +345,7 @@ def _merge_layouts(info_data, new_info_data):
         else:
             # Pull in layouts that have matrix data
             missing_matrix = False
-            for key in layout_json['layout']:
+            for key in layout_json.get('layout', {}):
                 if 'matrix' not in key:
                     missing_matrix = True
 
-- 
cgit v1.3.1


From ededff8556daff544633cb143cb6d939afd09014 Mon Sep 17 00:00:00 2001
From: Zach White <skullydazed@gmail.com>
Date: Tue, 1 Dec 2020 12:52:02 -0800
Subject: validate keyboard data with jsonschema

---
 lib/python/qmk/cli/generate/info_json.py |   2 +-
 lib/python/qmk/cli/generate/rules_mk.py  |  13 +++
 lib/python/qmk/info.py                   | 151 ++++++++++++++++++++++++++++---
 requirements.txt                         |   1 +
 4 files changed, 155 insertions(+), 12 deletions(-)

(limited to 'lib/python/qmk/cli')

diff --git a/lib/python/qmk/cli/generate/info_json.py b/lib/python/qmk/cli/generate/info_json.py
index 7e6654e45..fba4b1c01 100755
--- a/lib/python/qmk/cli/generate/info_json.py
+++ b/lib/python/qmk/cli/generate/info_json.py
@@ -39,7 +39,7 @@ def generate_info_json(cli):
             pared_down_json[key] = kb_info_json[key]
 
     pared_down_json['layouts'] = {}
-    if 'layouts' in pared_down_json:
+    if 'layouts' in kb_info_json:
         for layout_name, layout in kb_info_json['layouts'].items():
             pared_down_json['layouts'][layout_name] = {}
             pared_down_json['layouts'][layout_name]['key_count'] = layout.get('key_count', len(layout['layout']))
diff --git a/lib/python/qmk/cli/generate/rules_mk.py b/lib/python/qmk/cli/generate/rules_mk.py
index 4268ae047..72ed3c45f 100755
--- a/lib/python/qmk/cli/generate/rules_mk.py
+++ b/lib/python/qmk/cli/generate/rules_mk.py
@@ -6,6 +6,10 @@ from qmk.decorators import automagic_keyboard, automagic_keymap
 from qmk.info import info_json
 from qmk.path import is_keyboard, normpath
 
+info_to_rules = {
+    'bootloader': 'BOOTLOADER',
+    'processor': 'MCU'
+}
 
 @cli.argument('-o', '--output', arg_only=True, type=normpath, help='File to write to')
 @cli.argument('-q', '--quiet', arg_only=True, action='store_true', help="Quiet mode, only output error messages")
@@ -30,6 +34,10 @@ def generate_rules_mk(cli):
     kb_info_json = info_json(cli.config.generate_rules_mk.keyboard)
     rules_mk_lines = ['# This file was generated by `qmk generate-rules-mk`. Do not edit or copy.', '']
 
+    # Bring in settings
+    for info_key, rule_key in info_to_rules.items():
+        rules_mk_lines.append(f'{rule_key} := {kb_info_json[info_key]}')
+
     # Find features that should be enabled
     if 'features' in kb_info_json:
         for feature, enabled in kb_info_json['features'].items():
@@ -37,6 +45,11 @@ def generate_rules_mk(cli):
             enabled = 'yes' if enabled else 'no'
             rules_mk_lines.append(f'{feature}_ENABLE := {enabled}')
 
+    # Set the LED driver
+    if 'led_matrix' in kb_info_json and 'driver' in kb_info_json['led_matrix']:
+        driver = kb_info_json['led_matrix']['driver']
+        rules_mk_lines.append(f'LED_MATRIX_DRIVER = {driver}')
+
     # Add community layouts
     if 'community_layouts' in kb_info_json:
         rules_mk_lines.append(f'LAYOUTS = {" ".join(kb_info_json["community_layouts"])}')
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 4611874e8..1cf12190d 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -4,6 +4,7 @@ import json
 from glob import glob
 from pathlib import Path
 
+import jsonschema
 from milc import cli
 
 from qmk.constants import CHIBIOS_PROCESSORS, LUFA_PROCESSORS, VUSB_PROCESSORS, LED_INDICATORS
@@ -13,6 +14,17 @@ from qmk.keymap import list_keymaps
 from qmk.makefile import parse_rules_mk_file
 from qmk.math import compute
 
+led_matrix_properties = {
+    'driver_count': 'LED_DRIVER_COUNT',
+    'driver_addr1': 'LED_DRIVER_ADDR_1',
+    'driver_addr2': 'LED_DRIVER_ADDR_2',
+    'driver_addr3': 'LED_DRIVER_ADDR_3',
+    'driver_addr4': 'LED_DRIVER_ADDR_4',
+    'led_count': 'LED_DRIVER_LED_COUNT',
+    'timeout': 'ISSI_TIMEOUT',
+    'persistence': 'ISSI_PERSISTENCE'
+}
+
 rgblight_properties = {
     'led_count': 'RGBLED_NUM',
     'pin': 'RGB_DI_PIN',
@@ -80,6 +92,15 @@ def info_json(keyboard):
     info_data = _extract_config_h(info_data)
     info_data = _extract_rules_mk(info_data)
 
+    # Validate against the jsonschema
+    try:
+        keyboard_api_validate(info_data)
+
+    except jsonschema.ValidationError as e:
+        cli.log.error('Invalid info.json data: %s', e.message)
+        print(dir(e))
+        exit()
+
     # Make sure we have at least one layout
     if not info_data.get('layouts'):
         _log_error(info_data, 'No LAYOUTs defined! Need at least one layout defined in the keyboard.h or info.json.')
@@ -102,6 +123,50 @@ def info_json(keyboard):
     return info_data
 
 
+def _json_load(json_file):
+    """Load a json file from disk.
+
+    Note: file must be a Path object.
+    """
+    try:
+        return json.load(json_file.open())
+
+    except json.decoder.JSONDecodeError as e:
+        cli.log.error('Invalid JSON encountered attempting to load {fg_cyan}%s{fg_reset}:\n\t{fg_red}%s', json_file, e)
+        exit(1)
+
+
+def _jsonschema(schema_name):
+    """Read a jsonschema file from disk.
+    """
+    schema_path = Path(f'data/schemas/{schema_name}.jsonschema')
+
+    if not schema_path.exists():
+        schema_path = Path('data/schemas/false.jsonschema')
+
+    return _json_load(schema_path)
+
+
+def keyboard_validate(data):
+    """Validates data against the keyboard jsonschema.
+    """
+    schema = _jsonschema('keyboard')
+    validator = jsonschema.Draft7Validator(schema).validate
+
+    return validator(data)
+
+
+def keyboard_api_validate(data):
+    """Validates data against the api_keyboard jsonschema.
+    """
+    base = _jsonschema('keyboard')
+    relative = _jsonschema('api_keyboard')
+    resolver = jsonschema.RefResolver.from_schema(base)
+    validator = jsonschema.Draft7Validator(relative, resolver=resolver).validate
+
+    return validator(data)
+
+
 def _extract_debounce(info_data, config_c):
     """Handle debounce.
     """
@@ -109,7 +174,7 @@ def _extract_debounce(info_data, config_c):
         _log_warning(info_data, 'Debounce is specified in both info.json and config.h, the config.h value wins.')
 
     if 'DEBOUNCE' in config_c:
-        info_data['debounce'] = config_c.get('DEBOUNCE')
+        info_data['debounce'] = int(config_c['DEBOUNCE'])
 
     return info_data
 
@@ -181,8 +246,36 @@ def _extract_features(info_data, rules):
     return info_data
 
 
+def _extract_led_drivers(info_data, rules):
+    """Find all the LED drivers set in rules.mk.
+    """
+    if 'LED_MATRIX_DRIVER' in rules:
+        if 'led_matrix' not in info_data:
+            info_data['led_matrix'] = {}
+
+        if info_data['led_matrix'].get('driver'):
+            _log_warning(info_data, 'LED Matrix driver is specified in both info.json and rules.mk, the rules.mk value wins.')
+
+        info_data['led_matrix']['driver'] = rules['LED_MATRIX_DRIVER']
+
+    return info_data
+
+
+def _extract_led_matrix(info_data, config_c):
+    """Handle the led_matrix configuration.
+    """
+    led_matrix = info_data.get('led_matrix', {})
+
+    for json_key, config_key in led_matrix_properties.items():
+        if config_key in config_c:
+            if json_key in led_matrix:
+                _log_warning(info_data, 'LED Matrix: %s is specified in both info.json and config.h, the config.h value wins.' % (json_key,))
+
+            led_matrix[json_key] = config_c[config_key]
+
+
 def _extract_rgblight(info_data, config_c):
-    """Handle the rgblight configuration
+    """Handle the rgblight configuration.
     """
     rgblight = info_data.get('rgblight', {})
     animations = rgblight.get('animations', {})
@@ -303,6 +396,7 @@ def _extract_config_h(info_data):
     _extract_indicators(info_data, config_c)
     _extract_matrix_info(info_data, config_c)
     _extract_usb_info(info_data, config_c)
+    _extract_led_matrix(info_data, config_c)
     _extract_rgblight(info_data, config_c)
 
     return info_data
@@ -326,6 +420,7 @@ def _extract_rules_mk(info_data):
 
     _extract_community_layouts(info_data, rules)
     _extract_features(info_data, rules)
+    _extract_led_drivers(info_data, rules)
 
     return info_data
 
@@ -412,13 +507,28 @@ def arm_processor_rules(info_data, rules):
     """Setup the default info for an ARM board.
     """
     info_data['processor_type'] = 'arm'
-    info_data['bootloader'] = rules['BOOTLOADER'] if 'BOOTLOADER' in rules else 'unknown'
-    info_data['processor'] = rules['MCU'] if 'MCU' in rules else 'unknown'
     info_data['protocol'] = 'ChibiOS'
 
-    if info_data['bootloader'] == 'unknown':
+    if 'MCU' in rules:
+        if 'processor' in info_data:
+            _log_warning(info_data, 'Processor/MCU is specified in both info.json and rules.mk, the rules.mk value wins.')
+
+        info_data['processor'] = rules['MCU']
+
+    elif 'processor' not in info_data:
+        info_data['processor'] = 'unknown'
+
+    if 'BOOTLOADER' in rules:
+        if 'bootloader' in info_data:
+            _log_warning(info_data, 'Bootloader is specified in both info.json and rules.mk, the rules.mk value wins.')
+
+        info_data['bootloader'] = rules['BOOTLOADER']
+
+    else:
         if 'STM32' in info_data['processor']:
             info_data['bootloader'] = 'stm32-dfu'
+        else:
+            info_data['bootloader'] = 'unknown'
 
     if 'STM32' in info_data['processor']:
         info_data['platform'] = 'STM32'
@@ -436,9 +546,25 @@ def avr_processor_rules(info_data, rules):
     info_data['processor_type'] = 'avr'
     info_data['bootloader'] = rules['BOOTLOADER'] if 'BOOTLOADER' in rules else 'atmel-dfu'
     info_data['platform'] = rules['ARCH'] if 'ARCH' in rules else 'unknown'
-    info_data['processor'] = rules['MCU'] if 'MCU' in rules else 'unknown'
     info_data['protocol'] = 'V-USB' if rules.get('MCU') in VUSB_PROCESSORS else 'LUFA'
 
+    if 'MCU' in rules:
+        if 'processor' in info_data:
+            _log_warning(info_data, 'Processor/MCU is specified in both info.json and rules.mk, the rules.mk value wins.')
+
+        info_data['processor'] = rules['MCU']
+
+    elif 'processor' not in info_data:
+        info_data['processor'] = 'unknown'
+
+    if 'BOOTLOADER' in rules:
+        if 'bootloader' in info_data:
+            _log_warning(info_data, 'Bootloader is specified in both info.json and rules.mk, the rules.mk value wins.')
+
+        info_data['bootloader'] = rules['BOOTLOADER']
+    else:
+        info_data['bootloader'] = 'atmel-dfu'
+
     # FIXME(fauxpark/anyone): Eventually we should detect the protocol by looking at PROTOCOL inherited from mcu_selection.mk:
     # info_data['protocol'] = 'V-USB' if rules.get('PROTOCOL') == 'VUSB' else 'LUFA'
 
@@ -463,10 +589,13 @@ def merge_info_jsons(keyboard, info_data):
     for info_file in find_info_json(keyboard):
         # Load and validate the JSON data
         try:
-            new_info_data = json.load(info_file.open('r'))
-        except Exception as e:
-            _log_error(info_data, "Invalid JSON in file %s: %s: %s" % (str(info_file), e.__class__.__name__, e))
-            new_info_data = {}
+            new_info_data = _json_load(info_file)
+            keyboard_validate(new_info_data)
+
+        except jsonschema.ValidationError as e:
+            cli.log.error('Invalid info.json data: %s', e.message)
+            cli.log.error('Not including file %s', info_file)
+            continue
 
         if not isinstance(new_info_data, dict):
             _log_error(info_data, "Invalid file %s, root object should be a dictionary." % (str(info_file),))
@@ -479,7 +608,7 @@ def merge_info_jsons(keyboard, info_data):
 
         # Deep merge certain keys
         # FIXME(skullydazed/anyone): this should be generalized more so that we can inteligently merge more than one level deep. It would be nice if we could filter on valid keys too. That may have to wait for a future where we use openapi or something.
-        for key in ('features', 'layout_aliases', 'matrix_pins', 'rgblight', 'usb'):
+        for key in ('features', 'layout_aliases', 'led_matrix', 'matrix_pins', 'rgblight', 'usb'):
             if key in new_info_data:
                 if key not in info_data:
                     info_data[key] = {}
diff --git a/requirements.txt b/requirements.txt
index 6e907cf8e..f4d43da8d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,5 +3,6 @@ appdirs
 argcomplete
 colorama
 hjson
+jsonschema
 milc
 pygments
-- 
cgit v1.3.1


From b2c26f7cdd4b268e80f98cae7f444956559436ec Mon Sep 17 00:00:00 2001
From: Zach White <skullydazed@gmail.com>
Date: Tue, 1 Dec 2020 16:04:22 -0800
Subject: get qmk generate-api into a good state

---
 data/schemas/keyboard.jsonschema        | 33 +++++++++++++
 lib/python/qmk/c_parse.py               | 26 ++++++++---
 lib/python/qmk/cli/generate/api.py      |  2 +-
 lib/python/qmk/cli/generate/rules_mk.py |  9 ++--
 lib/python/qmk/info.py                  | 82 +++++++++++++++++++++++----------
 5 files changed, 117 insertions(+), 35 deletions(-)

(limited to 'lib/python/qmk/cli')

diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 75e792b64..9355ee49b 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -90,6 +90,9 @@
                 "type": "object",
                 "additionalProperties": false,
                 "properties": {
+                    "filename": {
+                        "type": "string"
+                    },
                     "c_macro": {
                         "type": "boolean"
                     },
@@ -119,6 +122,18 @@
                                     "type": "number",
                                     "min": 0.25
                                 },
+                                "r": {
+                                    "type": "number",
+                                    "min": 0
+                                },
+                                "rx": {
+                                    "type": "number",
+                                    "min": 0
+                                },
+                                "ry": {
+                                    "type": "number",
+                                    "min": 0
+                                },
                                 "w": {
                                     "type": "number",
                                     "min": 0.25
@@ -199,6 +214,12 @@
                     "min": 0,
                     "multipleOf": 1
                 },
+                "max_brightness": {
+                    "type": "number",
+                    "min": 0,
+                    "max": 255,
+                    "multipleOf": 1
+                },
                 "pin": {
                     "type": "string",
                     "pattern": "^[A-K]\\d{1,2}$"
@@ -207,6 +228,18 @@
                     "type": "number",
                     "min": 0,
                     "multipleOf": 1
+                },
+                "sleep": {"type": "boolean"},
+                "split": {"type": "boolean"},
+                "split_count": {
+                    "type": "array",
+                    "minLength": 2,
+                    "maxLength": 2,
+                    "items": {
+                        "type": "number",
+                        "min": 0,
+                        "multipleOf": 1
+                    }
                 }
             }
         },
diff --git a/lib/python/qmk/c_parse.py b/lib/python/qmk/c_parse.py
index e41e271a4..67e196f0e 100644
--- a/lib/python/qmk/c_parse.py
+++ b/lib/python/qmk/c_parse.py
@@ -1,12 +1,27 @@
 """Functions for working with config.h files.
 """
 from pathlib import Path
+import re
 
 from milc import cli
 
 from qmk.comment_remover import comment_remover
 
 default_key_entry = {'x': -1, 'y': 0, 'w': 1}
+single_comment_regex = re.compile(r' */[/*].*$')
+multi_comment_regex = re.compile(r'/\*(.|\n)*\*/', re.MULTILINE)
+
+
+def strip_line_comment(string):
+    """Removes comments from a single line string.
+    """
+    return single_comment_regex.sub('', string)
+
+
+def strip_multiline_comment(string):
+    """Removes comments from a single line string.
+    """
+    return multi_comment_regex.sub('', string)
 
 
 def c_source_files(dir_names):
@@ -53,7 +68,8 @@ def find_layouts(file):
             parsed_layout = [_default_key(key) for key in layout.split(',')]
 
             for key in parsed_layout:
-                key['matrix'] = matrix_locations.get(key['label'])
+                if key['label'] in matrix_locations:
+                    key['matrix'] = matrix_locations[key['label']]
 
             parsed_layouts[macro_name] = {
                 'key_count': len(parsed_layout),
@@ -88,12 +104,10 @@ def parse_config_h_file(config_h_file, config_h=None):
     if config_h_file.exists():
         config_h_text = config_h_file.read_text()
         config_h_text = config_h_text.replace('\\\n', '')
+        config_h_text = strip_multiline_comment(config_h_text)
 
         for linenum, line in enumerate(config_h_text.split('\n')):
-            line = line.strip()
-
-            if '//' in line:
-                line = line[:line.index('//')].strip()
+            line = strip_line_comment(line).strip()
 
             if not line:
                 continue
@@ -156,6 +170,6 @@ def _parse_matrix_locations(matrix, file, macro_name):
         row = row.replace('{', '').replace('}', '')
         for col_num, identifier in enumerate(row.split(',')):
             if identifier != 'KC_NO':
-                matrix_locations[identifier] = (row_num, col_num)
+                matrix_locations[identifier] = [row_num, col_num]
 
     return matrix_locations
diff --git a/lib/python/qmk/cli/generate/api.py b/lib/python/qmk/cli/generate/api.py
index 6d111f244..2fda38fc9 100755
--- a/lib/python/qmk/cli/generate/api.py
+++ b/lib/python/qmk/cli/generate/api.py
@@ -48,7 +48,7 @@ def generate_api(cli):
             if 'vid' in usb and usb['vid'] not in usb_list['devices']:
                 usb_list['devices'][usb['vid']] = {}
 
-            if 'pid' in usb and usb['pid'] not in usb_list['devices'][usb['vid']]:
+            if 'vid' in usb and usb['pid'] not in usb_list['devices'][usb['vid']]:
                 usb_list['devices'][usb['vid']][usb['pid']] = {}
 
             if 'vid' in usb and 'pid' in usb:
diff --git a/lib/python/qmk/cli/generate/rules_mk.py b/lib/python/qmk/cli/generate/rules_mk.py
index 72ed3c45f..570ef5a0d 100755
--- a/lib/python/qmk/cli/generate/rules_mk.py
+++ b/lib/python/qmk/cli/generate/rules_mk.py
@@ -41,9 +41,12 @@ def generate_rules_mk(cli):
     # Find features that should be enabled
     if 'features' in kb_info_json:
         for feature, enabled in kb_info_json['features'].items():
-            feature = feature.upper()
-            enabled = 'yes' if enabled else 'no'
-            rules_mk_lines.append(f'{feature}_ENABLE := {enabled}')
+            if feature == 'bootmagic_lite' and enabled:
+                rules_mk_lines.append(f'BOOTMAGIC_ENABLE := lite')
+            else:
+                feature = feature.upper()
+                enabled = 'yes' if enabled else 'no'
+                rules_mk_lines.append(f'{feature}_ENABLE := {enabled}')
 
     # Set the LED driver
     if 'led_matrix' in kb_info_json and 'driver' in kb_info_json['led_matrix']:
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 1cf12190d..39af88f79 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -26,13 +26,12 @@ led_matrix_properties = {
 }
 
 rgblight_properties = {
-    'led_count': 'RGBLED_NUM',
-    'pin': 'RGB_DI_PIN',
-    'split_count': 'RGBLED_SPLIT',
-    'max_brightness': 'RGBLIGHT_LIMIT_VAL',
-    'hue_steps': 'RGBLIGHT_HUE_STEP',
-    'saturation_steps': 'RGBLIGHT_SAT_STEP',
-    'brightness_steps': 'RGBLIGHT_VAL_STEP'
+    'led_count': ('RGBLED_NUM', int),
+    'pin': ('RGB_DI_PIN', str),
+    'max_brightness': ('RGBLIGHT_LIMIT_VAL', int),
+    'hue_steps': ('RGBLIGHT_HUE_STEP', int),
+    'saturation_steps': ('RGBLIGHT_SAT_STEP', int),
+    'brightness_steps': ('RGBLIGHT_VAL_STEP', int)
 }
 
 rgblight_toggles = {
@@ -54,6 +53,8 @@ rgblight_animations = {
     'twinkle': 'RGBLIGHT_EFFECT_TWINKLE'
 }
 
+usb_properties = {'vid': 'VENDOR_ID', 'pid': 'PRODUCT_ID', 'device_ver': 'DEVICE_VER'}
+
 true_values = ['1', 'on', 'yes']
 false_values = ['0', 'off', 'no']
 
@@ -97,7 +98,8 @@ def info_json(keyboard):
         keyboard_api_validate(info_data)
 
     except jsonschema.ValidationError as e:
-        cli.log.error('Invalid info.json data: %s', e.message)
+        json_path = '.'.join([str(p) for p in e.absolute_path])
+        cli.log.error('Invalid API data: %s: %s: %s', keyboard, json_path, e.message)
         print(dir(e))
         exit()
 
@@ -198,6 +200,9 @@ def _extract_indicators(info_data, config_c):
         if json_key in info_data.get('indicators', []) and config_key in config_c:
             _log_warning(info_data, f'Indicator {json_key} is specified in both info.json and config.h, the config.h value wins.')
 
+        if 'indicators' not in info_data:
+            info_data['indicators'] = {}
+
         if config_key in config_c:
             if 'indicators' not in info_data:
                 info_data['indicators'] = {}
@@ -226,10 +231,23 @@ def _extract_community_layouts(info_data, rules):
 def _extract_features(info_data, rules):
     """Find all the features enabled in rules.mk.
     """
+    # Special handling for bootmagic which also supports a "lite" mode.
+    if rules.get('BOOTMAGIC_ENABLE') == 'lite':
+        rules['BOOTMAGIC_LITE_ENABLE'] = 'on'
+        del(rules['BOOTMAGIC_ENABLE'])
+    if rules.get('BOOTMAGIC_ENABLE') == 'full':
+        rules['BOOTMAGIC_ENABLE'] = 'on'
+
+    # Skip non-boolean features we haven't implemented special handling for
+    for feature in 'HAPTIC_ENABLE', 'QWIIC_ENABLE':
+        if rules.get(feature):
+            del(rules[feature])
+
+    # Process the rest of the rules as booleans
     for key, value in rules.items():
         if key.endswith('_ENABLE'):
             key = '_'.join(key.split('_')[:-1]).lower()
-            value = True if value in true_values else False if value in false_values else value
+            value = True if value.lower() in true_values else False if value.lower() in false_values else value
 
             if 'config_h_features' not in info_data:
                 info_data['config_h_features'] = {}
@@ -280,12 +298,21 @@ def _extract_rgblight(info_data, config_c):
     rgblight = info_data.get('rgblight', {})
     animations = rgblight.get('animations', {})
 
-    for json_key, config_key in rgblight_properties.items():
+    if 'RGBLED_SPLIT' in config_c:
+        raw_split = config_c.get('RGBLED_SPLIT', '').replace('{', '').replace('}', '').strip()
+        rgblight['split_count'] = [int(i) for i in raw_split.split(',')]
+
+    for json_key, config_key_type in rgblight_properties.items():
+        config_key, config_type = config_key_type
+
         if config_key in config_c:
             if json_key in rgblight:
                 _log_warning(info_data, 'RGB Light: %s is specified in both info.json and config.h, the config.h value wins.' % (json_key,))
 
-            rgblight[json_key] = config_c[config_key]
+            try:
+                rgblight[json_key] = config_type(config_c[config_key])
+            except ValueError as e:
+                cli.log.error('%s: config.h: Could not convert "%s" to %s: %s', info_data['keyboard_folder'], config_c[config_key], config_type.__name__, e)
 
     for json_key, config_key in rgblight_toggles.items():
         if config_key in config_c:
@@ -332,11 +359,16 @@ def _extract_matrix_info(info_data, config_c):
 
         info_data['matrix_pins'] = {}
 
+        # FIXME(skullydazed/anyone): Should really check every pin, not just the first
         if row_pins:
-            info_data['matrix_pins']['rows'] = row_pins.split(',')
+            row_pins = [pin.strip() for pin in row_pins.split(',') if pin]
+            if row_pins[0][0] in 'ABCDEFGHIJK' and row_pins[0][1].isdigit():
+                info_data['matrix_pins']['rows'] = row_pins
 
         if col_pins:
-            info_data['matrix_pins']['cols'] = col_pins.split(',')
+            col_pins = [pin.strip() for pin in col_pins.split(',') if pin]
+            if col_pins[0][0] in 'ABCDEFGHIJK' and col_pins[0][1].isdigit():
+                info_data['matrix_pins']['cols'] = col_pins
 
     if direct_pins:
         if 'matrix_pins' in info_data:
@@ -345,6 +377,9 @@ def _extract_matrix_info(info_data, config_c):
         info_data['matrix_pins'] = {}
         direct_pin_array = []
 
+        while direct_pins[-1] != '}':
+            direct_pins = direct_pins[:-1]
+
         for row in direct_pins.split('},{'):
             if row.startswith('{'):
                 row = row[1:]
@@ -368,8 +403,6 @@ def _extract_matrix_info(info_data, config_c):
 def _extract_usb_info(info_data, config_c):
     """Populate the USB information.
     """
-    usb_properties = {'vid': 'VENDOR_ID', 'pid': 'PRODUCT_ID', 'device_ver': 'DEVICE_VER'}
-
     if 'usb' not in info_data:
         info_data['usb'] = {}
 
@@ -378,10 +411,7 @@ def _extract_usb_info(info_data, config_c):
             if info_name in info_data['usb']:
                 _log_warning(info_data, '%s in config.h is overwriting usb.%s in info.json' % (config_name, info_name))
 
-            info_data['usb'][info_name] = config_c[config_name]
-
-        elif info_name not in info_data['usb']:
-            _log_error(info_data, '%s not specified in config.h, and %s not specified in info.json. One is required.' % (config_name, info_name))
+            info_data['usb'][info_name] = '0x' + config_c[config_name][2:].upper()
 
     return info_data
 
@@ -519,8 +549,9 @@ def arm_processor_rules(info_data, rules):
         info_data['processor'] = 'unknown'
 
     if 'BOOTLOADER' in rules:
-        if 'bootloader' in info_data:
-            _log_warning(info_data, 'Bootloader is specified in both info.json and rules.mk, the rules.mk value wins.')
+        # FIXME(skullydazed/anyone): need to remove the massive amounts of duplication first
+        # if 'bootloader' in info_data:
+        #     _log_warning(info_data, 'Bootloader is specified in both info.json and rules.mk, the rules.mk value wins.')
 
         info_data['bootloader'] = rules['BOOTLOADER']
 
@@ -558,8 +589,9 @@ def avr_processor_rules(info_data, rules):
         info_data['processor'] = 'unknown'
 
     if 'BOOTLOADER' in rules:
-        if 'bootloader' in info_data:
-            _log_warning(info_data, 'Bootloader is specified in both info.json and rules.mk, the rules.mk value wins.')
+        # FIXME(skullydazed/anyone): need to remove the massive amounts of duplication first
+        # if 'bootloader' in info_data:
+        #     _log_warning(info_data, 'Bootloader is specified in both info.json and rules.mk, the rules.mk value wins.')
 
         info_data['bootloader'] = rules['BOOTLOADER']
     else:
@@ -593,8 +625,8 @@ def merge_info_jsons(keyboard, info_data):
             keyboard_validate(new_info_data)
 
         except jsonschema.ValidationError as e:
-            cli.log.error('Invalid info.json data: %s', e.message)
-            cli.log.error('Not including file %s', info_file)
+            json_path = '.'.join([str(p) for p in e.absolute_path])
+            cli.log.error('Invalid info.json data: %s: %s: %s', info_file, json_path, e.message)
             continue
 
         if not isinstance(new_info_data, dict):
-- 
cgit v1.3.1


From 56ef80216ae4c67e2a70857c61d1e62eec1ab380 Mon Sep 17 00:00:00 2001
From: Zach White <skullydazed@gmail.com>
Date: Wed, 30 Dec 2020 11:21:18 -0800
Subject: make flake8 happy

---
 lib/python/qmk/cli/generate/rules_mk.py |  5 +-
 lib/python/qmk/info.py                  | 84 ++++++++++++++++++---------------
 2 files changed, 50 insertions(+), 39 deletions(-)

(limited to 'lib/python/qmk/cli')

diff --git a/lib/python/qmk/cli/generate/rules_mk.py b/lib/python/qmk/cli/generate/rules_mk.py
index 570ef5a0d..2a7e91856 100755
--- a/lib/python/qmk/cli/generate/rules_mk.py
+++ b/lib/python/qmk/cli/generate/rules_mk.py
@@ -8,9 +8,10 @@ from qmk.path import is_keyboard, normpath
 
 info_to_rules = {
     'bootloader': 'BOOTLOADER',
-    'processor': 'MCU'
+    'processor': 'MCU',
 }
 
+
 @cli.argument('-o', '--output', arg_only=True, type=normpath, help='File to write to')
 @cli.argument('-q', '--quiet', arg_only=True, action='store_true', help="Quiet mode, only output error messages")
 @cli.argument('-kb', '--keyboard', help='Keyboard to generate config.h for.')
@@ -42,7 +43,7 @@ def generate_rules_mk(cli):
     if 'features' in kb_info_json:
         for feature, enabled in kb_info_json['features'].items():
             if feature == 'bootmagic_lite' and enabled:
-                rules_mk_lines.append(f'BOOTMAGIC_ENABLE := lite')
+                rules_mk_lines.append('BOOTMAGIC_ENABLE := lite')
             else:
                 feature = feature.upper()
                 enabled = 'yes' if enabled else 'no'
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 39af88f79..efd339115 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -234,14 +234,14 @@ def _extract_features(info_data, rules):
     # Special handling for bootmagic which also supports a "lite" mode.
     if rules.get('BOOTMAGIC_ENABLE') == 'lite':
         rules['BOOTMAGIC_LITE_ENABLE'] = 'on'
-        del(rules['BOOTMAGIC_ENABLE'])
+        del rules['BOOTMAGIC_ENABLE']
     if rules.get('BOOTMAGIC_ENABLE') == 'full':
         rules['BOOTMAGIC_ENABLE'] = 'on'
 
     # Skip non-boolean features we haven't implemented special handling for
     for feature in 'HAPTIC_ENABLE', 'QWIIC_ENABLE':
         if rules.get(feature):
-            del(rules[feature])
+            del rules[feature]
 
     # Process the rest of the rules as booleans
     for key, value in rules.items():
@@ -337,6 +337,45 @@ def _extract_rgblight(info_data, config_c):
     return info_data
 
 
+def _extract_pins(pins):
+    """Returns a list of pins from a comma separated string of pins.
+    """
+    pins = [pin.strip() for pin in pins.split(',') if pin]
+
+    for pin in pins:
+        if pin[0] not in 'ABCDEFGHIJK' or not pin[1].isdigit():
+            raise ValueError(f'Invalid pin: {pin}')
+
+    return pins
+
+
+def _extract_direct_matrix(info_data, direct_pins):
+    """
+    """
+    info_data['matrix_pins'] = {}
+    direct_pin_array = []
+
+    while direct_pins[-1] != '}':
+        direct_pins = direct_pins[:-1]
+
+    for row in direct_pins.split('},{'):
+        if row.startswith('{'):
+            row = row[1:]
+
+        if row.endswith('}'):
+            row = row[:-1]
+
+        direct_pin_array.append([])
+
+        for pin in row.split(','):
+            if pin == 'NO_PIN':
+                pin = None
+
+            direct_pin_array[-1].append(pin)
+
+    return direct_pin_array
+
+
 def _extract_matrix_info(info_data, config_c):
     """Populate the matrix information.
     """
@@ -349,53 +388,24 @@ def _extract_matrix_info(info_data, config_c):
             _log_warning(info_data, 'Matrix size is specified in both info.json and config.h, the config.h values win.')
 
         info_data['matrix_size'] = {
-            'rows': compute(config_c.get('MATRIX_ROWS', '0')),
             'cols': compute(config_c.get('MATRIX_COLS', '0')),
+            'rows': compute(config_c.get('MATRIX_ROWS', '0')),
         }
 
     if row_pins and col_pins:
         if 'matrix_pins' in info_data:
             _log_warning(info_data, 'Matrix pins are specified in both info.json and config.h, the config.h values win.')
 
-        info_data['matrix_pins'] = {}
-
-        # FIXME(skullydazed/anyone): Should really check every pin, not just the first
-        if row_pins:
-            row_pins = [pin.strip() for pin in row_pins.split(',') if pin]
-            if row_pins[0][0] in 'ABCDEFGHIJK' and row_pins[0][1].isdigit():
-                info_data['matrix_pins']['rows'] = row_pins
-
-        if col_pins:
-            col_pins = [pin.strip() for pin in col_pins.split(',') if pin]
-            if col_pins[0][0] in 'ABCDEFGHIJK' and col_pins[0][1].isdigit():
-                info_data['matrix_pins']['cols'] = col_pins
+        info_data['matrix_pins'] = {
+            'cols': _extract_pins(col_pins),
+            'rows': _extract_pins(row_pins),
+        }
 
     if direct_pins:
         if 'matrix_pins' in info_data:
             _log_warning(info_data, 'Direct pins are specified in both info.json and config.h, the config.h values win.')
 
-        info_data['matrix_pins'] = {}
-        direct_pin_array = []
-
-        while direct_pins[-1] != '}':
-            direct_pins = direct_pins[:-1]
-
-        for row in direct_pins.split('},{'):
-            if row.startswith('{'):
-                row = row[1:]
-
-            if row.endswith('}'):
-                row = row[:-1]
-
-            direct_pin_array.append([])
-
-            for pin in row.split(','):
-                if pin == 'NO_PIN':
-                    pin = None
-
-                direct_pin_array[-1].append(pin)
-
-            info_data['matrix_pins']['direct'] = direct_pin_array
+        info_data['matrix_pins']['direct'] = _extract_direct_matrix(info_data, direct_pins)
 
     return info_data
 
-- 
cgit v1.3.1


From 9a178f6826a30007f84983daf1c87ded1525c9cd Mon Sep 17 00:00:00 2001
From: Zach White <skullydazed@gmail.com>
Date: Wed, 6 Jan 2021 10:13:25 -0800
Subject: fix rgblight properties

---
 lib/python/qmk/cli/generate/config_h.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/python/qmk/cli')

diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py
index 09aa0041f..15d4fbf2d 100755
--- a/lib/python/qmk/cli/generate/config_h.py
+++ b/lib/python/qmk/cli/generate/config_h.py
@@ -173,9 +173,9 @@ def rgblight(config):
     for json_key, config_key in rgblight_properties.items():
         if json_key in config:
             rgblight_config.append('')
-            rgblight_config.append('#ifndef %s' % (config_key,))
-            rgblight_config.append('#   define %s %s' % (config_key, config[json_key]))
-            rgblight_config.append('#endif // %s' % (config_key,))
+            rgblight_config.append('#ifndef %s' % (config_key[0],))
+            rgblight_config.append('#   define %s %s' % (config_key[0], config[json_key]))
+            rgblight_config.append('#endif // %s' % (config_key[0],))
 
     for json_key, config_key in rgblight_toggles.items():
         if config.get(json_key):
-- 
cgit v1.3.1


From 30331b383f9ef4620e47aa07e4f9af7fae9d30b3 Mon Sep 17 00:00:00 2001
From: Zach White <skullydazed@gmail.com>
Date: Fri, 8 Jan 2021 00:00:15 -0800
Subject: fix bugs triggered by certain boards

---
 data/schemas/keyboard.jsonschema        | 34 ++++++++++++++++++++++++++++----
 lib/python/qmk/c_parse.py               |  4 ++--
 lib/python/qmk/cli/generate/config_h.py |  6 +++---
 lib/python/qmk/info.py                  | 35 ++++++++++++++++++++++-----------
 4 files changed, 59 insertions(+), 20 deletions(-)

(limited to 'lib/python/qmk/cli')

diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 9355ee49b..e13771e92 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -166,6 +166,10 @@
                                     "type": "string",
                                     "pattern": "^[A-K]\\d{1,2}$"
                                 },
+                                {
+                                    "type": "number",
+                                    "multipleOf": 1
+                                },
                                 {
                                     "type": "null"
                                 }
@@ -176,15 +180,37 @@
                 "cols": {
                     "type": "array",
                     "items": {
-                        "type": "string",
-                        "pattern": "^[A-K]\\d{1,2}$"
+                        "oneOf": [
+                            {
+                                "type": "string",
+                                "pattern": "^[A-K]\\d{1,2}$"
+                            },
+                            {
+                                "type": "number",
+                                "multipleOf": 1
+                            },
+                            {
+                                "type": "null"
+                            }
+                        ]
                     }
                 },
                 "rows": {
                     "type": "array",
                     "items": {
-                        "type": "string",
-                        "pattern": "^[A-K]\\d{1,2}$"
+                        "oneOf": [
+                            {
+                                "type": "string",
+                                "pattern": "^[A-K]\\d{1,2}$"
+                            },
+                            {
+                                "type": "number",
+                                "multipleOf": 1
+                            },
+                            {
+                                "type": "null"
+                            }
+                        ]
                     }
                 }
             }
diff --git a/lib/python/qmk/c_parse.py b/lib/python/qmk/c_parse.py
index 67e196f0e..0338484ec 100644
--- a/lib/python/qmk/c_parse.py
+++ b/lib/python/qmk/c_parse.py
@@ -9,7 +9,7 @@ from qmk.comment_remover import comment_remover
 
 default_key_entry = {'x': -1, 'y': 0, 'w': 1}
 single_comment_regex = re.compile(r' */[/*].*$')
-multi_comment_regex = re.compile(r'/\*(.|\n)*\*/', re.MULTILINE)
+multi_comment_regex = re.compile(r'/\*(.|\n)*?\*/', re.MULTILINE)
 
 
 def strip_line_comment(string):
@@ -103,7 +103,7 @@ def parse_config_h_file(config_h_file, config_h=None):
 
     if config_h_file.exists():
         config_h_text = config_h_file.read_text()
-        config_h_text = config_h_text.replace('\\\n', '')
+        config_h_text = config_h_text.replace('\\\n', '') # Why are you here?
         config_h_text = strip_multiline_comment(config_h_text)
 
         for linenum, line in enumerate(config_h_text.split('\n')):
diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py
index 15d4fbf2d..1de84de7a 100755
--- a/lib/python/qmk/cli/generate/config_h.py
+++ b/lib/python/qmk/cli/generate/config_h.py
@@ -64,7 +64,7 @@ def direct_pins(direct_pins):
     rows = []
 
     for row in direct_pins:
-        cols = ','.join([col or 'NO_PIN' for col in row])
+        cols = ','.join(map(str, [col or 'NO_PIN' for col in row]))
         rows.append('{' + cols + '}')
 
     col_count = len(direct_pins[0])
@@ -88,7 +88,7 @@ def direct_pins(direct_pins):
 def col_pins(col_pins):
     """Return the config.h lines that set the column pins.
     """
-    cols = ','.join(col_pins)
+    cols = ','.join(map(str, [pin or 'NO_PIN' for pin in col_pins]))
     col_num = len(col_pins)
 
     return """
@@ -105,7 +105,7 @@ def col_pins(col_pins):
 def row_pins(row_pins):
     """Return the config.h lines that set the row pins.
     """
-    rows = ','.join(row_pins)
+    rows = ','.join(map(str, [pin or 'NO_PIN' for pin in row_pins]))
     row_num = len(row_pins)
 
     return """
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index efd339115..28c281a4b 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -315,11 +315,10 @@ def _extract_rgblight(info_data, config_c):
                 cli.log.error('%s: config.h: Could not convert "%s" to %s: %s', info_data['keyboard_folder'], config_c[config_key], config_type.__name__, e)
 
     for json_key, config_key in rgblight_toggles.items():
-        if config_key in config_c:
-            if json_key in rgblight:
-                _log_warning(info_data, 'RGB Light: %s is specified in both info.json and config.h, the config.h value wins.', json_key)
+        if config_key in config_c and json_key in rgblight:
+            _log_warning(info_data, 'RGB Light: %s is specified in both info.json and config.h, the config.h value wins.', json_key)
 
-            rgblight[json_key] = config_c[config_key]
+        rgblight[json_key] = config_key in config_c
 
     for json_key, config_key in rgblight_animations.items():
         if config_key in config_c:
@@ -337,16 +336,30 @@ def _extract_rgblight(info_data, config_c):
     return info_data
 
 
-def _extract_pins(pins):
-    """Returns a list of pins from a comma separated string of pins.
+def _pin_name(pin):
+    """Returns the proper representation for a pin.
     """
-    pins = [pin.strip() for pin in pins.split(',') if pin]
+    pin = pin.strip()
+
+    if not pin:
+        return None
+
+    elif pin.isdigit():
+        return int(pin)
 
-    for pin in pins:
-        if pin[0] not in 'ABCDEFGHIJK' or not pin[1].isdigit():
-            raise ValueError(f'Invalid pin: {pin}')
+    elif pin == 'NO_PIN':
+        return None
 
-    return pins
+    elif pin[0] in 'ABCDEFGHIJK' and pin[1].isdigit():
+        return pin
+
+    raise ValueError(f'Invalid pin: {pin}')
+
+
+def _extract_pins(pins):
+    """Returns a list of pins from a comma separated string of pins.
+    """
+    return [_pin_name(pin) for pin in pins.split(',')]
 
 
 def _extract_direct_matrix(info_data, direct_pins):
-- 
cgit v1.3.1


From e2c7f893470465f986bd6849c18606be0f2b7842 Mon Sep 17 00:00:00 2001
From: Zach White <skullydazed@gmail.com>
Date: Fri, 8 Jan 2021 08:46:51 -0800
Subject: typo fix

---
 lib/python/qmk/cli/generate/api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/python/qmk/cli')

diff --git a/lib/python/qmk/cli/generate/api.py b/lib/python/qmk/cli/generate/api.py
index 2fda38fc9..6d111f244 100755
--- a/lib/python/qmk/cli/generate/api.py
+++ b/lib/python/qmk/cli/generate/api.py
@@ -48,7 +48,7 @@ def generate_api(cli):
             if 'vid' in usb and usb['vid'] not in usb_list['devices']:
                 usb_list['devices'][usb['vid']] = {}
 
-            if 'vid' in usb and usb['pid'] not in usb_list['devices'][usb['vid']]:
+            if 'pid' in usb and usb['pid'] not in usb_list['devices'][usb['vid']]:
                 usb_list['devices'][usb['vid']][usb['pid']] = {}
 
             if 'vid' in usb and 'pid' in usb:
-- 
cgit v1.3.1


From 962bc8d9dd413690dbeadeaac971a5389697210f Mon Sep 17 00:00:00 2001
From: Zach White <skullydazed@gmail.com>
Date: Sat, 9 Jan 2021 13:34:14 -0800
Subject: Use the schema to eliminate custom code (#11108)

* use the schema to eliminate custom code

* Update docs/reference_info_json.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* make flake8 happy

* bugfix

* do not overwrite make vars from json

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 data/schemas/keyboard.jsonschema         |  2 +-
 docs/reference_info_json.md              |  1 +
 lib/python/qmk/cli/generate/info_json.py | 48 ++++++++++++++++---------
 lib/python/qmk/cli/generate/layouts.py   |  4 +++
 lib/python/qmk/cli/generate/rules_mk.py  | 10 +++---
 lib/python/qmk/constants.py              |  2 +-
 lib/python/qmk/info.py                   | 60 +++++++++++++++-----------------
 setup.cfg                                |  2 ++
 8 files changed, 75 insertions(+), 54 deletions(-)

(limited to 'lib/python/qmk/cli')

diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index e13771e92..f76c7fd18 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -25,7 +25,7 @@
         },
         "processor": {
             "type": "string",
-            "enum": ["MK20DX128", "MK20DX256", "MKL26Z64", "STM32F042", "STM32F072", "STM32F103", "STM32F303", "STM32F401", "STM32F411", "at90usb1286", "at90usb646", "atmega16u2", "atmega328p", "atmega32a", "atmega32u2", "atmega32u4", "attiny85", "cortex-m4"]
+            "enum": ["MK20DX128", "MK20DX256", "MKL26Z64", "STM32F042", "STM32F072", "STM32F103", "STM32F303", "STM32F401", "STM32F411", "at90usb1286", "at90usb646", "atmega16u2", "atmega328p", "atmega32a", "atmega32u2", "atmega32u4", "attiny85", "cortex-m4", "unknown"]
         },
         "bootloader": {
             "type": "string",
diff --git a/docs/reference_info_json.md b/docs/reference_info_json.md
index 47506bc92..c9864ea2d 100644
--- a/docs/reference_info_json.md
+++ b/docs/reference_info_json.md
@@ -106,6 +106,7 @@ Example:
             ["A7", "B1"],
             [null, "B2"]
         ]
+    }
 }
 ```
 
diff --git a/lib/python/qmk/cli/generate/info_json.py b/lib/python/qmk/cli/generate/info_json.py
index fba4b1c01..f3fc54ddc 100755
--- a/lib/python/qmk/cli/generate/info_json.py
+++ b/lib/python/qmk/cli/generate/info_json.py
@@ -4,14 +4,41 @@ Compile an info.json for a particular keyboard and pretty-print it.
 """
 import json
 
+from jsonschema import Draft7Validator, validators
 from milc import cli
 
-from qmk.info_json_encoder import InfoJSONEncoder
 from qmk.decorators import automagic_keyboard, automagic_keymap
-from qmk.info import info_json
+from qmk.info import info_json, _jsonschema
+from qmk.info_json_encoder import InfoJSONEncoder
 from qmk.path import is_keyboard
 
 
+def pruning_validator(validator_class):
+    """Extends Draft7Validator to remove properties that aren't specified in the schema.
+    """
+    validate_properties = validator_class.VALIDATORS["properties"]
+
+    def remove_additional_properties(validator, properties, instance, schema):
+        for prop in list(instance.keys()):
+            if prop not in properties:
+                del instance[prop]
+
+        for error in validate_properties(validator, properties, instance, schema):
+            yield error
+
+    return validators.extend(validator_class, {"properties": remove_additional_properties})
+
+
+def strip_info_json(kb_info_json):
+    """Remove the API-only properties from the info.json.
+    """
+    pruning_draft_7_validator = pruning_validator(Draft7Validator)
+    schema = _jsonschema('keyboard')
+    validator = pruning_draft_7_validator(schema).validate
+
+    return validator(kb_info_json)
+
+
 @cli.argument('-kb', '--keyboard', help='Keyboard to show info for.')
 @cli.argument('-km', '--keymap', help='Show the layers for a JSON keymap too.')
 @cli.subcommand('Generate an info.json file for a keyboard.', hidden=False if cli.config.user.developer else True)
@@ -22,7 +49,7 @@ def generate_info_json(cli):
     """
     # Determine our keyboard(s)
     if not cli.config.generate_info_json.keyboard:
-        cli.log.error('Missing paramater: --keyboard')
+        cli.log.error('Missing parameter: --keyboard')
         cli.subcommands['info'].print_help()
         return False
 
@@ -32,18 +59,7 @@ def generate_info_json(cli):
 
     # Build the info.json file
     kb_info_json = info_json(cli.config.generate_info_json.keyboard)
-    pared_down_json = {}
-
-    for key in ('manufacturer', 'maintainer', 'usb', 'keyboard_name', 'width', 'height', 'debounce', 'diode_direction', 'features', 'community_layouts', 'layout_aliases', 'matrix_pins', 'rgblight', 'url'):
-        if key in kb_info_json:
-            pared_down_json[key] = kb_info_json[key]
-
-    pared_down_json['layouts'] = {}
-    if 'layouts' in kb_info_json:
-        for layout_name, layout in kb_info_json['layouts'].items():
-            pared_down_json['layouts'][layout_name] = {}
-            pared_down_json['layouts'][layout_name]['key_count'] = layout.get('key_count', len(layout['layout']))
-            pared_down_json['layouts'][layout_name]['layout'] = layout['layout']
+    strip_info_json(kb_info_json)
 
     # Display the results
-    print(json.dumps(pared_down_json, indent=2, cls=InfoJSONEncoder))
+    print(json.dumps(kb_info_json, indent=2, cls=InfoJSONEncoder))
diff --git a/lib/python/qmk/cli/generate/layouts.py b/lib/python/qmk/cli/generate/layouts.py
index 273870e15..b7baae065 100755
--- a/lib/python/qmk/cli/generate/layouts.py
+++ b/lib/python/qmk/cli/generate/layouts.py
@@ -54,6 +54,10 @@ def generate_layouts(cli):
         if kb_info_json['layouts'][layout_name]['c_macro']:
             continue
 
+        if 'matrix' not in kb_info_json['layouts'][layout_name]['layout'][0]:
+            cli.log.debug('%s/%s: No matrix data!', cli.config.generate_layouts.keyboard, layout_name)
+            continue
+
         layout_keys = []
         layout_matrix = [['KC_NO' for i in range(col_num)] for i in range(row_num)]
 
diff --git a/lib/python/qmk/cli/generate/rules_mk.py b/lib/python/qmk/cli/generate/rules_mk.py
index 2a7e91856..0fdccb404 100755
--- a/lib/python/qmk/cli/generate/rules_mk.py
+++ b/lib/python/qmk/cli/generate/rules_mk.py
@@ -37,26 +37,26 @@ def generate_rules_mk(cli):
 
     # Bring in settings
     for info_key, rule_key in info_to_rules.items():
-        rules_mk_lines.append(f'{rule_key} := {kb_info_json[info_key]}')
+        rules_mk_lines.append(f'{rule_key} ?= {kb_info_json[info_key]}')
 
     # Find features that should be enabled
     if 'features' in kb_info_json:
         for feature, enabled in kb_info_json['features'].items():
             if feature == 'bootmagic_lite' and enabled:
-                rules_mk_lines.append('BOOTMAGIC_ENABLE := lite')
+                rules_mk_lines.append('BOOTMAGIC_ENABLE ?= lite')
             else:
                 feature = feature.upper()
                 enabled = 'yes' if enabled else 'no'
-                rules_mk_lines.append(f'{feature}_ENABLE := {enabled}')
+                rules_mk_lines.append(f'{feature}_ENABLE ?= {enabled}')
 
     # Set the LED driver
     if 'led_matrix' in kb_info_json and 'driver' in kb_info_json['led_matrix']:
         driver = kb_info_json['led_matrix']['driver']
-        rules_mk_lines.append(f'LED_MATRIX_DRIVER = {driver}')
+        rules_mk_lines.append(f'LED_MATRIX_DRIVER ?= {driver}')
 
     # Add community layouts
     if 'community_layouts' in kb_info_json:
-        rules_mk_lines.append(f'LAYOUTS = {" ".join(kb_info_json["community_layouts"])}')
+        rules_mk_lines.append(f'LAYOUTS ?= {" ".join(kb_info_json["community_layouts"])}')
 
     # Show the results
     rules_mk = '\n'.join(rules_mk_lines) + '\n'
diff --git a/lib/python/qmk/constants.py b/lib/python/qmk/constants.py
index 675832c50..6a643070f 100644
--- a/lib/python/qmk/constants.py
+++ b/lib/python/qmk/constants.py
@@ -26,5 +26,5 @@ ROW_LETTERS = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnop'
 LED_INDICATORS = {
     'caps_lock': 'LED_CAPS_LOCK_PIN',
     'num_lock': 'LED_NUM_LOCK_PIN',
-    'scrol_lock': 'LED_SCROLL_LOCK_PIN'
+    'scrol_lock': 'LED_SCROLL_LOCK_PIN',
 }
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 28c281a4b..0ea5136a9 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -1,6 +1,7 @@
 """Functions that help us generate and use info.json files.
 """
 import json
+from collections.abc import Mapping
 from glob import glob
 from pathlib import Path
 
@@ -140,6 +141,8 @@ def _json_load(json_file):
 
 def _jsonschema(schema_name):
     """Read a jsonschema file from disk.
+
+    FIXME(skullydazed/anyone): Refactor to make this a public function.
     """
     schema_path = Path(f'data/schemas/{schema_name}.jsonschema')
 
@@ -638,49 +641,44 @@ def unknown_processor_rules(info_data, rules):
     return info_data
 
 
+def deep_update(origdict, newdict):
+    """Update a dictionary in place, recursing to do a deep copy.
+    """
+    for key, value in newdict.items():
+        if isinstance(value, Mapping):
+            origdict[key] = deep_update(origdict.get(key, {}), value)
+
+        else:
+            origdict[key] = value
+
+    return origdict
+
+
 def merge_info_jsons(keyboard, info_data):
     """Return a merged copy of all the info.json files for a keyboard.
     """
     for info_file in find_info_json(keyboard):
         # Load and validate the JSON data
+        new_info_data = _json_load(info_file)
+
+        if not isinstance(new_info_data, dict):
+            _log_error(info_data, "Invalid file %s, root object should be a dictionary." % (str(info_file),))
+            continue
+
         try:
-            new_info_data = _json_load(info_file)
             keyboard_validate(new_info_data)
-
         except jsonschema.ValidationError as e:
             json_path = '.'.join([str(p) for p in e.absolute_path])
-            cli.log.error('Invalid info.json data: %s: %s: %s', info_file, json_path, e.message)
+            cli.log.error('Not including data from file: %s', info_file)
+            cli.log.error('\t%s: %s', json_path, e.message)
             continue
 
-        if not isinstance(new_info_data, dict):
-            _log_error(info_data, "Invalid file %s, root object should be a dictionary." % (str(info_file),))
-            continue
-
-        # Copy whitelisted keys into `info_data`
-        for key in ('debounce', 'diode_direction', 'indicators', 'keyboard_name', 'manufacturer', 'identifier', 'url', 'maintainer', 'processor', 'bootloader', 'width', 'height'):
-            if key in new_info_data:
-                info_data[key] = new_info_data[key]
-
-        # Deep merge certain keys
-        # FIXME(skullydazed/anyone): this should be generalized more so that we can inteligently merge more than one level deep. It would be nice if we could filter on valid keys too. That may have to wait for a future where we use openapi or something.
-        for key in ('features', 'layout_aliases', 'led_matrix', 'matrix_pins', 'rgblight', 'usb'):
-            if key in new_info_data:
-                if key not in info_data:
-                    info_data[key] = {}
-
-                info_data[key].update(new_info_data[key])
-
-        # Merge the layouts
-        if 'community_layouts' in new_info_data:
-            if 'community_layouts' in info_data:
-                for layout in new_info_data['community_layouts']:
-                    if layout not in info_data['community_layouts']:
-                        info_data['community_layouts'].append(layout)
-            else:
-                info_data['community_layouts'] = new_info_data['community_layouts']
+        # Mark the layouts as coming from json
+        for layout in new_info_data.get('layouts', {}).values():
+            layout['c_macro'] = False
 
-        if 'layouts' in new_info_data:
-            _merge_layouts(info_data, new_info_data)
+        # Update info_data with the new data
+        deep_update(info_data, new_info_data)
 
     return info_data
 
diff --git a/setup.cfg b/setup.cfg
index 5ef2f9ba0..baa6a0396 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,6 +3,8 @@
 ignore =
     # QMK is ok with long lines.
     E501
+    # Conflicts with our yapf config
+    E231
 per_file_ignores =
     **/__init__.py:F401
 
-- 
cgit v1.3.1


From eaa9106ec74591593e638ac015a5c90d17b30612 Mon Sep 17 00:00:00 2001
From: Zach White <skullydazed@gmail.com>
Date: Sat, 9 Jan 2021 20:18:47 -0800
Subject: Add support for specifying BOARD in info.json (#11492)

* add support for specifying BOARD in info.json

* move BOARD from rules.mk to info.json for clueboard

* fix keyboards that do not require board

* remove out of compliance values
---
 data/schemas/keyboard.jsonschema              | 5 +++++
 keyboards/clueboard/60/info.json              | 1 +
 keyboards/clueboard/60/rules.mk               | 2 --
 keyboards/clueboard/66/rev4/info.json         | 1 +
 keyboards/clueboard/66/rev4/rules.mk          | 1 -
 keyboards/clueboard/66_hotswap/gen1/info.json | 1 +
 keyboards/clueboard/66_hotswap/gen1/rules.mk  | 1 -
 keyboards/clueboard/california/info.json      | 1 +
 keyboards/clueboard/california/rules.mk       | 1 -
 keyboards/cmm_studio/saka68/info.json         | 2 --
 lib/python/qmk/cli/generate/rules_mk.py       | 4 +++-
 lib/python/qmk/info.py                        | 8 +++++++-
 12 files changed, 19 insertions(+), 9 deletions(-)

(limited to 'lib/python/qmk/cli')

diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index f76c7fd18..0b3d6f393 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -27,6 +27,11 @@
             "type": "string",
             "enum": ["MK20DX128", "MK20DX256", "MKL26Z64", "STM32F042", "STM32F072", "STM32F103", "STM32F303", "STM32F401", "STM32F411", "at90usb1286", "at90usb646", "atmega16u2", "atmega328p", "atmega32a", "atmega32u2", "atmega32u4", "attiny85", "cortex-m4", "unknown"]
         },
+        "board": {
+            "type": "string",
+            "minLength": 2,
+            "pattern": "^[a-zA-Z_][0-9a-zA-Z_]*$"
+        },
         "bootloader": {
             "type": "string",
             "enum": ["atmel-dfu", "bootloadHID", "caterina", "halfkay", "kiibohd", "lufa-dfu", "lufa-ms", "micronucleus", "qmk-dfu", "stm32-dfu", "stm32duino", "unknown", "USBasp"]
diff --git a/keyboards/clueboard/60/info.json b/keyboards/clueboard/60/info.json
index 2da993437..a68081daf 100644
--- a/keyboards/clueboard/60/info.json
+++ b/keyboards/clueboard/60/info.json
@@ -6,6 +6,7 @@
   "width": 15,
   "debounce": 6,
   "processor": "STM32F303",
+  "board": "QMK_PROTON_C",
   "diode_direction": "COL2ROW",
   "features": {
     "audio": true,
diff --git a/keyboards/clueboard/60/rules.mk b/keyboards/clueboard/60/rules.mk
index 6bc7eb761..c73b4c473 100644
--- a/keyboards/clueboard/60/rules.mk
+++ b/keyboards/clueboard/60/rules.mk
@@ -1,4 +1,2 @@
-BOARD = QMK_PROTON_C
-
 # project specific files
 SRC =	led.c
diff --git a/keyboards/clueboard/66/rev4/info.json b/keyboards/clueboard/66/rev4/info.json
index aef1dee7a..9c8fcbef5 100644
--- a/keyboards/clueboard/66/rev4/info.json
+++ b/keyboards/clueboard/66/rev4/info.json
@@ -6,6 +6,7 @@
   "width": 16.5,
   "debounce": 5,
   "processor": "STM32F303",
+  "board": "QMK_PROTON_C",
   "diode_direction": "COL2ROW",
   "features": {
     "audio": true,
diff --git a/keyboards/clueboard/66/rev4/rules.mk b/keyboards/clueboard/66/rev4/rules.mk
index 14a7fa7b7..6e7633bfe 100644
--- a/keyboards/clueboard/66/rev4/rules.mk
+++ b/keyboards/clueboard/66/rev4/rules.mk
@@ -1,2 +1 @@
-BOARD = QMK_PROTON_C
 # This file intentionally left blank
diff --git a/keyboards/clueboard/66_hotswap/gen1/info.json b/keyboards/clueboard/66_hotswap/gen1/info.json
index 18afe5412..bcf66e8af 100644
--- a/keyboards/clueboard/66_hotswap/gen1/info.json
+++ b/keyboards/clueboard/66_hotswap/gen1/info.json
@@ -6,6 +6,7 @@
   "width": 16.5,
   "debounce": 5,
   "processor": "STM32F303",
+  "board": "QMK_PROTON_C",
   "diode_direction": "COL2ROW",
   "features": {
     "audio": true,
diff --git a/keyboards/clueboard/66_hotswap/gen1/rules.mk b/keyboards/clueboard/66_hotswap/gen1/rules.mk
index e23f9a4b3..33cf11a79 100644
--- a/keyboards/clueboard/66_hotswap/gen1/rules.mk
+++ b/keyboards/clueboard/66_hotswap/gen1/rules.mk
@@ -1,4 +1,3 @@
-BOARD = QMK_PROTON_C
 LED_MATRIX_DRIVER = IS31FL3731
 
 # project specific files
diff --git a/keyboards/clueboard/california/info.json b/keyboards/clueboard/california/info.json
index 02c06ce51..e40b2338c 100644
--- a/keyboards/clueboard/california/info.json
+++ b/keyboards/clueboard/california/info.json
@@ -3,6 +3,7 @@
     "url": "",
     "maintainer": "skullydazed",
     "processor": "STM32F303",
+    "board": "QMK_PROTON_C",
     "matrix_pins": {
         "direct": [
             ["A10", "A9"],
diff --git a/keyboards/clueboard/california/rules.mk b/keyboards/clueboard/california/rules.mk
index 14a7fa7b7..6e7633bfe 100644
--- a/keyboards/clueboard/california/rules.mk
+++ b/keyboards/clueboard/california/rules.mk
@@ -1,2 +1 @@
-BOARD = QMK_PROTON_C
 # This file intentionally left blank
diff --git a/keyboards/cmm_studio/saka68/info.json b/keyboards/cmm_studio/saka68/info.json
index 75a78649b..ac6d0465a 100644
--- a/keyboards/cmm_studio/saka68/info.json
+++ b/keyboards/cmm_studio/saka68/info.json
@@ -1,6 +1,4 @@
 {
-    "keyboard_name": "",
-    "url": "",
     "maintainer": "qmk",
     "width": 17.25,
     "height": 5,
diff --git a/lib/python/qmk/cli/generate/rules_mk.py b/lib/python/qmk/cli/generate/rules_mk.py
index 0fdccb404..b262e3c66 100755
--- a/lib/python/qmk/cli/generate/rules_mk.py
+++ b/lib/python/qmk/cli/generate/rules_mk.py
@@ -7,6 +7,7 @@ from qmk.info import info_json
 from qmk.path import is_keyboard, normpath
 
 info_to_rules = {
+    'board': 'BOARD',
     'bootloader': 'BOOTLOADER',
     'processor': 'MCU',
 }
@@ -37,7 +38,8 @@ def generate_rules_mk(cli):
 
     # Bring in settings
     for info_key, rule_key in info_to_rules.items():
-        rules_mk_lines.append(f'{rule_key} ?= {kb_info_json[info_key]}')
+        if info_key in kb_info_json:
+            rules_mk_lines.append(f'{rule_key} ?= {kb_info_json[info_key]}')
 
     # Find features that should be enabled
     if 'features' in kb_info_json:
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 0ea5136a9..cc81f7a08 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -462,7 +462,7 @@ def _extract_rules_mk(info_data):
     """Pull some keyboard information from existing rules.mk files
     """
     rules = rules_mk(info_data['keyboard_folder'])
-    mcu = rules.get('MCU')
+    mcu = rules.get('MCU', info_data.get('processor'))
 
     if mcu in CHIBIOS_PROCESSORS:
         arm_processor_rules(info_data, rules)
@@ -594,6 +594,12 @@ def arm_processor_rules(info_data, rules):
     elif 'ARM_ATSAM' in rules:
         info_data['platform'] = 'ARM_ATSAM'
 
+    if 'BOARD' in rules:
+        if 'board' in info_data:
+            _log_warning(info_data, 'Board is specified in both info.json and rules.mk, the rules.mk value wins.')
+
+        info_data['board'] = rules['BOARD']
+
     return info_data
 
 
-- 
cgit v1.3.1


From 78fe155b7241900988f26479b8e417623b137320 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Wed, 20 Jan 2021 02:19:36 +1100
Subject: Fix up comments showing how to execute config migration. (#11621)

---
 keyboards/acheron/arctic/chconf.h                  | 2 +-
 keyboards/acheron/arctic/mcuconf.h                 | 2 +-
 keyboards/acheron/austin/chconf.h                  | 2 +-
 keyboards/acheron/austin/halconf.h                 | 2 +-
 keyboards/acheron/austin/mcuconf.h                 | 2 +-
 keyboards/acheron/keebspcb/chconf.h                | 2 +-
 keyboards/acheron/keebspcb/mcuconf.h               | 2 +-
 keyboards/acheron/lasgweloth/chconf.h              | 2 +-
 keyboards/acheron/lasgweloth/mcuconf.h             | 2 +-
 keyboards/aeboards/ext65/rev2/chconf.h             | 2 +-
 keyboards/aeboards/ext65/rev2/halconf.h            | 2 +-
 keyboards/aeboards/ext65/rev2/mcuconf.h            | 2 +-
 keyboards/ai03/vega/chconf.h                       | 2 +-
 keyboards/akegata_denki/device_one/chconf.h        | 2 +-
 keyboards/akegata_denki/device_one/halconf.h       | 2 +-
 keyboards/alpine65/chconf.h                        | 2 +-
 keyboards/alpine65/halconf.h                       | 2 +-
 keyboards/alpine65/mcuconf.h                       | 2 +-
 keyboards/at_at/660m/chconf.h                      | 2 +-
 keyboards/at_at/660m/halconf.h                     | 2 +-
 keyboards/at_at/660m/mcuconf.h                     | 2 +-
 keyboards/box75/chconf.h                           | 2 +-
 keyboards/box75/mcuconf.h                          | 2 +-
 keyboards/bt66tech/bt66tech60/chconf.h             | 2 +-
 keyboards/bt66tech/bt66tech60/halconf.h            | 2 +-
 keyboards/bt66tech/bt66tech60/mcuconf.h            | 2 +-
 keyboards/cannonkeys/an_c/chconf.h                 | 2 +-
 keyboards/cannonkeys/an_c/halconf.h                | 2 +-
 keyboards/cannonkeys/an_c/mcuconf.h                | 2 +-
 keyboards/cannonkeys/atlas/chconf.h                | 2 +-
 keyboards/cannonkeys/atlas/halconf.h               | 2 +-
 keyboards/cannonkeys/atlas/mcuconf.h               | 2 +-
 keyboards/cannonkeys/chimera65/chconf.h            | 2 +-
 keyboards/cannonkeys/chimera65/halconf.h           | 2 +-
 keyboards/cannonkeys/chimera65/mcuconf.h           | 2 +-
 keyboards/cannonkeys/db60/chconf.h                 | 2 +-
 keyboards/cannonkeys/db60/halconf.h                | 2 +-
 keyboards/cannonkeys/db60/mcuconf.h                | 2 +-
 keyboards/cannonkeys/devastatingtkl/chconf.h       | 2 +-
 keyboards/cannonkeys/devastatingtkl/halconf.h      | 2 +-
 keyboards/cannonkeys/devastatingtkl/mcuconf.h      | 2 +-
 keyboards/cannonkeys/instant60/chconf.h            | 2 +-
 keyboards/cannonkeys/instant60/halconf.h           | 2 +-
 keyboards/cannonkeys/instant60/mcuconf.h           | 2 +-
 keyboards/cannonkeys/instant65/chconf.h            | 2 +-
 keyboards/cannonkeys/instant65/halconf.h           | 2 +-
 keyboards/cannonkeys/instant65/mcuconf.h           | 2 +-
 keyboards/cannonkeys/iron165/chconf.h              | 2 +-
 keyboards/cannonkeys/iron165/halconf.h             | 2 +-
 keyboards/cannonkeys/iron165/mcuconf.h             | 2 +-
 keyboards/cannonkeys/obliterated75/chconf.h        | 2 +-
 keyboards/cannonkeys/obliterated75/halconf.h       | 2 +-
 keyboards/cannonkeys/obliterated75/mcuconf.h       | 2 +-
 keyboards/cannonkeys/onyx/chconf.h                 | 2 +-
 keyboards/cannonkeys/onyx/halconf.h                | 2 +-
 keyboards/cannonkeys/onyx/mcuconf.h                | 2 +-
 keyboards/cannonkeys/ortho48/chconf.h              | 2 +-
 keyboards/cannonkeys/ortho48/halconf.h             | 2 +-
 keyboards/cannonkeys/ortho48/mcuconf.h             | 2 +-
 keyboards/cannonkeys/ortho60/chconf.h              | 2 +-
 keyboards/cannonkeys/ortho60/halconf.h             | 2 +-
 keyboards/cannonkeys/ortho60/mcuconf.h             | 2 +-
 keyboards/cannonkeys/ortho75/chconf.h              | 2 +-
 keyboards/cannonkeys/ortho75/halconf.h             | 2 +-
 keyboards/cannonkeys/ortho75/mcuconf.h             | 2 +-
 keyboards/cannonkeys/practice60/chconf.h           | 2 +-
 keyboards/cannonkeys/practice60/halconf.h          | 2 +-
 keyboards/cannonkeys/practice60/mcuconf.h          | 2 +-
 keyboards/cannonkeys/practice65/chconf.h           | 2 +-
 keyboards/cannonkeys/practice65/halconf.h          | 2 +-
 keyboards/cannonkeys/practice65/mcuconf.h          | 2 +-
 keyboards/cannonkeys/rekt1800/chconf.h             | 2 +-
 keyboards/cannonkeys/rekt1800/halconf.h            | 2 +-
 keyboards/cannonkeys/rekt1800/mcuconf.h            | 2 +-
 keyboards/cannonkeys/sagittarius/chconf.h          | 2 +-
 keyboards/cannonkeys/sagittarius/halconf.h         | 2 +-
 keyboards/cannonkeys/sagittarius/mcuconf.h         | 2 +-
 keyboards/cannonkeys/satisfaction75/chconf.h       | 2 +-
 keyboards/cannonkeys/satisfaction75/halconf.h      | 2 +-
 keyboards/cannonkeys/satisfaction75/mcuconf.h      | 2 +-
 keyboards/cannonkeys/savage65/chconf.h             | 2 +-
 keyboards/cannonkeys/savage65/halconf.h            | 2 +-
 keyboards/cannonkeys/savage65/mcuconf.h            | 2 +-
 keyboards/cannonkeys/tmov2/chconf.h                | 2 +-
 keyboards/cannonkeys/tmov2/halconf.h               | 2 +-
 keyboards/cannonkeys/tmov2/mcuconf.h               | 2 +-
 keyboards/cannonkeys/tsukuyomi/chconf.h            | 2 +-
 keyboards/cannonkeys/tsukuyomi/halconf.h           | 2 +-
 keyboards/cannonkeys/tsukuyomi/mcuconf.h           | 2 +-
 keyboards/chavdai40/chconf.h                       | 2 +-
 keyboards/chavdai40/halconf.h                      | 2 +-
 keyboards/chavdai40/mcuconf.h                      | 2 +-
 keyboards/cheshire/curiosity/chconf.h              | 2 +-
 keyboards/ck60i/chconf.h                           | 2 +-
 keyboards/ck60i/halconf.h                          | 2 +-
 keyboards/ck60i/mcuconf.h                          | 2 +-
 keyboards/clueboard/60/halconf.h                   | 2 +-
 keyboards/clueboard/60/mcuconf.h                   | 2 +-
 keyboards/clueboard/66/rev4/halconf.h              | 2 +-
 keyboards/clueboard/66/rev4/mcuconf.h              | 2 +-
 keyboards/clueboard/66_hotswap/gen1/halconf.h      | 2 +-
 keyboards/clueboard/66_hotswap/gen1/mcuconf.h      | 2 +-
 keyboards/coarse/cordillera/chconf.h               | 2 +-
 keyboards/coarse/cordillera/halconf.h              | 2 +-
 keyboards/coarse/cordillera/mcuconf.h              | 2 +-
 keyboards/converter/siemens_tastatur/chconf.h      | 2 +-
 keyboards/converter/siemens_tastatur/halconf.h     | 2 +-
 keyboards/cutie_club/borsdorf/chconf.h             | 2 +-
 keyboards/cutie_club/borsdorf/mcuconf.h            | 2 +-
 keyboards/dekunukem/duckypad/chconf.h              | 2 +-
 keyboards/dekunukem/duckypad/halconf.h             | 2 +-
 keyboards/dekunukem/duckypad/mcuconf.h             | 2 +-
 keyboards/ergodox_infinity/chconf.h                | 2 +-
 keyboards/ergodox_infinity/halconf.h               | 2 +-
 keyboards/ergodox_stm32/chconf.h                   | 2 +-
 keyboards/ergodox_stm32/halconf.h                  | 2 +-
 keyboards/evolv/chconf.h                           | 2 +-
 keyboards/evolv/halconf.h                          | 2 +-
 keyboards/evolv/mcuconf.h                          | 2 +-
 keyboards/function96/chconf.h                      | 2 +-
 keyboards/function96/halconf.h                     | 2 +-
 keyboards/function96/mcuconf.h                     | 2 +-
 keyboards/geekboards/macropad_v2/chconf.h          | 2 +-
 keyboards/geekboards/macropad_v2/halconf.h         | 2 +-
 keyboards/geekboards/macropad_v2/mcuconf.h         | 2 +-
 keyboards/generic_panda/panda65_01/chconf.h        | 2 +-
 keyboards/generic_panda/panda65_01/halconf.h       | 2 +-
 keyboards/generic_panda/panda65_01/mcuconf.h       | 2 +-
 keyboards/hadron/ver3/chconf.h                     | 2 +-
 keyboards/hadron/ver3/halconf.h                    | 2 +-
 keyboards/hadron/ver3/mcuconf.h                    | 2 +-
 keyboards/handwired/ck4x4/chconf.h                 | 2 +-
 keyboards/handwired/co60/rev6/halconf.h            | 2 +-
 keyboards/handwired/co60/rev6/mcuconf.h            | 2 +-
 keyboards/handwired/co60/rev7/halconf.h            | 2 +-
 keyboards/handwired/co60/rev7/mcuconf.h            | 2 +-
 keyboards/handwired/onekey/blackpill_f401/chconf.h | 2 +-
 keyboards/handwired/onekey/blackpill_f411/chconf.h | 2 +-
 keyboards/handwired/onekey/bluepill/chconf.h       | 2 +-
 keyboards/handwired/onekey/bluepill/halconf.h      | 2 +-
 keyboards/handwired/onekey/bluepill/mcuconf.h      | 2 +-
 keyboards/handwired/onekey/stm32f0_disco/chconf.h  | 2 +-
 keyboards/handwired/onekey/stm32f0_disco/halconf.h | 2 +-
 keyboards/handwired/onekey/stm32f0_disco/mcuconf.h | 2 +-
 keyboards/handwired/onekey/teensy_32/chconf.h      | 2 +-
 keyboards/handwired/onekey/teensy_32/halconf.h     | 2 +-
 keyboards/handwired/onekey/teensy_lc/chconf.h      | 2 +-
 keyboards/handwired/onekey/teensy_lc/halconf.h     | 2 +-
 keyboards/handwired/pill60/blackpill_f401/chconf.h | 2 +-
 keyboards/handwired/pill60/blackpill_f411/chconf.h | 2 +-
 keyboards/handwired/pill60/bluepill/chconf.h       | 2 +-
 keyboards/handwired/pill60/bluepill/halconf.h      | 2 +-
 keyboards/handwired/pill60/bluepill/mcuconf.h      | 2 +-
 keyboards/handwired/riblee_f401/chconf.h           | 2 +-
 keyboards/handwired/riblee_f401/halconf.h          | 2 +-
 keyboards/handwired/riblee_f411/chconf.h           | 2 +-
 keyboards/handwired/sono1/chconf.h                 | 2 +-
 keyboards/handwired/sono1/halconf.h                | 2 +-
 keyboards/handwired/sono1/mcuconf.h                | 2 +-
 keyboards/handwired/steamvan/rev1/halconf.h        | 2 +-
 keyboards/handwired/steamvan/rev1/mcuconf.h        | 2 +-
 keyboards/handwired/t111/chconf.h                  | 2 +-
 keyboards/handwired/t111/halconf.h                 | 2 +-
 keyboards/handwired/t111/mcuconf.h                 | 2 +-
 keyboards/handwired/twadlee/tp69/chconf.h          | 2 +-
 keyboards/handwired/z150/chconf.h                  | 2 +-
 keyboards/handwired/z150/halconf.h                 | 2 +-
 keyboards/handwired/z150/mcuconf.h                 | 2 +-
 keyboards/hs60/v2/halconf.h                        | 2 +-
 keyboards/hs60/v2/mcuconf.h                        | 2 +-
 keyboards/hub20/chconf.h                           | 2 +-
 keyboards/hub20/halconf.h                          | 2 +-
 keyboards/hub20/mcuconf.h                          | 2 +-
 keyboards/infinity60/chconf.h                      | 2 +-
 keyboards/infinity60/halconf.h                     | 2 +-
 keyboards/iron180/chconf.h                         | 2 +-
 keyboards/iron180/halconf.h                        | 2 +-
 keyboards/iron180/mcuconf.h                        | 2 +-
 keyboards/jm60/chconf.h                            | 2 +-
 keyboards/k_type/chconf.h                          | 2 +-
 keyboards/k_type/halconf.h                         | 2 +-
 keyboards/keebio/bdn9/rev2/chconf.h                | 2 +-
 keyboards/keebio/bdn9/rev2/halconf.h               | 2 +-
 keyboards/keebio/bdn9/rev2/mcuconf.h               | 2 +-
 keyboards/keebio/choconum/chconf.h                 | 2 +-
 keyboards/keebio/choconum/halconf.h                | 2 +-
 keyboards/keebio/choconum/mcuconf.h                | 2 +-
 keyboards/keebwerk/mega/halconf.h                  | 2 +-
 keyboards/keebwerk/mega/mcuconf.h                  | 2 +-
 keyboards/matrix/m20add/chconf.h                   | 2 +-
 keyboards/matrix/m20add/halconf.h                  | 2 +-
 keyboards/matrix/noah/chconf.h                     | 2 +-
 keyboards/matrix/noah/halconf.h                    | 2 +-
 keyboards/misterknife/knife66/chconf.h             | 2 +-
 keyboards/misterknife/knife66/halconf.h            | 2 +-
 keyboards/misterknife/knife66/mcuconf.h            | 2 +-
 keyboards/misterknife/knife66_iso/chconf.h         | 2 +-
 keyboards/misterknife/knife66_iso/halconf.h        | 2 +-
 keyboards/misterknife/knife66_iso/mcuconf.h        | 2 +-
 keyboards/mode/eighty/chconf.h                     | 2 +-
 keyboards/mode/eighty/halconf.h                    | 2 +-
 keyboards/mode/eighty/mcuconf.h                    | 2 +-
 keyboards/nack/mcuconf.h                           | 2 +-
 keyboards/nebula12/chconf.h                        | 2 +-
 keyboards/nebula12/halconf.h                       | 2 +-
 keyboards/nebula12/mcuconf.h                       | 2 +-
 keyboards/nebula68/halconf.h                       | 2 +-
 keyboards/nebula68/mcuconf.h                       | 2 +-
 keyboards/nemui/chconf.h                           | 2 +-
 keyboards/nemui/halconf.h                          | 2 +-
 keyboards/nemui/mcuconf.h                          | 2 +-
 keyboards/nibiria/stream15/chconf.h                | 2 +-
 keyboards/nibiria/stream15/halconf.h               | 2 +-
 keyboards/nibiria/stream15/mcuconf.h               | 2 +-
 keyboards/nk65/halconf.h                           | 2 +-
 keyboards/nk65/mcuconf.h                           | 2 +-
 keyboards/nk87/halconf.h                           | 2 +-
 keyboards/nk87/mcuconf.h                           | 2 +-
 keyboards/peiorisboards/ixora/chconf.h             | 2 +-
 keyboards/peiorisboards/ixora/halconf.h            | 2 +-
 keyboards/phoenix/chconf.h                         | 2 +-
 keyboards/phoenix/halconf.h                        | 2 +-
 keyboards/phoenix/mcuconf.h                        | 2 +-
 keyboards/polilla/chconf.h                         | 2 +-
 keyboards/polilla/halconf.h                        | 2 +-
 keyboards/polilla/mcuconf.h                        | 2 +-
 keyboards/primekb/meridian/chconf.h                | 2 +-
 keyboards/primekb/meridian/halconf.h               | 2 +-
 keyboards/primekb/meridian/mcuconf.h               | 2 +-
 keyboards/projectkb/alice/chconf.h                 | 2 +-
 keyboards/projectkb/alice/halconf.h                | 2 +-
 keyboards/projectkb/alice/mcuconf.h                | 2 +-
 keyboards/projectkb/signature87/chconf.h           | 2 +-
 keyboards/projectkb/signature87/halconf.h          | 2 +-
 keyboards/projectkb/signature87/mcuconf.h          | 2 +-
 keyboards/ramonimbao/squishy65/chconf.h            | 2 +-
 keyboards/ramonimbao/squishy65/halconf.h           | 2 +-
 keyboards/ramonimbao/squishy65/mcuconf.h           | 2 +-
 keyboards/ramonimbao/wete/chconf.h                 | 2 +-
 keyboards/ramonimbao/wete/halconf.h                | 2 +-
 keyboards/ramonimbao/wete/mcuconf.h                | 2 +-
 keyboards/rart/rartlice/chconf.h                   | 2 +-
 keyboards/rart/rartlice/halconf.h                  | 2 +-
 keyboards/rart/rartlice/mcuconf.h                  | 2 +-
 keyboards/retro_75/chconf.h                        | 2 +-
 keyboards/rocketboard_16/chconf.h                  | 2 +-
 keyboards/rocketboard_16/halconf.h                 | 2 +-
 keyboards/rocketboard_16/mcuconf.h                 | 2 +-
 keyboards/satt/vision/chconf.h                     | 2 +-
 keyboards/satt/vision/mcuconf.h                    | 2 +-
 keyboards/technika/chconf.h                        | 2 +-
 keyboards/technika/halconf.h                       | 2 +-
 keyboards/technika/mcuconf.h                       | 2 +-
 keyboards/tkc/candybar/chconf.h                    | 2 +-
 keyboards/tkc/godspeed75/chconf.h                  | 2 +-
 keyboards/tkw/stoutgat/v2/f411/chconf.h            | 2 +-
 keyboards/tkw/stoutgat/v2/f411/halconf.h           | 2 +-
 keyboards/tkw/stoutgat/v2/f411/mcuconf.h           | 2 +-
 keyboards/viktus/styrka/chconf.h                   | 2 +-
 keyboards/vinta/chconf.h                           | 2 +-
 keyboards/vinta/halconf.h                          | 2 +-
 keyboards/westfoxtrot/prophet/chconf.h             | 2 +-
 keyboards/westfoxtrot/prophet/mcuconf.h            | 2 +-
 keyboards/whitefox/chconf.h                        | 2 +-
 keyboards/whitefox/halconf.h                       | 2 +-
 keyboards/wolfmarkclub/wm1/chconf.h                | 2 +-
 keyboards/wolfmarkclub/wm1/halconf.h               | 2 +-
 keyboards/wolfmarkclub/wm1/mcuconf.h               | 2 +-
 keyboards/xelus/kangaroo/chconf.h                  | 2 +-
 keyboards/xelus/kangaroo/halconf.h                 | 2 +-
 keyboards/xelus/kangaroo/mcuconf.h                 | 2 +-
 keyboards/xelus/trinityxttkl/chconf.h              | 2 +-
 keyboards/xelus/trinityxttkl/mcuconf.h             | 2 +-
 keyboards/xelus/valor_frl_tkl/chconf.h             | 2 +-
 keyboards/xelus/valor_frl_tkl/halconf.h            | 2 +-
 keyboards/xelus/valor_frl_tkl/mcuconf.h            | 2 +-
 keyboards/xiaomi/mk02/chconf.h                     | 2 +-
 keyboards/xiaomi/mk02/halconf.h                    | 2 +-
 keyboards/zoo/wampus/chconf.h                      | 2 +-
 keyboards/zoo/wampus/halconf.h                     | 2 +-
 keyboards/zoo/wampus/mcuconf.h                     | 2 +-
 keyboards/zvecr/split_blackpill/chconf.h           | 2 +-
 keyboards/zvecr/split_blackpill/halconf.h          | 2 +-
 keyboards/zvecr/split_blackpill/mcuconf.h          | 2 +-
 keyboards/zvecr/zv48/f401/halconf.h                | 2 +-
 keyboards/zvecr/zv48/f401/mcuconf.h                | 2 +-
 keyboards/zvecr/zv48/f411/halconf.h                | 2 +-
 keyboards/zvecr/zv48/f411/mcuconf.h                | 2 +-
 lib/python/qmk/cli/chibios/confmigrate.py          | 2 +-
 289 files changed, 289 insertions(+), 289 deletions(-)

(limited to 'lib/python/qmk/cli')

diff --git a/keyboards/acheron/arctic/chconf.h b/keyboards/acheron/arctic/chconf.h
index 78810ead1..1be94008b 100644
--- a/keyboards/acheron/arctic/chconf.h
+++ b/keyboards/acheron/arctic/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/acheron/arctic/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/acheron/arctic/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/acheron/arctic/mcuconf.h b/keyboards/acheron/arctic/mcuconf.h
index 7f441ae16..39dad9031 100644
--- a/keyboards/acheron/arctic/mcuconf.h
+++ b/keyboards/acheron/arctic/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/acheron/arctic/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/acheron/arctic/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/acheron/austin/chconf.h b/keyboards/acheron/austin/chconf.h
index c13262246..08567482d 100644
--- a/keyboards/acheron/austin/chconf.h
+++ b/keyboards/acheron/austin/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/acheron/austin/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/acheron/austin/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/acheron/austin/halconf.h b/keyboards/acheron/austin/halconf.h
index 517dd459f..b707b8b93 100644
--- a/keyboards/acheron/austin/halconf.h
+++ b/keyboards/acheron/austin/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/acheron/austin/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/acheron/austin/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/acheron/austin/mcuconf.h b/keyboards/acheron/austin/mcuconf.h
index 8e51e61bb..84cd43b5d 100644
--- a/keyboards/acheron/austin/mcuconf.h
+++ b/keyboards/acheron/austin/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/acheron/austin/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/acheron/austin/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/acheron/keebspcb/chconf.h b/keyboards/acheron/keebspcb/chconf.h
index 3c7eeaac6..c34640ac0 100644
--- a/keyboards/acheron/keebspcb/chconf.h
+++ b/keyboards/acheron/keebspcb/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/acheron/keebspcb/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/acheron/keebspcb/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/acheron/keebspcb/mcuconf.h b/keyboards/acheron/keebspcb/mcuconf.h
index dd29ee9b5..74158c86a 100644
--- a/keyboards/acheron/keebspcb/mcuconf.h
+++ b/keyboards/acheron/keebspcb/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/acheron/keebspcb/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/acheron/keebspcb/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/acheron/lasgweloth/chconf.h b/keyboards/acheron/lasgweloth/chconf.h
index 8a2611726..a972edf03 100644
--- a/keyboards/acheron/lasgweloth/chconf.h
+++ b/keyboards/acheron/lasgweloth/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/acheron/lasgweloth/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/acheron/lasgweloth/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/acheron/lasgweloth/mcuconf.h b/keyboards/acheron/lasgweloth/mcuconf.h
index f42257818..6e9b3577e 100644
--- a/keyboards/acheron/lasgweloth/mcuconf.h
+++ b/keyboards/acheron/lasgweloth/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/acheron/lasgweloth/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/acheron/lasgweloth/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/aeboards/ext65/rev2/chconf.h b/keyboards/aeboards/ext65/rev2/chconf.h
index 4d6cc3f56..472690105 100644
--- a/keyboards/aeboards/ext65/rev2/chconf.h
+++ b/keyboards/aeboards/ext65/rev2/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/aeboards/ext65/rev2/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/aeboards/ext65/rev2/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/aeboards/ext65/rev2/halconf.h b/keyboards/aeboards/ext65/rev2/halconf.h
index f6f2e70ab..6e2f53640 100644
--- a/keyboards/aeboards/ext65/rev2/halconf.h
+++ b/keyboards/aeboards/ext65/rev2/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/aeboards/ext65/rev2/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/aeboards/ext65/rev2/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/aeboards/ext65/rev2/mcuconf.h b/keyboards/aeboards/ext65/rev2/mcuconf.h
index dda2bda08..26ce80615 100644
--- a/keyboards/aeboards/ext65/rev2/mcuconf.h
+++ b/keyboards/aeboards/ext65/rev2/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/aeboards/ext65/rev2/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/aeboards/ext65/rev2/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/ai03/vega/chconf.h b/keyboards/ai03/vega/chconf.h
index 34669b16f..2e0092e3e 100644
--- a/keyboards/ai03/vega/chconf.h
+++ b/keyboards/ai03/vega/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/ai03/vega/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/ai03/vega/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/akegata_denki/device_one/chconf.h b/keyboards/akegata_denki/device_one/chconf.h
index 23eb194e3..d96371e05 100644
--- a/keyboards/akegata_denki/device_one/chconf.h
+++ b/keyboards/akegata_denki/device_one/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/akegata_denki/device_one/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/akegata_denki/device_one/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/akegata_denki/device_one/halconf.h b/keyboards/akegata_denki/device_one/halconf.h
index af54607a9..4ca5049db 100644
--- a/keyboards/akegata_denki/device_one/halconf.h
+++ b/keyboards/akegata_denki/device_one/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/akegata_denki/device_one/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/akegata_denki/device_one/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/alpine65/chconf.h b/keyboards/alpine65/chconf.h
index f17a54bb9..c3579d10a 100644
--- a/keyboards/alpine65/chconf.h
+++ b/keyboards/alpine65/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/alpine65/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/alpine65/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/alpine65/halconf.h b/keyboards/alpine65/halconf.h
index 96c8fe203..6e0b9c5de 100644
--- a/keyboards/alpine65/halconf.h
+++ b/keyboards/alpine65/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/alpine65/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/alpine65/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/alpine65/mcuconf.h b/keyboards/alpine65/mcuconf.h
index 17f09b350..353d7e180 100644
--- a/keyboards/alpine65/mcuconf.h
+++ b/keyboards/alpine65/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/alpine65/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/alpine65/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/at_at/660m/chconf.h b/keyboards/at_at/660m/chconf.h
index dbb520560..672c3e44c 100644
--- a/keyboards/at_at/660m/chconf.h
+++ b/keyboards/at_at/660m/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/at_at/660m/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/at_at/660m/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/at_at/660m/halconf.h b/keyboards/at_at/660m/halconf.h
index ab884e44d..403658041 100644
--- a/keyboards/at_at/660m/halconf.h
+++ b/keyboards/at_at/660m/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/at_at/660m/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/at_at/660m/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/at_at/660m/mcuconf.h b/keyboards/at_at/660m/mcuconf.h
index 2f81c14bd..27270f334 100644
--- a/keyboards/at_at/660m/mcuconf.h
+++ b/keyboards/at_at/660m/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/at_at/660m/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/at_at/660m/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/box75/chconf.h b/keyboards/box75/chconf.h
index 763024f90..ca99ad8cc 100644
--- a/keyboards/box75/chconf.h
+++ b/keyboards/box75/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/box75/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/box75/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/box75/mcuconf.h b/keyboards/box75/mcuconf.h
index 9c319a3c7..7c48b087f 100644
--- a/keyboards/box75/mcuconf.h
+++ b/keyboards/box75/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/box75/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/box75/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/bt66tech/bt66tech60/chconf.h b/keyboards/bt66tech/bt66tech60/chconf.h
index 0a0e97dba..b0d978988 100644
--- a/keyboards/bt66tech/bt66tech60/chconf.h
+++ b/keyboards/bt66tech/bt66tech60/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/bt66tech/bt66tech60/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/bt66tech/bt66tech60/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/bt66tech/bt66tech60/halconf.h b/keyboards/bt66tech/bt66tech60/halconf.h
index c19f57b9b..3e527761c 100644
--- a/keyboards/bt66tech/bt66tech60/halconf.h
+++ b/keyboards/bt66tech/bt66tech60/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/bt66tech/bt66tech60/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/bt66tech/bt66tech60/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/bt66tech/bt66tech60/mcuconf.h b/keyboards/bt66tech/bt66tech60/mcuconf.h
index b5699553f..83c9df777 100644
--- a/keyboards/bt66tech/bt66tech60/mcuconf.h
+++ b/keyboards/bt66tech/bt66tech60/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/bt66tech/bt66tech60/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/bt66tech/bt66tech60/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/an_c/chconf.h b/keyboards/cannonkeys/an_c/chconf.h
index a928b5b79..81ebe98fc 100644
--- a/keyboards/cannonkeys/an_c/chconf.h
+++ b/keyboards/cannonkeys/an_c/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/an_c/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/an_c/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/an_c/halconf.h b/keyboards/cannonkeys/an_c/halconf.h
index c4b2eb4d6..fddb45ce7 100644
--- a/keyboards/cannonkeys/an_c/halconf.h
+++ b/keyboards/cannonkeys/an_c/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/an_c/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/an_c/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/an_c/mcuconf.h b/keyboards/cannonkeys/an_c/mcuconf.h
index 9fade6496..11a0d9317 100644
--- a/keyboards/cannonkeys/an_c/mcuconf.h
+++ b/keyboards/cannonkeys/an_c/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/an_c/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/an_c/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/atlas/chconf.h b/keyboards/cannonkeys/atlas/chconf.h
index 2eafdda97..e4692d9df 100644
--- a/keyboards/cannonkeys/atlas/chconf.h
+++ b/keyboards/cannonkeys/atlas/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/atlas/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/atlas/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/atlas/halconf.h b/keyboards/cannonkeys/atlas/halconf.h
index 4885913a8..fea430acb 100644
--- a/keyboards/cannonkeys/atlas/halconf.h
+++ b/keyboards/cannonkeys/atlas/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/atlas/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/atlas/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/atlas/mcuconf.h b/keyboards/cannonkeys/atlas/mcuconf.h
index a3a3972ba..075de7841 100644
--- a/keyboards/cannonkeys/atlas/mcuconf.h
+++ b/keyboards/cannonkeys/atlas/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/atlas/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/atlas/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/chimera65/chconf.h b/keyboards/cannonkeys/chimera65/chconf.h
index 4c0f3da3f..de89ae272 100644
--- a/keyboards/cannonkeys/chimera65/chconf.h
+++ b/keyboards/cannonkeys/chimera65/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/chimera65/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/chimera65/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/chimera65/halconf.h b/keyboards/cannonkeys/chimera65/halconf.h
index 149ff63ad..f4105c3f8 100644
--- a/keyboards/cannonkeys/chimera65/halconf.h
+++ b/keyboards/cannonkeys/chimera65/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/chimera65/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/chimera65/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/chimera65/mcuconf.h b/keyboards/cannonkeys/chimera65/mcuconf.h
index 85928a898..eaf4ee5f7 100644
--- a/keyboards/cannonkeys/chimera65/mcuconf.h
+++ b/keyboards/cannonkeys/chimera65/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/chimera65/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/chimera65/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/db60/chconf.h b/keyboards/cannonkeys/db60/chconf.h
index 05641eee5..0df06ecc1 100644
--- a/keyboards/cannonkeys/db60/chconf.h
+++ b/keyboards/cannonkeys/db60/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/db60/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/db60/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/db60/halconf.h b/keyboards/cannonkeys/db60/halconf.h
index 044cd6dae..de8d8035d 100644
--- a/keyboards/cannonkeys/db60/halconf.h
+++ b/keyboards/cannonkeys/db60/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/db60/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/db60/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/db60/mcuconf.h b/keyboards/cannonkeys/db60/mcuconf.h
index 193229766..f2212bd2c 100644
--- a/keyboards/cannonkeys/db60/mcuconf.h
+++ b/keyboards/cannonkeys/db60/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/db60/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/db60/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/devastatingtkl/chconf.h b/keyboards/cannonkeys/devastatingtkl/chconf.h
index 6366e1108..cc63adc45 100644
--- a/keyboards/cannonkeys/devastatingtkl/chconf.h
+++ b/keyboards/cannonkeys/devastatingtkl/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/devastatingtkl/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/devastatingtkl/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/devastatingtkl/halconf.h b/keyboards/cannonkeys/devastatingtkl/halconf.h
index 296dbe55f..4b54302b9 100644
--- a/keyboards/cannonkeys/devastatingtkl/halconf.h
+++ b/keyboards/cannonkeys/devastatingtkl/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/devastatingtkl/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/devastatingtkl/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/devastatingtkl/mcuconf.h b/keyboards/cannonkeys/devastatingtkl/mcuconf.h
index eabe82b77..056bf7f58 100644
--- a/keyboards/cannonkeys/devastatingtkl/mcuconf.h
+++ b/keyboards/cannonkeys/devastatingtkl/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/devastatingtkl/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/devastatingtkl/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/instant60/chconf.h b/keyboards/cannonkeys/instant60/chconf.h
index 3bd24c20b..8c40cd808 100644
--- a/keyboards/cannonkeys/instant60/chconf.h
+++ b/keyboards/cannonkeys/instant60/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/instant60/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/instant60/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/instant60/halconf.h b/keyboards/cannonkeys/instant60/halconf.h
index 56635c44f..0d92a9f42 100644
--- a/keyboards/cannonkeys/instant60/halconf.h
+++ b/keyboards/cannonkeys/instant60/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/instant60/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/instant60/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/instant60/mcuconf.h b/keyboards/cannonkeys/instant60/mcuconf.h
index 5d9d4bcc0..94454d33e 100644
--- a/keyboards/cannonkeys/instant60/mcuconf.h
+++ b/keyboards/cannonkeys/instant60/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/instant60/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/instant60/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/instant65/chconf.h b/keyboards/cannonkeys/instant65/chconf.h
index b26cf9a26..c82db1041 100644
--- a/keyboards/cannonkeys/instant65/chconf.h
+++ b/keyboards/cannonkeys/instant65/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/instant65/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/instant65/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/instant65/halconf.h b/keyboards/cannonkeys/instant65/halconf.h
index 89c174e6c..5747024fc 100644
--- a/keyboards/cannonkeys/instant65/halconf.h
+++ b/keyboards/cannonkeys/instant65/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/instant65/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/instant65/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/instant65/mcuconf.h b/keyboards/cannonkeys/instant65/mcuconf.h
index 649f9c97d..eb2f784e6 100644
--- a/keyboards/cannonkeys/instant65/mcuconf.h
+++ b/keyboards/cannonkeys/instant65/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/instant65/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/instant65/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/iron165/chconf.h b/keyboards/cannonkeys/iron165/chconf.h
index c78b608f1..69a54bbbb 100644
--- a/keyboards/cannonkeys/iron165/chconf.h
+++ b/keyboards/cannonkeys/iron165/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/iron165/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/iron165/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/iron165/halconf.h b/keyboards/cannonkeys/iron165/halconf.h
index c79413423..88a995edd 100644
--- a/keyboards/cannonkeys/iron165/halconf.h
+++ b/keyboards/cannonkeys/iron165/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/iron165/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/iron165/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/iron165/mcuconf.h b/keyboards/cannonkeys/iron165/mcuconf.h
index 816636b75..105f34b49 100644
--- a/keyboards/cannonkeys/iron165/mcuconf.h
+++ b/keyboards/cannonkeys/iron165/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/iron165/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/iron165/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/obliterated75/chconf.h b/keyboards/cannonkeys/obliterated75/chconf.h
index bff56e52d..62dc90732 100644
--- a/keyboards/cannonkeys/obliterated75/chconf.h
+++ b/keyboards/cannonkeys/obliterated75/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/obliterated75/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/obliterated75/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/obliterated75/halconf.h b/keyboards/cannonkeys/obliterated75/halconf.h
index 37f33e7d6..2d2b93c65 100644
--- a/keyboards/cannonkeys/obliterated75/halconf.h
+++ b/keyboards/cannonkeys/obliterated75/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/obliterated75/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/obliterated75/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/obliterated75/mcuconf.h b/keyboards/cannonkeys/obliterated75/mcuconf.h
index 2f0e615ff..c312b1094 100644
--- a/keyboards/cannonkeys/obliterated75/mcuconf.h
+++ b/keyboards/cannonkeys/obliterated75/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/obliterated75/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/obliterated75/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/onyx/chconf.h b/keyboards/cannonkeys/onyx/chconf.h
index 40acee698..61e5dcb6a 100644
--- a/keyboards/cannonkeys/onyx/chconf.h
+++ b/keyboards/cannonkeys/onyx/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/onyx/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/onyx/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/onyx/halconf.h b/keyboards/cannonkeys/onyx/halconf.h
index be72dfa4c..667a2673a 100644
--- a/keyboards/cannonkeys/onyx/halconf.h
+++ b/keyboards/cannonkeys/onyx/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/onyx/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/onyx/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/onyx/mcuconf.h b/keyboards/cannonkeys/onyx/mcuconf.h
index 11a084f47..96e61127e 100644
--- a/keyboards/cannonkeys/onyx/mcuconf.h
+++ b/keyboards/cannonkeys/onyx/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/onyx/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/onyx/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/ortho48/chconf.h b/keyboards/cannonkeys/ortho48/chconf.h
index 8dbde4e5a..a6d89716c 100644
--- a/keyboards/cannonkeys/ortho48/chconf.h
+++ b/keyboards/cannonkeys/ortho48/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/ortho48/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/ortho48/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/ortho48/halconf.h b/keyboards/cannonkeys/ortho48/halconf.h
index 7c235fe58..2d7c06bcb 100644
--- a/keyboards/cannonkeys/ortho48/halconf.h
+++ b/keyboards/cannonkeys/ortho48/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/ortho48/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/ortho48/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/ortho48/mcuconf.h b/keyboards/cannonkeys/ortho48/mcuconf.h
index 8239c670e..0de271b80 100644
--- a/keyboards/cannonkeys/ortho48/mcuconf.h
+++ b/keyboards/cannonkeys/ortho48/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/ortho48/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/ortho48/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/ortho60/chconf.h b/keyboards/cannonkeys/ortho60/chconf.h
index 88e20f62e..c9bc54b43 100644
--- a/keyboards/cannonkeys/ortho60/chconf.h
+++ b/keyboards/cannonkeys/ortho60/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/ortho60/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/ortho60/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/ortho60/halconf.h b/keyboards/cannonkeys/ortho60/halconf.h
index f72a39643..4a56d1da2 100644
--- a/keyboards/cannonkeys/ortho60/halconf.h
+++ b/keyboards/cannonkeys/ortho60/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/ortho60/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/ortho60/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/ortho60/mcuconf.h b/keyboards/cannonkeys/ortho60/mcuconf.h
index 8597641da..6c0b381e4 100644
--- a/keyboards/cannonkeys/ortho60/mcuconf.h
+++ b/keyboards/cannonkeys/ortho60/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/ortho60/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/ortho60/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/ortho75/chconf.h b/keyboards/cannonkeys/ortho75/chconf.h
index 60ff8ca92..512dd7e5f 100644
--- a/keyboards/cannonkeys/ortho75/chconf.h
+++ b/keyboards/cannonkeys/ortho75/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/ortho75/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/ortho75/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/ortho75/halconf.h b/keyboards/cannonkeys/ortho75/halconf.h
index bc62a5a3d..5add3eeaf 100644
--- a/keyboards/cannonkeys/ortho75/halconf.h
+++ b/keyboards/cannonkeys/ortho75/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/ortho75/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/ortho75/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/ortho75/mcuconf.h b/keyboards/cannonkeys/ortho75/mcuconf.h
index f67482527..a6b9256b5 100644
--- a/keyboards/cannonkeys/ortho75/mcuconf.h
+++ b/keyboards/cannonkeys/ortho75/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/ortho75/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/ortho75/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/practice60/chconf.h b/keyboards/cannonkeys/practice60/chconf.h
index f52b4a8ae..4263e4a41 100644
--- a/keyboards/cannonkeys/practice60/chconf.h
+++ b/keyboards/cannonkeys/practice60/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/practice60/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/practice60/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/practice60/halconf.h b/keyboards/cannonkeys/practice60/halconf.h
index 09ae00a54..893d07cb2 100644
--- a/keyboards/cannonkeys/practice60/halconf.h
+++ b/keyboards/cannonkeys/practice60/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/practice60/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/practice60/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/practice60/mcuconf.h b/keyboards/cannonkeys/practice60/mcuconf.h
index bd7b8a359..60c58da47 100644
--- a/keyboards/cannonkeys/practice60/mcuconf.h
+++ b/keyboards/cannonkeys/practice60/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/practice60/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/practice60/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/practice65/chconf.h b/keyboards/cannonkeys/practice65/chconf.h
index 220ad6436..ecf0d0461 100644
--- a/keyboards/cannonkeys/practice65/chconf.h
+++ b/keyboards/cannonkeys/practice65/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/practice65/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/practice65/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/practice65/halconf.h b/keyboards/cannonkeys/practice65/halconf.h
index 27b46b0f9..88ee145cc 100644
--- a/keyboards/cannonkeys/practice65/halconf.h
+++ b/keyboards/cannonkeys/practice65/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/practice65/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/practice65/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/practice65/mcuconf.h b/keyboards/cannonkeys/practice65/mcuconf.h
index e405bd5a1..94266adb5 100644
--- a/keyboards/cannonkeys/practice65/mcuconf.h
+++ b/keyboards/cannonkeys/practice65/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/practice65/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/practice65/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/rekt1800/chconf.h b/keyboards/cannonkeys/rekt1800/chconf.h
index 3b03625ff..63148d5ce 100644
--- a/keyboards/cannonkeys/rekt1800/chconf.h
+++ b/keyboards/cannonkeys/rekt1800/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/rekt1800/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/rekt1800/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/rekt1800/halconf.h b/keyboards/cannonkeys/rekt1800/halconf.h
index c065e8fae..157fd2105 100644
--- a/keyboards/cannonkeys/rekt1800/halconf.h
+++ b/keyboards/cannonkeys/rekt1800/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/rekt1800/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/rekt1800/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/rekt1800/mcuconf.h b/keyboards/cannonkeys/rekt1800/mcuconf.h
index d19075da3..dcae168ac 100644
--- a/keyboards/cannonkeys/rekt1800/mcuconf.h
+++ b/keyboards/cannonkeys/rekt1800/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/rekt1800/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/rekt1800/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/sagittarius/chconf.h b/keyboards/cannonkeys/sagittarius/chconf.h
index 46eb3c927..de42fc7db 100644
--- a/keyboards/cannonkeys/sagittarius/chconf.h
+++ b/keyboards/cannonkeys/sagittarius/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/sagittarius/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/sagittarius/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/sagittarius/halconf.h b/keyboards/cannonkeys/sagittarius/halconf.h
index e993b78a3..decab8a22 100644
--- a/keyboards/cannonkeys/sagittarius/halconf.h
+++ b/keyboards/cannonkeys/sagittarius/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/sagittarius/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/sagittarius/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/sagittarius/mcuconf.h b/keyboards/cannonkeys/sagittarius/mcuconf.h
index e4b9e3df3..c5e5d280c 100644
--- a/keyboards/cannonkeys/sagittarius/mcuconf.h
+++ b/keyboards/cannonkeys/sagittarius/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/sagittarius/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/sagittarius/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/satisfaction75/chconf.h b/keyboards/cannonkeys/satisfaction75/chconf.h
index 8bd371f86..fffb7a905 100644
--- a/keyboards/cannonkeys/satisfaction75/chconf.h
+++ b/keyboards/cannonkeys/satisfaction75/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/satisfaction75/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/satisfaction75/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/satisfaction75/halconf.h b/keyboards/cannonkeys/satisfaction75/halconf.h
index 9ff2015c5..aed3fef0a 100644
--- a/keyboards/cannonkeys/satisfaction75/halconf.h
+++ b/keyboards/cannonkeys/satisfaction75/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/satisfaction75/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/satisfaction75/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/satisfaction75/mcuconf.h b/keyboards/cannonkeys/satisfaction75/mcuconf.h
index 9848bbd87..0c84a1e1a 100644
--- a/keyboards/cannonkeys/satisfaction75/mcuconf.h
+++ b/keyboards/cannonkeys/satisfaction75/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/satisfaction75/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/satisfaction75/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/savage65/chconf.h b/keyboards/cannonkeys/savage65/chconf.h
index aef07cbc6..8329725a7 100644
--- a/keyboards/cannonkeys/savage65/chconf.h
+++ b/keyboards/cannonkeys/savage65/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/savage65/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/savage65/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/savage65/halconf.h b/keyboards/cannonkeys/savage65/halconf.h
index 8bcdfe258..67a3b4c5a 100644
--- a/keyboards/cannonkeys/savage65/halconf.h
+++ b/keyboards/cannonkeys/savage65/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/savage65/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/savage65/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/savage65/mcuconf.h b/keyboards/cannonkeys/savage65/mcuconf.h
index c23f7e22d..07641fe53 100644
--- a/keyboards/cannonkeys/savage65/mcuconf.h
+++ b/keyboards/cannonkeys/savage65/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/savage65/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/savage65/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/tmov2/chconf.h b/keyboards/cannonkeys/tmov2/chconf.h
index ae7c2f3a6..4830d0b27 100644
--- a/keyboards/cannonkeys/tmov2/chconf.h
+++ b/keyboards/cannonkeys/tmov2/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/tmov2/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/tmov2/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/tmov2/halconf.h b/keyboards/cannonkeys/tmov2/halconf.h
index 8aec08db0..224f68dd0 100644
--- a/keyboards/cannonkeys/tmov2/halconf.h
+++ b/keyboards/cannonkeys/tmov2/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/tmov2/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/tmov2/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/tmov2/mcuconf.h b/keyboards/cannonkeys/tmov2/mcuconf.h
index 970ed5ba5..1bfa99b25 100644
--- a/keyboards/cannonkeys/tmov2/mcuconf.h
+++ b/keyboards/cannonkeys/tmov2/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/tmov2/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/tmov2/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/tsukuyomi/chconf.h b/keyboards/cannonkeys/tsukuyomi/chconf.h
index 497df2390..e6cdb8763 100644
--- a/keyboards/cannonkeys/tsukuyomi/chconf.h
+++ b/keyboards/cannonkeys/tsukuyomi/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/tsukuyomi/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/tsukuyomi/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/tsukuyomi/halconf.h b/keyboards/cannonkeys/tsukuyomi/halconf.h
index b030c0c2c..ce7635068 100644
--- a/keyboards/cannonkeys/tsukuyomi/halconf.h
+++ b/keyboards/cannonkeys/tsukuyomi/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/tsukuyomi/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/tsukuyomi/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cannonkeys/tsukuyomi/mcuconf.h b/keyboards/cannonkeys/tsukuyomi/mcuconf.h
index ae8344c24..aeea9322e 100644
--- a/keyboards/cannonkeys/tsukuyomi/mcuconf.h
+++ b/keyboards/cannonkeys/tsukuyomi/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cannonkeys/tsukuyomi/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/tsukuyomi/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/chavdai40/chconf.h b/keyboards/chavdai40/chconf.h
index bd6fd35ed..6304d4f72 100644
--- a/keyboards/chavdai40/chconf.h
+++ b/keyboards/chavdai40/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/chavdai40/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/chavdai40/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/chavdai40/halconf.h b/keyboards/chavdai40/halconf.h
index 33dc31edf..10d42a261 100644
--- a/keyboards/chavdai40/halconf.h
+++ b/keyboards/chavdai40/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/chavdai40/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/chavdai40/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/chavdai40/mcuconf.h b/keyboards/chavdai40/mcuconf.h
index a73580e0a..edc3ce556 100644
--- a/keyboards/chavdai40/mcuconf.h
+++ b/keyboards/chavdai40/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/chavdai40/mcuconf.h -r platforms/chibios/GENERIC_STM32_F042X6/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/chavdai40/mcuconf.h -r platforms/chibios/GENERIC_STM32_F042X6/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cheshire/curiosity/chconf.h b/keyboards/cheshire/curiosity/chconf.h
index 66f906bab..2782412be 100644
--- a/keyboards/cheshire/curiosity/chconf.h
+++ b/keyboards/cheshire/curiosity/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cheshire/curiosity/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cheshire/curiosity/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/ck60i/chconf.h b/keyboards/ck60i/chconf.h
index 545a54936..45f9549e0 100644
--- a/keyboards/ck60i/chconf.h
+++ b/keyboards/ck60i/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/ck60i/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/ck60i/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/ck60i/halconf.h b/keyboards/ck60i/halconf.h
index 0756a1153..ac9018dfb 100644
--- a/keyboards/ck60i/halconf.h
+++ b/keyboards/ck60i/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/ck60i/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/ck60i/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/ck60i/mcuconf.h b/keyboards/ck60i/mcuconf.h
index f6cf5753c..22c792eae 100644
--- a/keyboards/ck60i/mcuconf.h
+++ b/keyboards/ck60i/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/ck60i/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/ck60i/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/clueboard/60/halconf.h b/keyboards/clueboard/60/halconf.h
index e296002a1..644c9c516 100644
--- a/keyboards/clueboard/60/halconf.h
+++ b/keyboards/clueboard/60/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/clueboard/60/halconf.h -r platforms/chibios/QMK_PROTON_C/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/clueboard/60/halconf.h -r platforms/chibios/QMK_PROTON_C/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/clueboard/60/mcuconf.h b/keyboards/clueboard/60/mcuconf.h
index 6d2e3e95f..a5baec5cf 100644
--- a/keyboards/clueboard/60/mcuconf.h
+++ b/keyboards/clueboard/60/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/clueboard/60/mcuconf.h -r platforms/chibios/QMK_PROTON_C/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/clueboard/60/mcuconf.h -r platforms/chibios/QMK_PROTON_C/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/clueboard/66/rev4/halconf.h b/keyboards/clueboard/66/rev4/halconf.h
index 4141d194f..5552de2a3 100644
--- a/keyboards/clueboard/66/rev4/halconf.h
+++ b/keyboards/clueboard/66/rev4/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/clueboard/66/rev4/halconf.h -r platforms/chibios/QMK_PROTON_C/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/clueboard/66/rev4/halconf.h -r platforms/chibios/QMK_PROTON_C/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/clueboard/66/rev4/mcuconf.h b/keyboards/clueboard/66/rev4/mcuconf.h
index 50deefc91..0fe613b38 100644
--- a/keyboards/clueboard/66/rev4/mcuconf.h
+++ b/keyboards/clueboard/66/rev4/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/clueboard/66/rev4/mcuconf.h -r platforms/chibios/QMK_PROTON_C/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/clueboard/66/rev4/mcuconf.h -r platforms/chibios/QMK_PROTON_C/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/clueboard/66_hotswap/gen1/halconf.h b/keyboards/clueboard/66_hotswap/gen1/halconf.h
index fc3250b42..9299e624a 100644
--- a/keyboards/clueboard/66_hotswap/gen1/halconf.h
+++ b/keyboards/clueboard/66_hotswap/gen1/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/clueboard/66_hotswap/gen1/halconf.h -r platforms/chibios/QMK_PROTON_C/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/clueboard/66_hotswap/gen1/halconf.h -r platforms/chibios/QMK_PROTON_C/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/clueboard/66_hotswap/gen1/mcuconf.h b/keyboards/clueboard/66_hotswap/gen1/mcuconf.h
index 3aef0f607..6377ded8f 100644
--- a/keyboards/clueboard/66_hotswap/gen1/mcuconf.h
+++ b/keyboards/clueboard/66_hotswap/gen1/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/clueboard/66_hotswap/gen1/mcuconf.h -r platforms/chibios/QMK_PROTON_C/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/clueboard/66_hotswap/gen1/mcuconf.h -r platforms/chibios/QMK_PROTON_C/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/coarse/cordillera/chconf.h b/keyboards/coarse/cordillera/chconf.h
index d200b6514..60aebdea1 100644
--- a/keyboards/coarse/cordillera/chconf.h
+++ b/keyboards/coarse/cordillera/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/coarse/cordillera/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/coarse/cordillera/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/coarse/cordillera/halconf.h b/keyboards/coarse/cordillera/halconf.h
index 50f8b1994..a10baad43 100644
--- a/keyboards/coarse/cordillera/halconf.h
+++ b/keyboards/coarse/cordillera/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/coarse/cordillera/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/coarse/cordillera/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/coarse/cordillera/mcuconf.h b/keyboards/coarse/cordillera/mcuconf.h
index 6fcaa5e29..767251f2f 100644
--- a/keyboards/coarse/cordillera/mcuconf.h
+++ b/keyboards/coarse/cordillera/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/coarse/cordillera/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/coarse/cordillera/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/converter/siemens_tastatur/chconf.h b/keyboards/converter/siemens_tastatur/chconf.h
index 2c12943aa..2253cfab1 100644
--- a/keyboards/converter/siemens_tastatur/chconf.h
+++ b/keyboards/converter/siemens_tastatur/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/converter/siemens_tastatur/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/converter/siemens_tastatur/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/converter/siemens_tastatur/halconf.h b/keyboards/converter/siemens_tastatur/halconf.h
index 3a778cc7c..6574014c6 100644
--- a/keyboards/converter/siemens_tastatur/halconf.h
+++ b/keyboards/converter/siemens_tastatur/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/converter/siemens_tastatur/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/converter/siemens_tastatur/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cutie_club/borsdorf/chconf.h b/keyboards/cutie_club/borsdorf/chconf.h
index 20dd02043..c5242220b 100644
--- a/keyboards/cutie_club/borsdorf/chconf.h
+++ b/keyboards/cutie_club/borsdorf/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cutie_club/borsdorf/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cutie_club/borsdorf/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/cutie_club/borsdorf/mcuconf.h b/keyboards/cutie_club/borsdorf/mcuconf.h
index 84e0e18b1..bf87df5bb 100644
--- a/keyboards/cutie_club/borsdorf/mcuconf.h
+++ b/keyboards/cutie_club/borsdorf/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/cutie_club/borsdorf/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/cutie_club/borsdorf/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/dekunukem/duckypad/chconf.h b/keyboards/dekunukem/duckypad/chconf.h
index 9b3226251..f23a91114 100644
--- a/keyboards/dekunukem/duckypad/chconf.h
+++ b/keyboards/dekunukem/duckypad/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/dekunukem/duckypad/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/dekunukem/duckypad/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/dekunukem/duckypad/halconf.h b/keyboards/dekunukem/duckypad/halconf.h
index 2934d656c..b3f9716bb 100644
--- a/keyboards/dekunukem/duckypad/halconf.h
+++ b/keyboards/dekunukem/duckypad/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/dekunukem/duckypad/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/dekunukem/duckypad/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/dekunukem/duckypad/mcuconf.h b/keyboards/dekunukem/duckypad/mcuconf.h
index 6f7b7c0f9..2dca1bea3 100644
--- a/keyboards/dekunukem/duckypad/mcuconf.h
+++ b/keyboards/dekunukem/duckypad/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/dekunukem/duckypad/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/dekunukem/duckypad/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/ergodox_infinity/chconf.h b/keyboards/ergodox_infinity/chconf.h
index d04f3dcf6..d3860afbe 100644
--- a/keyboards/ergodox_infinity/chconf.h
+++ b/keyboards/ergodox_infinity/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/ergodox_infinity/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/ergodox_infinity/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/ergodox_infinity/halconf.h b/keyboards/ergodox_infinity/halconf.h
index 3e47fc4b8..8c050a2d5 100644
--- a/keyboards/ergodox_infinity/halconf.h
+++ b/keyboards/ergodox_infinity/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/ergodox_infinity/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/ergodox_infinity/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/ergodox_stm32/chconf.h b/keyboards/ergodox_stm32/chconf.h
index c4748a078..e9f16c880 100644
--- a/keyboards/ergodox_stm32/chconf.h
+++ b/keyboards/ergodox_stm32/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/ergodox_stm32/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/ergodox_stm32/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/ergodox_stm32/halconf.h b/keyboards/ergodox_stm32/halconf.h
index ceff43b19..71a1596c4 100644
--- a/keyboards/ergodox_stm32/halconf.h
+++ b/keyboards/ergodox_stm32/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/ergodox_stm32/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/ergodox_stm32/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/evolv/chconf.h b/keyboards/evolv/chconf.h
index c86f723fb..36fca492f 100644
--- a/keyboards/evolv/chconf.h
+++ b/keyboards/evolv/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/evolv/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/evolv/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/evolv/halconf.h b/keyboards/evolv/halconf.h
index dd7da1bad..0eeec29dc 100644
--- a/keyboards/evolv/halconf.h
+++ b/keyboards/evolv/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/evolv/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/evolv/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/evolv/mcuconf.h b/keyboards/evolv/mcuconf.h
index b9fa5fcdf..2836e4b01 100644
--- a/keyboards/evolv/mcuconf.h
+++ b/keyboards/evolv/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/evolv/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/evolv/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/function96/chconf.h b/keyboards/function96/chconf.h
index 50e8338de..521da596f 100644
--- a/keyboards/function96/chconf.h
+++ b/keyboards/function96/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/function96/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/function96/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/function96/halconf.h b/keyboards/function96/halconf.h
index 91db435e2..9a62a7801 100644
--- a/keyboards/function96/halconf.h
+++ b/keyboards/function96/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/function96/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/function96/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/function96/mcuconf.h b/keyboards/function96/mcuconf.h
index 0dfc532c2..9eb71be2b 100644
--- a/keyboards/function96/mcuconf.h
+++ b/keyboards/function96/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/function96/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/function96/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/geekboards/macropad_v2/chconf.h b/keyboards/geekboards/macropad_v2/chconf.h
index f34bbc4bd..aec464019 100644
--- a/keyboards/geekboards/macropad_v2/chconf.h
+++ b/keyboards/geekboards/macropad_v2/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/geekboards/macropad_v2/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/geekboards/macropad_v2/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/geekboards/macropad_v2/halconf.h b/keyboards/geekboards/macropad_v2/halconf.h
index ece95bbc5..2e41c9a60 100644
--- a/keyboards/geekboards/macropad_v2/halconf.h
+++ b/keyboards/geekboards/macropad_v2/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/geekboards/macropad_v2/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/geekboards/macropad_v2/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/geekboards/macropad_v2/mcuconf.h b/keyboards/geekboards/macropad_v2/mcuconf.h
index 7f21a800c..8daf054a5 100644
--- a/keyboards/geekboards/macropad_v2/mcuconf.h
+++ b/keyboards/geekboards/macropad_v2/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/geekboards/macropad_v2/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/geekboards/macropad_v2/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/generic_panda/panda65_01/chconf.h b/keyboards/generic_panda/panda65_01/chconf.h
index 94bf6e958..b53557576 100644
--- a/keyboards/generic_panda/panda65_01/chconf.h
+++ b/keyboards/generic_panda/panda65_01/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/generic_panda/panda65_01/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/generic_panda/panda65_01/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/generic_panda/panda65_01/halconf.h b/keyboards/generic_panda/panda65_01/halconf.h
index 9ce551f84..ec9b882e1 100644
--- a/keyboards/generic_panda/panda65_01/halconf.h
+++ b/keyboards/generic_panda/panda65_01/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/generic_panda/panda65_01/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/generic_panda/panda65_01/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/generic_panda/panda65_01/mcuconf.h b/keyboards/generic_panda/panda65_01/mcuconf.h
index 74044a9dd..fa97fbc23 100644
--- a/keyboards/generic_panda/panda65_01/mcuconf.h
+++ b/keyboards/generic_panda/panda65_01/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/generic_panda/panda65_01/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/generic_panda/panda65_01/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/hadron/ver3/chconf.h b/keyboards/hadron/ver3/chconf.h
index 7e69aaf39..a8fb5f91c 100644
--- a/keyboards/hadron/ver3/chconf.h
+++ b/keyboards/hadron/ver3/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/hadron/ver3/chconf.h -r platforms/chibios/QMK_PROTON_C/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/hadron/ver3/chconf.h -r platforms/chibios/QMK_PROTON_C/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/hadron/ver3/halconf.h b/keyboards/hadron/ver3/halconf.h
index f89e13f87..21eceefcc 100644
--- a/keyboards/hadron/ver3/halconf.h
+++ b/keyboards/hadron/ver3/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/hadron/ver3/halconf.h -r platforms/chibios/QMK_PROTON_C/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/hadron/ver3/halconf.h -r platforms/chibios/QMK_PROTON_C/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/hadron/ver3/mcuconf.h b/keyboards/hadron/ver3/mcuconf.h
index 2a629921d..21dbdf5c7 100644
--- a/keyboards/hadron/ver3/mcuconf.h
+++ b/keyboards/hadron/ver3/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/hadron/ver3/mcuconf.h -r platforms/chibios/QMK_PROTON_C/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/hadron/ver3/mcuconf.h -r platforms/chibios/QMK_PROTON_C/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/ck4x4/chconf.h b/keyboards/handwired/ck4x4/chconf.h
index 0f6a9f60e..13281bd76 100644
--- a/keyboards/handwired/ck4x4/chconf.h
+++ b/keyboards/handwired/ck4x4/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/ck4x4/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/ck4x4/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/co60/rev6/halconf.h b/keyboards/handwired/co60/rev6/halconf.h
index 74035c961..bd85679fb 100644
--- a/keyboards/handwired/co60/rev6/halconf.h
+++ b/keyboards/handwired/co60/rev6/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/co60/rev6/halconf.h -r platforms/chibios/QMK_PROTON_C/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/co60/rev6/halconf.h -r platforms/chibios/QMK_PROTON_C/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/co60/rev6/mcuconf.h b/keyboards/handwired/co60/rev6/mcuconf.h
index bd7745f0d..24c0720f7 100644
--- a/keyboards/handwired/co60/rev6/mcuconf.h
+++ b/keyboards/handwired/co60/rev6/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/co60/rev6/mcuconf.h -r platforms/chibios/QMK_PROTON_C/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/co60/rev6/mcuconf.h -r platforms/chibios/QMK_PROTON_C/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/co60/rev7/halconf.h b/keyboards/handwired/co60/rev7/halconf.h
index 4a7b8a2cf..1c0abfd71 100644
--- a/keyboards/handwired/co60/rev7/halconf.h
+++ b/keyboards/handwired/co60/rev7/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/co60/rev7/halconf.h -r platforms/chibios/QMK_PROTON_C/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/co60/rev7/halconf.h -r platforms/chibios/QMK_PROTON_C/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/co60/rev7/mcuconf.h b/keyboards/handwired/co60/rev7/mcuconf.h
index abc23383f..89e186b63 100644
--- a/keyboards/handwired/co60/rev7/mcuconf.h
+++ b/keyboards/handwired/co60/rev7/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/co60/rev7/mcuconf.h -r platforms/chibios/QMK_PROTON_C/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/co60/rev7/mcuconf.h -r platforms/chibios/QMK_PROTON_C/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/onekey/blackpill_f401/chconf.h b/keyboards/handwired/onekey/blackpill_f401/chconf.h
index 8f925a661..69b87423a 100644
--- a/keyboards/handwired/onekey/blackpill_f401/chconf.h
+++ b/keyboards/handwired/onekey/blackpill_f401/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/onekey/blackpill_f401/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/blackpill_f401/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/onekey/blackpill_f411/chconf.h b/keyboards/handwired/onekey/blackpill_f411/chconf.h
index e9590e1bb..aa3372fc3 100644
--- a/keyboards/handwired/onekey/blackpill_f411/chconf.h
+++ b/keyboards/handwired/onekey/blackpill_f411/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/onekey/blackpill_f411/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/blackpill_f411/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/onekey/bluepill/chconf.h b/keyboards/handwired/onekey/bluepill/chconf.h
index 3d50a97a3..46d8af4a8 100644
--- a/keyboards/handwired/onekey/bluepill/chconf.h
+++ b/keyboards/handwired/onekey/bluepill/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/onekey/bluepill/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/bluepill/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/onekey/bluepill/halconf.h b/keyboards/handwired/onekey/bluepill/halconf.h
index 0572697d5..956d50f26 100644
--- a/keyboards/handwired/onekey/bluepill/halconf.h
+++ b/keyboards/handwired/onekey/bluepill/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/onekey/bluepill/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/bluepill/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/onekey/bluepill/mcuconf.h b/keyboards/handwired/onekey/bluepill/mcuconf.h
index bcd3e2248..99525360b 100644
--- a/keyboards/handwired/onekey/bluepill/mcuconf.h
+++ b/keyboards/handwired/onekey/bluepill/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/onekey/bluepill/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/bluepill/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/onekey/stm32f0_disco/chconf.h b/keyboards/handwired/onekey/stm32f0_disco/chconf.h
index 67142a2e6..cfec50b6e 100644
--- a/keyboards/handwired/onekey/stm32f0_disco/chconf.h
+++ b/keyboards/handwired/onekey/stm32f0_disco/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/onekey/stm32f0_disco/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/stm32f0_disco/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/onekey/stm32f0_disco/halconf.h b/keyboards/handwired/onekey/stm32f0_disco/halconf.h
index af0ac7e33..cb7de6738 100644
--- a/keyboards/handwired/onekey/stm32f0_disco/halconf.h
+++ b/keyboards/handwired/onekey/stm32f0_disco/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/onekey/stm32f0_disco/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/stm32f0_disco/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/onekey/stm32f0_disco/mcuconf.h b/keyboards/handwired/onekey/stm32f0_disco/mcuconf.h
index cce1daab6..52d39e4dd 100644
--- a/keyboards/handwired/onekey/stm32f0_disco/mcuconf.h
+++ b/keyboards/handwired/onekey/stm32f0_disco/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/onekey/stm32f0_disco/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/stm32f0_disco/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/onekey/teensy_32/chconf.h b/keyboards/handwired/onekey/teensy_32/chconf.h
index 3b67dc63f..c80efff69 100644
--- a/keyboards/handwired/onekey/teensy_32/chconf.h
+++ b/keyboards/handwired/onekey/teensy_32/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/onekey/teensy_32/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/teensy_32/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/onekey/teensy_32/halconf.h b/keyboards/handwired/onekey/teensy_32/halconf.h
index 072ea8e46..e5019779c 100644
--- a/keyboards/handwired/onekey/teensy_32/halconf.h
+++ b/keyboards/handwired/onekey/teensy_32/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/onekey/teensy_32/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/teensy_32/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/onekey/teensy_lc/chconf.h b/keyboards/handwired/onekey/teensy_lc/chconf.h
index 8c53cb794..5be02963c 100644
--- a/keyboards/handwired/onekey/teensy_lc/chconf.h
+++ b/keyboards/handwired/onekey/teensy_lc/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/onekey/teensy_lc/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/teensy_lc/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/onekey/teensy_lc/halconf.h b/keyboards/handwired/onekey/teensy_lc/halconf.h
index db81cd7f6..bdf1ba431 100644
--- a/keyboards/handwired/onekey/teensy_lc/halconf.h
+++ b/keyboards/handwired/onekey/teensy_lc/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/onekey/teensy_lc/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/teensy_lc/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/pill60/blackpill_f401/chconf.h b/keyboards/handwired/pill60/blackpill_f401/chconf.h
index 600a0a923..1664f045c 100644
--- a/keyboards/handwired/pill60/blackpill_f401/chconf.h
+++ b/keyboards/handwired/pill60/blackpill_f401/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/pill60/blackpill_f401/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/pill60/blackpill_f401/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/pill60/blackpill_f411/chconf.h b/keyboards/handwired/pill60/blackpill_f411/chconf.h
index 8fc9c3b8c..01a052754 100644
--- a/keyboards/handwired/pill60/blackpill_f411/chconf.h
+++ b/keyboards/handwired/pill60/blackpill_f411/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/pill60/blackpill_f411/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/pill60/blackpill_f411/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/pill60/bluepill/chconf.h b/keyboards/handwired/pill60/bluepill/chconf.h
index 829d921ad..883ab46d1 100644
--- a/keyboards/handwired/pill60/bluepill/chconf.h
+++ b/keyboards/handwired/pill60/bluepill/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/pill60/bluepill/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/pill60/bluepill/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/pill60/bluepill/halconf.h b/keyboards/handwired/pill60/bluepill/halconf.h
index 3c9f35fe7..459ec86e2 100644
--- a/keyboards/handwired/pill60/bluepill/halconf.h
+++ b/keyboards/handwired/pill60/bluepill/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/pill60/bluepill/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/pill60/bluepill/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/pill60/bluepill/mcuconf.h b/keyboards/handwired/pill60/bluepill/mcuconf.h
index d5a0fcda0..22f8b0270 100644
--- a/keyboards/handwired/pill60/bluepill/mcuconf.h
+++ b/keyboards/handwired/pill60/bluepill/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/pill60/bluepill/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/pill60/bluepill/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/riblee_f401/chconf.h b/keyboards/handwired/riblee_f401/chconf.h
index f868c9521..275f2b876 100644
--- a/keyboards/handwired/riblee_f401/chconf.h
+++ b/keyboards/handwired/riblee_f401/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/riblee_f401/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/riblee_f401/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/riblee_f401/halconf.h b/keyboards/handwired/riblee_f401/halconf.h
index e53df6faa..3c20471df 100644
--- a/keyboards/handwired/riblee_f401/halconf.h
+++ b/keyboards/handwired/riblee_f401/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/riblee_f401/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/riblee_f401/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/riblee_f411/chconf.h b/keyboards/handwired/riblee_f411/chconf.h
index 649324a93..7c20b34e7 100644
--- a/keyboards/handwired/riblee_f411/chconf.h
+++ b/keyboards/handwired/riblee_f411/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/riblee_f411/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/riblee_f411/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/sono1/chconf.h b/keyboards/handwired/sono1/chconf.h
index 4d09f7b7d..256dd73f9 100644
--- a/keyboards/handwired/sono1/chconf.h
+++ b/keyboards/handwired/sono1/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/sono1/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/sono1/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/sono1/halconf.h b/keyboards/handwired/sono1/halconf.h
index 0ed8198dc..71ad50411 100644
--- a/keyboards/handwired/sono1/halconf.h
+++ b/keyboards/handwired/sono1/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/sono1/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/sono1/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/sono1/mcuconf.h b/keyboards/handwired/sono1/mcuconf.h
index 6a41e22fe..cf252da15 100644
--- a/keyboards/handwired/sono1/mcuconf.h
+++ b/keyboards/handwired/sono1/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/sono1/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/sono1/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/steamvan/rev1/halconf.h b/keyboards/handwired/steamvan/rev1/halconf.h
index f723ba15b..4779fe572 100644
--- a/keyboards/handwired/steamvan/rev1/halconf.h
+++ b/keyboards/handwired/steamvan/rev1/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/steamvan/rev1/halconf.h -r platforms/chibios/QMK_PROTON_C/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/steamvan/rev1/halconf.h -r platforms/chibios/QMK_PROTON_C/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/steamvan/rev1/mcuconf.h b/keyboards/handwired/steamvan/rev1/mcuconf.h
index 31e356793..ac75c8ea4 100644
--- a/keyboards/handwired/steamvan/rev1/mcuconf.h
+++ b/keyboards/handwired/steamvan/rev1/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/steamvan/rev1/mcuconf.h -r platforms/chibios/QMK_PROTON_C/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/steamvan/rev1/mcuconf.h -r platforms/chibios/QMK_PROTON_C/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/t111/chconf.h b/keyboards/handwired/t111/chconf.h
index 25009f53d..3dae797c7 100644
--- a/keyboards/handwired/t111/chconf.h
+++ b/keyboards/handwired/t111/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/t111/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/t111/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/t111/halconf.h b/keyboards/handwired/t111/halconf.h
index 503530784..f2cce49fe 100644
--- a/keyboards/handwired/t111/halconf.h
+++ b/keyboards/handwired/t111/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/t111/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/t111/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/t111/mcuconf.h b/keyboards/handwired/t111/mcuconf.h
index 83ec4f331..3b76a6fb1 100644
--- a/keyboards/handwired/t111/mcuconf.h
+++ b/keyboards/handwired/t111/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/t111/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/t111/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/twadlee/tp69/chconf.h b/keyboards/handwired/twadlee/tp69/chconf.h
index d099106f6..d955082ae 100644
--- a/keyboards/handwired/twadlee/tp69/chconf.h
+++ b/keyboards/handwired/twadlee/tp69/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/twadlee/tp69/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/twadlee/tp69/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/z150/chconf.h b/keyboards/handwired/z150/chconf.h
index 875fd83ef..54f9e834f 100644
--- a/keyboards/handwired/z150/chconf.h
+++ b/keyboards/handwired/z150/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/z150/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/z150/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/z150/halconf.h b/keyboards/handwired/z150/halconf.h
index cea67d99e..37b172126 100644
--- a/keyboards/handwired/z150/halconf.h
+++ b/keyboards/handwired/z150/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/z150/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/z150/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/z150/mcuconf.h b/keyboards/handwired/z150/mcuconf.h
index 237bc9fe6..8567b2628 100644
--- a/keyboards/handwired/z150/mcuconf.h
+++ b/keyboards/handwired/z150/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/handwired/z150/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/z150/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/hs60/v2/halconf.h b/keyboards/hs60/v2/halconf.h
index 4c4d292f7..fb1d549c6 100644
--- a/keyboards/hs60/v2/halconf.h
+++ b/keyboards/hs60/v2/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/hs60/v2/halconf.h -r platforms/chibios/QMK_PROTON_C/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/hs60/v2/halconf.h -r platforms/chibios/QMK_PROTON_C/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/hs60/v2/mcuconf.h b/keyboards/hs60/v2/mcuconf.h
index 59adca2ff..e6d03f666 100644
--- a/keyboards/hs60/v2/mcuconf.h
+++ b/keyboards/hs60/v2/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/hs60/v2/mcuconf.h -r platforms/chibios/QMK_PROTON_C/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/hs60/v2/mcuconf.h -r platforms/chibios/QMK_PROTON_C/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/hub20/chconf.h b/keyboards/hub20/chconf.h
index 2b80a2f11..5e08a4a7a 100644
--- a/keyboards/hub20/chconf.h
+++ b/keyboards/hub20/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/hub20/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/hub20/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/hub20/halconf.h b/keyboards/hub20/halconf.h
index 2aa6e6452..80669d6dc 100644
--- a/keyboards/hub20/halconf.h
+++ b/keyboards/hub20/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/hub20/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/hub20/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/hub20/mcuconf.h b/keyboards/hub20/mcuconf.h
index 11c34e37f..f783c39b1 100644
--- a/keyboards/hub20/mcuconf.h
+++ b/keyboards/hub20/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/hub20/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/hub20/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/infinity60/chconf.h b/keyboards/infinity60/chconf.h
index 41a4253b2..3f1f9a8d7 100644
--- a/keyboards/infinity60/chconf.h
+++ b/keyboards/infinity60/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/infinity60/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/infinity60/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/infinity60/halconf.h b/keyboards/infinity60/halconf.h
index 655112610..f2a330b41 100644
--- a/keyboards/infinity60/halconf.h
+++ b/keyboards/infinity60/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/infinity60/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/infinity60/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/iron180/chconf.h b/keyboards/iron180/chconf.h
index 1b4c060f5..1218c8905 100644
--- a/keyboards/iron180/chconf.h
+++ b/keyboards/iron180/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/iron180/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/iron180/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/iron180/halconf.h b/keyboards/iron180/halconf.h
index 733f30da0..2d0841426 100644
--- a/keyboards/iron180/halconf.h
+++ b/keyboards/iron180/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/iron180/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/iron180/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/iron180/mcuconf.h b/keyboards/iron180/mcuconf.h
index b4fd4cca5..3792ceffe 100644
--- a/keyboards/iron180/mcuconf.h
+++ b/keyboards/iron180/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/iron180/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/iron180/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/jm60/chconf.h b/keyboards/jm60/chconf.h
index 94a6d69d1..4f28655fc 100644
--- a/keyboards/jm60/chconf.h
+++ b/keyboards/jm60/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/jm60/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/jm60/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/k_type/chconf.h b/keyboards/k_type/chconf.h
index ffa338fe0..ae0cce51e 100644
--- a/keyboards/k_type/chconf.h
+++ b/keyboards/k_type/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/k_type/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/k_type/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/k_type/halconf.h b/keyboards/k_type/halconf.h
index f618595da..c615d9656 100644
--- a/keyboards/k_type/halconf.h
+++ b/keyboards/k_type/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/k_type/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/k_type/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/keebio/bdn9/rev2/chconf.h b/keyboards/keebio/bdn9/rev2/chconf.h
index 75983001b..98c1cdf54 100644
--- a/keyboards/keebio/bdn9/rev2/chconf.h
+++ b/keyboards/keebio/bdn9/rev2/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/keebio/bdn9/rev2/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/keebio/bdn9/rev2/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/keebio/bdn9/rev2/halconf.h b/keyboards/keebio/bdn9/rev2/halconf.h
index 665d4605d..c17f632c0 100644
--- a/keyboards/keebio/bdn9/rev2/halconf.h
+++ b/keyboards/keebio/bdn9/rev2/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/keebio/bdn9/rev2/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/keebio/bdn9/rev2/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/keebio/bdn9/rev2/mcuconf.h b/keyboards/keebio/bdn9/rev2/mcuconf.h
index c4a52eb81..699a5d152 100644
--- a/keyboards/keebio/bdn9/rev2/mcuconf.h
+++ b/keyboards/keebio/bdn9/rev2/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/keebio/bdn9/rev2/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/keebio/bdn9/rev2/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/keebio/choconum/chconf.h b/keyboards/keebio/choconum/chconf.h
index 9c1c64e22..262aa5807 100644
--- a/keyboards/keebio/choconum/chconf.h
+++ b/keyboards/keebio/choconum/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/keebio/choconum/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/keebio/choconum/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/keebio/choconum/halconf.h b/keyboards/keebio/choconum/halconf.h
index 899feca04..f28d16b89 100644
--- a/keyboards/keebio/choconum/halconf.h
+++ b/keyboards/keebio/choconum/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/keebio/choconum/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/keebio/choconum/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/keebio/choconum/mcuconf.h b/keyboards/keebio/choconum/mcuconf.h
index 41100ac43..f45cf4dcb 100644
--- a/keyboards/keebio/choconum/mcuconf.h
+++ b/keyboards/keebio/choconum/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/keebio/choconum/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/keebio/choconum/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/keebwerk/mega/halconf.h b/keyboards/keebwerk/mega/halconf.h
index 21d86e12c..5e8c69796 100644
--- a/keyboards/keebwerk/mega/halconf.h
+++ b/keyboards/keebwerk/mega/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/keebwerk/mega/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/keebwerk/mega/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/keebwerk/mega/mcuconf.h b/keyboards/keebwerk/mega/mcuconf.h
index 0ac46a5fa..eb9b62fbd 100644
--- a/keyboards/keebwerk/mega/mcuconf.h
+++ b/keyboards/keebwerk/mega/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/keebwerk/mega/mcuconf.h -r platforms/chibios/GENERIC_STM32_F303XC/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/keebwerk/mega/mcuconf.h -r platforms/chibios/GENERIC_STM32_F303XC/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/matrix/m20add/chconf.h b/keyboards/matrix/m20add/chconf.h
index 60dac2fa9..e1f154b1e 100644
--- a/keyboards/matrix/m20add/chconf.h
+++ b/keyboards/matrix/m20add/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/matrix/m20add/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/matrix/m20add/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/matrix/m20add/halconf.h b/keyboards/matrix/m20add/halconf.h
index f6da992de..005783319 100644
--- a/keyboards/matrix/m20add/halconf.h
+++ b/keyboards/matrix/m20add/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/matrix/m20add/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/matrix/m20add/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/matrix/noah/chconf.h b/keyboards/matrix/noah/chconf.h
index 44fff871d..ccf619fdc 100644
--- a/keyboards/matrix/noah/chconf.h
+++ b/keyboards/matrix/noah/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/matrix/noah/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/matrix/noah/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/matrix/noah/halconf.h b/keyboards/matrix/noah/halconf.h
index 95de64d89..2175af02e 100644
--- a/keyboards/matrix/noah/halconf.h
+++ b/keyboards/matrix/noah/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/matrix/noah/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/matrix/noah/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/misterknife/knife66/chconf.h b/keyboards/misterknife/knife66/chconf.h
index 5ac73fa91..b19c80a7b 100644
--- a/keyboards/misterknife/knife66/chconf.h
+++ b/keyboards/misterknife/knife66/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/misterknife/knife66/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/misterknife/knife66/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/misterknife/knife66/halconf.h b/keyboards/misterknife/knife66/halconf.h
index 8fa237dcf..e8ccc3bc5 100644
--- a/keyboards/misterknife/knife66/halconf.h
+++ b/keyboards/misterknife/knife66/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/misterknife/knife66/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/misterknife/knife66/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/misterknife/knife66/mcuconf.h b/keyboards/misterknife/knife66/mcuconf.h
index cb8416efc..c0c775eaa 100644
--- a/keyboards/misterknife/knife66/mcuconf.h
+++ b/keyboards/misterknife/knife66/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/misterknife/knife66/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/misterknife/knife66/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/misterknife/knife66_iso/chconf.h b/keyboards/misterknife/knife66_iso/chconf.h
index 59695412b..1d83a6712 100644
--- a/keyboards/misterknife/knife66_iso/chconf.h
+++ b/keyboards/misterknife/knife66_iso/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/misterknife/knife66_iso/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/misterknife/knife66_iso/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/misterknife/knife66_iso/halconf.h b/keyboards/misterknife/knife66_iso/halconf.h
index d84bb5294..6b22c2c45 100644
--- a/keyboards/misterknife/knife66_iso/halconf.h
+++ b/keyboards/misterknife/knife66_iso/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/misterknife/knife66_iso/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/misterknife/knife66_iso/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/misterknife/knife66_iso/mcuconf.h b/keyboards/misterknife/knife66_iso/mcuconf.h
index 2355f4f2a..0efb4e9e3 100644
--- a/keyboards/misterknife/knife66_iso/mcuconf.h
+++ b/keyboards/misterknife/knife66_iso/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/misterknife/knife66_iso/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/misterknife/knife66_iso/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/mode/eighty/chconf.h b/keyboards/mode/eighty/chconf.h
index 922db5428..fcc821b38 100644
--- a/keyboards/mode/eighty/chconf.h
+++ b/keyboards/mode/eighty/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/mode/eighty/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/mode/eighty/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/mode/eighty/halconf.h b/keyboards/mode/eighty/halconf.h
index 3fac35b58..eab8a300a 100644
--- a/keyboards/mode/eighty/halconf.h
+++ b/keyboards/mode/eighty/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/mode/eighty/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/mode/eighty/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/mode/eighty/mcuconf.h b/keyboards/mode/eighty/mcuconf.h
index 52c077f44..e1aaa8df3 100644
--- a/keyboards/mode/eighty/mcuconf.h
+++ b/keyboards/mode/eighty/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/mode/eighty/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/mode/eighty/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/nack/mcuconf.h b/keyboards/nack/mcuconf.h
index 6d20c18da..d2251dbae 100644
--- a/keyboards/nack/mcuconf.h
+++ b/keyboards/nack/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/nack/mcuconf.h -r platforms/chibios/QMK_PROTON_C/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/nack/mcuconf.h -r platforms/chibios/QMK_PROTON_C/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/nebula12/chconf.h b/keyboards/nebula12/chconf.h
index cb75232d4..e34e007fe 100644
--- a/keyboards/nebula12/chconf.h
+++ b/keyboards/nebula12/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/nebula12/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/nebula12/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/nebula12/halconf.h b/keyboards/nebula12/halconf.h
index 53821442b..e4223dc63 100644
--- a/keyboards/nebula12/halconf.h
+++ b/keyboards/nebula12/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/nebula12/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/nebula12/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/nebula12/mcuconf.h b/keyboards/nebula12/mcuconf.h
index 8611307a7..9d1d69314 100644
--- a/keyboards/nebula12/mcuconf.h
+++ b/keyboards/nebula12/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/nebula12/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/nebula12/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/nebula68/halconf.h b/keyboards/nebula68/halconf.h
index 0e01d5b9c..faf4d34e6 100644
--- a/keyboards/nebula68/halconf.h
+++ b/keyboards/nebula68/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/nebula68/halconf.h -r platforms/chibios/QMK_PROTON_C/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/nebula68/halconf.h -r platforms/chibios/QMK_PROTON_C/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/nebula68/mcuconf.h b/keyboards/nebula68/mcuconf.h
index 07679b81a..8bd404746 100644
--- a/keyboards/nebula68/mcuconf.h
+++ b/keyboards/nebula68/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/nebula68/mcuconf.h -r platforms/chibios/QMK_PROTON_C/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/nebula68/mcuconf.h -r platforms/chibios/QMK_PROTON_C/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/nemui/chconf.h b/keyboards/nemui/chconf.h
index 068b11935..2e6e17f1a 100644
--- a/keyboards/nemui/chconf.h
+++ b/keyboards/nemui/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/nemui/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/nemui/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/nemui/halconf.h b/keyboards/nemui/halconf.h
index 14ce65aef..d9dbc28b7 100644
--- a/keyboards/nemui/halconf.h
+++ b/keyboards/nemui/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/nemui/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/nemui/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/nemui/mcuconf.h b/keyboards/nemui/mcuconf.h
index 955108cab..0437c5c93 100644
--- a/keyboards/nemui/mcuconf.h
+++ b/keyboards/nemui/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/nemui/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/nemui/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/nibiria/stream15/chconf.h b/keyboards/nibiria/stream15/chconf.h
index 8d5a6b1ce..257bb696a 100644
--- a/keyboards/nibiria/stream15/chconf.h
+++ b/keyboards/nibiria/stream15/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/nibiria/stream15/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/nibiria/stream15/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/nibiria/stream15/halconf.h b/keyboards/nibiria/stream15/halconf.h
index e2d85aecc..74b3cbdca 100644
--- a/keyboards/nibiria/stream15/halconf.h
+++ b/keyboards/nibiria/stream15/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/nibiria/stream15/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/nibiria/stream15/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/nibiria/stream15/mcuconf.h b/keyboards/nibiria/stream15/mcuconf.h
index d6d7289fc..23fcf6f1b 100644
--- a/keyboards/nibiria/stream15/mcuconf.h
+++ b/keyboards/nibiria/stream15/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/nibiria/stream15/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/nibiria/stream15/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/nk65/halconf.h b/keyboards/nk65/halconf.h
index a68bb03cd..e6d7e3c2e 100644
--- a/keyboards/nk65/halconf.h
+++ b/keyboards/nk65/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/nk65/halconf.h -r platforms/chibios/QMK_PROTON_C/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/nk65/halconf.h -r platforms/chibios/QMK_PROTON_C/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/nk65/mcuconf.h b/keyboards/nk65/mcuconf.h
index aff96c1c9..f37f37c17 100644
--- a/keyboards/nk65/mcuconf.h
+++ b/keyboards/nk65/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/nk65/mcuconf.h -r platforms/chibios/QMK_PROTON_C/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/nk65/mcuconf.h -r platforms/chibios/QMK_PROTON_C/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/nk87/halconf.h b/keyboards/nk87/halconf.h
index cb517eca3..fb0c21426 100644
--- a/keyboards/nk87/halconf.h
+++ b/keyboards/nk87/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/nk87/halconf.h -r platforms/chibios/QMK_PROTON_C/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/nk87/halconf.h -r platforms/chibios/QMK_PROTON_C/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/nk87/mcuconf.h b/keyboards/nk87/mcuconf.h
index 42565860c..1aa2fb55b 100644
--- a/keyboards/nk87/mcuconf.h
+++ b/keyboards/nk87/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/nk87/mcuconf.h -r platforms/chibios/QMK_PROTON_C/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/nk87/mcuconf.h -r platforms/chibios/QMK_PROTON_C/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/peiorisboards/ixora/chconf.h b/keyboards/peiorisboards/ixora/chconf.h
index e4664d2c6..f5aea5228 100644
--- a/keyboards/peiorisboards/ixora/chconf.h
+++ b/keyboards/peiorisboards/ixora/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/peiorisboards/ixora/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/peiorisboards/ixora/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/peiorisboards/ixora/halconf.h b/keyboards/peiorisboards/ixora/halconf.h
index 7a147e3f2..4cd3b2889 100644
--- a/keyboards/peiorisboards/ixora/halconf.h
+++ b/keyboards/peiorisboards/ixora/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/peiorisboards/ixora/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/peiorisboards/ixora/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/phoenix/chconf.h b/keyboards/phoenix/chconf.h
index c6791a55f..bf39dba7b 100644
--- a/keyboards/phoenix/chconf.h
+++ b/keyboards/phoenix/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/phoenix/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/phoenix/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/phoenix/halconf.h b/keyboards/phoenix/halconf.h
index f42f063ff..2527d3894 100644
--- a/keyboards/phoenix/halconf.h
+++ b/keyboards/phoenix/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/phoenix/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/phoenix/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/phoenix/mcuconf.h b/keyboards/phoenix/mcuconf.h
index 157081d5c..cab1a1537 100644
--- a/keyboards/phoenix/mcuconf.h
+++ b/keyboards/phoenix/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/phoenix/mcuconf.h -r platforms/chibios/BLACKPILL_STM32_F401/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/phoenix/mcuconf.h -r platforms/chibios/BLACKPILL_STM32_F401/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/polilla/chconf.h b/keyboards/polilla/chconf.h
index 252acdd41..86d045b3d 100644
--- a/keyboards/polilla/chconf.h
+++ b/keyboards/polilla/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/polilla/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/polilla/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/polilla/halconf.h b/keyboards/polilla/halconf.h
index 01960fd69..6849a69f2 100644
--- a/keyboards/polilla/halconf.h
+++ b/keyboards/polilla/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/polilla/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/polilla/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/polilla/mcuconf.h b/keyboards/polilla/mcuconf.h
index 15a04a01e..c3ebb04ab 100644
--- a/keyboards/polilla/mcuconf.h
+++ b/keyboards/polilla/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/polilla/mcuconf.h -r platforms/chibios/GENERIC_STM32_F042X6/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/polilla/mcuconf.h -r platforms/chibios/GENERIC_STM32_F042X6/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/primekb/meridian/chconf.h b/keyboards/primekb/meridian/chconf.h
index b38862a40..44182595b 100644
--- a/keyboards/primekb/meridian/chconf.h
+++ b/keyboards/primekb/meridian/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/primekb/meridian/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/primekb/meridian/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/primekb/meridian/halconf.h b/keyboards/primekb/meridian/halconf.h
index 74796d86b..4ad4a7e60 100644
--- a/keyboards/primekb/meridian/halconf.h
+++ b/keyboards/primekb/meridian/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/primekb/meridian/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/primekb/meridian/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/primekb/meridian/mcuconf.h b/keyboards/primekb/meridian/mcuconf.h
index 11a1e9027..e8723438a 100644
--- a/keyboards/primekb/meridian/mcuconf.h
+++ b/keyboards/primekb/meridian/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/primekb/meridian/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/primekb/meridian/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/projectkb/alice/chconf.h b/keyboards/projectkb/alice/chconf.h
index 677dd6711..72266cbbb 100644
--- a/keyboards/projectkb/alice/chconf.h
+++ b/keyboards/projectkb/alice/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/projectkb/alice/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/projectkb/alice/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/projectkb/alice/halconf.h b/keyboards/projectkb/alice/halconf.h
index ce8690d84..b17808ffe 100644
--- a/keyboards/projectkb/alice/halconf.h
+++ b/keyboards/projectkb/alice/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/projectkb/alice/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/projectkb/alice/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/projectkb/alice/mcuconf.h b/keyboards/projectkb/alice/mcuconf.h
index 20bae0682..4bfc7f946 100644
--- a/keyboards/projectkb/alice/mcuconf.h
+++ b/keyboards/projectkb/alice/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/projectkb/alice/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/projectkb/alice/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/projectkb/signature87/chconf.h b/keyboards/projectkb/signature87/chconf.h
index b096de6c9..2b6da6c97 100644
--- a/keyboards/projectkb/signature87/chconf.h
+++ b/keyboards/projectkb/signature87/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/projectkb/signature87/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/projectkb/signature87/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/projectkb/signature87/halconf.h b/keyboards/projectkb/signature87/halconf.h
index 0e51418a6..29ec65a4e 100644
--- a/keyboards/projectkb/signature87/halconf.h
+++ b/keyboards/projectkb/signature87/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/projectkb/signature87/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/projectkb/signature87/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/projectkb/signature87/mcuconf.h b/keyboards/projectkb/signature87/mcuconf.h
index cbc2922c6..630bfa709 100644
--- a/keyboards/projectkb/signature87/mcuconf.h
+++ b/keyboards/projectkb/signature87/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/projectkb/signature87/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/projectkb/signature87/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/ramonimbao/squishy65/chconf.h b/keyboards/ramonimbao/squishy65/chconf.h
index ec18e90de..f9146fe52 100644
--- a/keyboards/ramonimbao/squishy65/chconf.h
+++ b/keyboards/ramonimbao/squishy65/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/ramonimbao/squishy65/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/ramonimbao/squishy65/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/ramonimbao/squishy65/halconf.h b/keyboards/ramonimbao/squishy65/halconf.h
index 69865d68c..4ebba2e53 100644
--- a/keyboards/ramonimbao/squishy65/halconf.h
+++ b/keyboards/ramonimbao/squishy65/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/ramonimbao/squishy65/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/ramonimbao/squishy65/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/ramonimbao/squishy65/mcuconf.h b/keyboards/ramonimbao/squishy65/mcuconf.h
index 16d1604cc..f7ce17326 100644
--- a/keyboards/ramonimbao/squishy65/mcuconf.h
+++ b/keyboards/ramonimbao/squishy65/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/ramonimbao/squishy65/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/ramonimbao/squishy65/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/ramonimbao/wete/chconf.h b/keyboards/ramonimbao/wete/chconf.h
index 12fc0b5b8..523ffe460 100644
--- a/keyboards/ramonimbao/wete/chconf.h
+++ b/keyboards/ramonimbao/wete/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/ramonimbao/wete/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/ramonimbao/wete/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/ramonimbao/wete/halconf.h b/keyboards/ramonimbao/wete/halconf.h
index 32847c0a8..c43440a45 100644
--- a/keyboards/ramonimbao/wete/halconf.h
+++ b/keyboards/ramonimbao/wete/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/ramonimbao/wete/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/ramonimbao/wete/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/ramonimbao/wete/mcuconf.h b/keyboards/ramonimbao/wete/mcuconf.h
index 1ff77c1fd..b7f2c481c 100644
--- a/keyboards/ramonimbao/wete/mcuconf.h
+++ b/keyboards/ramonimbao/wete/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/ramonimbao/wete/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/ramonimbao/wete/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/rart/rartlice/chconf.h b/keyboards/rart/rartlice/chconf.h
index f052b4fd9..5c06b72c8 100644
--- a/keyboards/rart/rartlice/chconf.h
+++ b/keyboards/rart/rartlice/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/rart/rartlice/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/rart/rartlice/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/rart/rartlice/halconf.h b/keyboards/rart/rartlice/halconf.h
index 437e5a865..51f026d49 100644
--- a/keyboards/rart/rartlice/halconf.h
+++ b/keyboards/rart/rartlice/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/rart/rartlice/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/rart/rartlice/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/rart/rartlice/mcuconf.h b/keyboards/rart/rartlice/mcuconf.h
index 408ba270a..960d0a8f2 100644
--- a/keyboards/rart/rartlice/mcuconf.h
+++ b/keyboards/rart/rartlice/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/rart/rartlice/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/rart/rartlice/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/retro_75/chconf.h b/keyboards/retro_75/chconf.h
index ac3b1ebd4..2245de22d 100644
--- a/keyboards/retro_75/chconf.h
+++ b/keyboards/retro_75/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/retro_75/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/retro_75/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/rocketboard_16/chconf.h b/keyboards/rocketboard_16/chconf.h
index 639e35faa..6b6a8526c 100644
--- a/keyboards/rocketboard_16/chconf.h
+++ b/keyboards/rocketboard_16/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/rocketboard_16/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/rocketboard_16/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/rocketboard_16/halconf.h b/keyboards/rocketboard_16/halconf.h
index f0751644d..e26683917 100644
--- a/keyboards/rocketboard_16/halconf.h
+++ b/keyboards/rocketboard_16/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/rocketboard_16/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/rocketboard_16/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/rocketboard_16/mcuconf.h b/keyboards/rocketboard_16/mcuconf.h
index e706ab50e..5a66f3690 100644
--- a/keyboards/rocketboard_16/mcuconf.h
+++ b/keyboards/rocketboard_16/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/rocketboard_16/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/rocketboard_16/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/satt/vision/chconf.h b/keyboards/satt/vision/chconf.h
index 7cbcecfd3..8ea62c976 100644
--- a/keyboards/satt/vision/chconf.h
+++ b/keyboards/satt/vision/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/satt/vision/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/satt/vision/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/satt/vision/mcuconf.h b/keyboards/satt/vision/mcuconf.h
index a4085a792..e787f4a1c 100644
--- a/keyboards/satt/vision/mcuconf.h
+++ b/keyboards/satt/vision/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/satt/vision/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/satt/vision/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/technika/chconf.h b/keyboards/technika/chconf.h
index 96a926f3b..eabb44a1f 100644
--- a/keyboards/technika/chconf.h
+++ b/keyboards/technika/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/technika/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/technika/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/technika/halconf.h b/keyboards/technika/halconf.h
index 8350b86ca..8f29dc30f 100644
--- a/keyboards/technika/halconf.h
+++ b/keyboards/technika/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/technika/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/technika/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/technika/mcuconf.h b/keyboards/technika/mcuconf.h
index b2639511d..806a45408 100644
--- a/keyboards/technika/mcuconf.h
+++ b/keyboards/technika/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/technika/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/technika/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/tkc/candybar/chconf.h b/keyboards/tkc/candybar/chconf.h
index ca592d022..6a1d06e3a 100644
--- a/keyboards/tkc/candybar/chconf.h
+++ b/keyboards/tkc/candybar/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/tkc/candybar/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/tkc/candybar/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/tkc/godspeed75/chconf.h b/keyboards/tkc/godspeed75/chconf.h
index ce35f1a86..1c2fed228 100644
--- a/keyboards/tkc/godspeed75/chconf.h
+++ b/keyboards/tkc/godspeed75/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/tkc/godspeed75/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/tkc/godspeed75/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/tkw/stoutgat/v2/f411/chconf.h b/keyboards/tkw/stoutgat/v2/f411/chconf.h
index 531b724ef..be287db09 100644
--- a/keyboards/tkw/stoutgat/v2/f411/chconf.h
+++ b/keyboards/tkw/stoutgat/v2/f411/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/tkw/stoutgat/v2/f411/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/tkw/stoutgat/v2/f411/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/tkw/stoutgat/v2/f411/halconf.h b/keyboards/tkw/stoutgat/v2/f411/halconf.h
index 2a01cb3a7..0b6f7d505 100644
--- a/keyboards/tkw/stoutgat/v2/f411/halconf.h
+++ b/keyboards/tkw/stoutgat/v2/f411/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/tkw/stoutgat/v2/f411/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/tkw/stoutgat/v2/f411/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/tkw/stoutgat/v2/f411/mcuconf.h b/keyboards/tkw/stoutgat/v2/f411/mcuconf.h
index d2ce383b5..00490a920 100644
--- a/keyboards/tkw/stoutgat/v2/f411/mcuconf.h
+++ b/keyboards/tkw/stoutgat/v2/f411/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/tkw/stoutgat/v2/f411/mcuconf.h -r platforms/chibios/BLACKPILL_STM32_F411/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/tkw/stoutgat/v2/f411/mcuconf.h -r platforms/chibios/BLACKPILL_STM32_F411/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/viktus/styrka/chconf.h b/keyboards/viktus/styrka/chconf.h
index c84a9f8b5..76d16808a 100644
--- a/keyboards/viktus/styrka/chconf.h
+++ b/keyboards/viktus/styrka/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/viktus/styrka/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/viktus/styrka/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/vinta/chconf.h b/keyboards/vinta/chconf.h
index 62469b176..14b19f08d 100644
--- a/keyboards/vinta/chconf.h
+++ b/keyboards/vinta/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/vinta/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/vinta/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/vinta/halconf.h b/keyboards/vinta/halconf.h
index 61632a72d..66ed246c5 100644
--- a/keyboards/vinta/halconf.h
+++ b/keyboards/vinta/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/vinta/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/vinta/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/westfoxtrot/prophet/chconf.h b/keyboards/westfoxtrot/prophet/chconf.h
index 74da11e5d..6a1f54a27 100644
--- a/keyboards/westfoxtrot/prophet/chconf.h
+++ b/keyboards/westfoxtrot/prophet/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/westfoxtrot/prophet/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/westfoxtrot/prophet/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/westfoxtrot/prophet/mcuconf.h b/keyboards/westfoxtrot/prophet/mcuconf.h
index 88b4e5980..2665f9c9e 100644
--- a/keyboards/westfoxtrot/prophet/mcuconf.h
+++ b/keyboards/westfoxtrot/prophet/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/westfoxtrot/prophet/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/westfoxtrot/prophet/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/whitefox/chconf.h b/keyboards/whitefox/chconf.h
index 43e3f13bb..1860897bb 100644
--- a/keyboards/whitefox/chconf.h
+++ b/keyboards/whitefox/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/whitefox/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/whitefox/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/whitefox/halconf.h b/keyboards/whitefox/halconf.h
index 4ab03a427..04a228dc9 100644
--- a/keyboards/whitefox/halconf.h
+++ b/keyboards/whitefox/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/whitefox/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/whitefox/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/wolfmarkclub/wm1/chconf.h b/keyboards/wolfmarkclub/wm1/chconf.h
index 8dfc8d037..d4d8b46ae 100644
--- a/keyboards/wolfmarkclub/wm1/chconf.h
+++ b/keyboards/wolfmarkclub/wm1/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/wolfmarkclub/wm1/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/wolfmarkclub/wm1/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/wolfmarkclub/wm1/halconf.h b/keyboards/wolfmarkclub/wm1/halconf.h
index c0571400f..4481979d2 100644
--- a/keyboards/wolfmarkclub/wm1/halconf.h
+++ b/keyboards/wolfmarkclub/wm1/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/wolfmarkclub/wm1/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/wolfmarkclub/wm1/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/wolfmarkclub/wm1/mcuconf.h b/keyboards/wolfmarkclub/wm1/mcuconf.h
index 861603f82..4374ff392 100644
--- a/keyboards/wolfmarkclub/wm1/mcuconf.h
+++ b/keyboards/wolfmarkclub/wm1/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/wolfmarkclub/wm1/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/wolfmarkclub/wm1/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/xelus/kangaroo/chconf.h b/keyboards/xelus/kangaroo/chconf.h
index 3457d3bb6..886a89679 100644
--- a/keyboards/xelus/kangaroo/chconf.h
+++ b/keyboards/xelus/kangaroo/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/xelus/kangaroo/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/xelus/kangaroo/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/xelus/kangaroo/halconf.h b/keyboards/xelus/kangaroo/halconf.h
index ba087c7fd..633d94a88 100644
--- a/keyboards/xelus/kangaroo/halconf.h
+++ b/keyboards/xelus/kangaroo/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/xelus/kangaroo/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/xelus/kangaroo/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/xelus/kangaroo/mcuconf.h b/keyboards/xelus/kangaroo/mcuconf.h
index 885d9f014..20db196d2 100644
--- a/keyboards/xelus/kangaroo/mcuconf.h
+++ b/keyboards/xelus/kangaroo/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/xelus/kangaroo/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/xelus/kangaroo/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/xelus/trinityxttkl/chconf.h b/keyboards/xelus/trinityxttkl/chconf.h
index 867f495f6..1d1191ca1 100644
--- a/keyboards/xelus/trinityxttkl/chconf.h
+++ b/keyboards/xelus/trinityxttkl/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/xelus/trinityxttkl/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/xelus/trinityxttkl/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/xelus/trinityxttkl/mcuconf.h b/keyboards/xelus/trinityxttkl/mcuconf.h
index a1b18d56c..a3a20cf7d 100644
--- a/keyboards/xelus/trinityxttkl/mcuconf.h
+++ b/keyboards/xelus/trinityxttkl/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/xelus/trinityxttkl/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/xelus/trinityxttkl/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/xelus/valor_frl_tkl/chconf.h b/keyboards/xelus/valor_frl_tkl/chconf.h
index d7978e48c..d30ea0bfe 100644
--- a/keyboards/xelus/valor_frl_tkl/chconf.h
+++ b/keyboards/xelus/valor_frl_tkl/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/xelus/valor_frl_tkl/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/xelus/valor_frl_tkl/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/xelus/valor_frl_tkl/halconf.h b/keyboards/xelus/valor_frl_tkl/halconf.h
index bb34ba2c7..1dbf1a4fe 100644
--- a/keyboards/xelus/valor_frl_tkl/halconf.h
+++ b/keyboards/xelus/valor_frl_tkl/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/xelus/valor_frl_tkl/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/xelus/valor_frl_tkl/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/xelus/valor_frl_tkl/mcuconf.h b/keyboards/xelus/valor_frl_tkl/mcuconf.h
index 44af0df3c..6013ff13f 100644
--- a/keyboards/xelus/valor_frl_tkl/mcuconf.h
+++ b/keyboards/xelus/valor_frl_tkl/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/xelus/valor_frl_tkl/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/xelus/valor_frl_tkl/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/xiaomi/mk02/chconf.h b/keyboards/xiaomi/mk02/chconf.h
index 9e4ca77e0..28defbc87 100644
--- a/keyboards/xiaomi/mk02/chconf.h
+++ b/keyboards/xiaomi/mk02/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/xiaomi/mk02/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/xiaomi/mk02/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/xiaomi/mk02/halconf.h b/keyboards/xiaomi/mk02/halconf.h
index 2f56db7c3..31e0799b5 100644
--- a/keyboards/xiaomi/mk02/halconf.h
+++ b/keyboards/xiaomi/mk02/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/xiaomi/mk02/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/xiaomi/mk02/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/zoo/wampus/chconf.h b/keyboards/zoo/wampus/chconf.h
index 05604b0a1..3f64f006f 100644
--- a/keyboards/zoo/wampus/chconf.h
+++ b/keyboards/zoo/wampus/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/zoo/wampus/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/zoo/wampus/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/zoo/wampus/halconf.h b/keyboards/zoo/wampus/halconf.h
index 7ad94d480..39499a3cc 100644
--- a/keyboards/zoo/wampus/halconf.h
+++ b/keyboards/zoo/wampus/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/zoo/wampus/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/zoo/wampus/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/zoo/wampus/mcuconf.h b/keyboards/zoo/wampus/mcuconf.h
index 6d1148d29..775e70e55 100644
--- a/keyboards/zoo/wampus/mcuconf.h
+++ b/keyboards/zoo/wampus/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/zoo/wampus/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/zoo/wampus/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/zvecr/split_blackpill/chconf.h b/keyboards/zvecr/split_blackpill/chconf.h
index c85f31fcb..7b09e5cb8 100644
--- a/keyboards/zvecr/split_blackpill/chconf.h
+++ b/keyboards/zvecr/split_blackpill/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/zvecr/split_blackpill/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/zvecr/split_blackpill/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
diff --git a/keyboards/zvecr/split_blackpill/halconf.h b/keyboards/zvecr/split_blackpill/halconf.h
index 473f46c14..0ee73f028 100644
--- a/keyboards/zvecr/split_blackpill/halconf.h
+++ b/keyboards/zvecr/split_blackpill/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/zvecr/split_blackpill/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/zvecr/split_blackpill/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/zvecr/split_blackpill/mcuconf.h b/keyboards/zvecr/split_blackpill/mcuconf.h
index d93d703d4..01cb4f40f 100644
--- a/keyboards/zvecr/split_blackpill/mcuconf.h
+++ b/keyboards/zvecr/split_blackpill/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/zvecr/split_blackpill/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/zvecr/split_blackpill/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/zvecr/zv48/f401/halconf.h b/keyboards/zvecr/zv48/f401/halconf.h
index 87edd0bb8..b42a69399 100644
--- a/keyboards/zvecr/zv48/f401/halconf.h
+++ b/keyboards/zvecr/zv48/f401/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/zvecr/zv48/f401/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/zvecr/zv48/f401/mcuconf.h b/keyboards/zvecr/zv48/f401/mcuconf.h
index 45010ed36..3c14f5e02 100644
--- a/keyboards/zvecr/zv48/f401/mcuconf.h
+++ b/keyboards/zvecr/zv48/f401/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/zvecr/zv48/f401/mcuconf.h -r platforms/chibios/BLACKPILL_STM32_F401/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/mcuconf.h -r platforms/chibios/BLACKPILL_STM32_F401/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/zvecr/zv48/f411/halconf.h b/keyboards/zvecr/zv48/f411/halconf.h
index f959b2f8f..3678cd52b 100644
--- a/keyboards/zvecr/zv48/f411/halconf.h
+++ b/keyboards/zvecr/zv48/f411/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/zvecr/zv48/f411/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f411/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/zvecr/zv48/f411/mcuconf.h b/keyboards/zvecr/zv48/f411/mcuconf.h
index b70bdf40e..572a8616c 100644
--- a/keyboards/zvecr/zv48/f411/mcuconf.h
+++ b/keyboards/zvecr/zv48/f411/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i keyboards/zvecr/zv48/f411/mcuconf.h -r platforms/chibios/BLACKPILL_STM32_F411/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f411/mcuconf.h -r platforms/chibios/BLACKPILL_STM32_F411/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/lib/python/qmk/cli/chibios/confmigrate.py b/lib/python/qmk/cli/chibios/confmigrate.py
index b9cfda961..9d2548858 100644
--- a/lib/python/qmk/cli/chibios/confmigrate.py
+++ b/lib/python/qmk/cli/chibios/confmigrate.py
@@ -32,7 +32,7 @@ file_header = """\
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confupdate -i {0} -r {1}`
+ *    `qmk chibios-confmigrate -i {0} -r {1}`
  */
 
 #pragma once
-- 
cgit v1.3.1


From bdb757e189bf72c0ef382a924328642a629e06d5 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Thu, 21 Jan 2021 17:00:53 +1100
Subject: ChibiOS conf migrations... take 11 (#11646)

* Allow forcing re-migration.

* ChibiOS conf upgrade for acheron/arctic

 acheron/arctic - 2aedbe9103fff6c37e596c33c9ed337957647368

* ChibiOS conf upgrade for acheron/austin

 acheron/austin - c2f4e3b7fc9f1c3d64f47d139bc58367afeca1b7

* ChibiOS conf upgrade for acheron/keebspcb

 acheron/keebspcb - 1ba976e409732bfa5c0487dd33e20bec06852ce4

* ChibiOS conf upgrade for acheron/lasgweloth

 acheron/lasgweloth - 01a2e70d0d86de0ff05d0b898a6e3b4428ee1581

* ChibiOS conf upgrade for aeboards/ext65/rev2

 aeboards/ext65/rev2 - 3c9a45cafb4ed6d9672aaff4548b105193633a87

* ChibiOS conf upgrade for ai03/vega

 ai03/vega - 1bd0dfccb99baa69bacd2d55f2bfa72019b8bf80

* ChibiOS conf upgrade for akegata_denki/device_one

 akegata_denki/device_one - a013823188660f5fca37c5763f160f8646aed7a7

* ChibiOS conf upgrade for at_at/660m

 at_at/660m - 9999583e8bec2772046132a22818482d24e18c84

* ChibiOS conf upgrade for box75

 box75 - 1126206109a942237eea96f3a9608e3c9ed55f8e

* ChibiOS conf upgrade for bt66tech/bt66tech60

 bt66tech/bt66tech60 - b69120638a8b2c86c008fd0592be918383d8a454

* ChibiOS conf upgrade for cannonkeys/an_c

 cannonkeys/an_c - c755f6caaccbe2b30d95661a3d441b836534c29f

* ChibiOS conf upgrade for cannonkeys/atlas

 cannonkeys/atlas - 1a18c55492a834b82715516ea4cd4d3d94508743

* ChibiOS conf upgrade for cannonkeys/chimera65

 cannonkeys/chimera65 - 6bf226ef353da9106c381a8ac95a9b90529327e5

* ChibiOS conf upgrade for cannonkeys/db60

 cannonkeys/db60 - 07e3246f8e3adc5b6918809e6a5aa1ad064b9a09

* ChibiOS conf upgrade for cannonkeys/devastatingtkl

 cannonkeys/devastatingtkl - 907d258e29eb7e35b1f868c1ea6148bfd1e3a3f2

* ChibiOS conf upgrade for cannonkeys/instant60

 cannonkeys/instant60 - ac876ff6746b08839a3936dd4126b52683b763f4

* ChibiOS conf upgrade for cannonkeys/instant65

 cannonkeys/instant65 - 3b8c89ec5fecbdb35cccb00c45e64a798528dbda

* ChibiOS conf upgrade for cannonkeys/iron165

 cannonkeys/iron165 - 0814ec4067d9857b0134e38384f272cf7172fb03

* ChibiOS conf upgrade for cannonkeys/obliterated75

 cannonkeys/obliterated75 - 0f376e5d9a232c62e9c60f8fdc81d12732352ddc

* ChibiOS conf upgrade for cannonkeys/onyx

 cannonkeys/onyx - d35134ebe09046b91ab176035d3742d80b23ed8e

* ChibiOS conf upgrade for cannonkeys/ortho48

 cannonkeys/ortho48 - 828dbfbb013ff4fefe75044b3c9fd31fec5e95a1

* ChibiOS conf upgrade for cannonkeys/ortho60

 cannonkeys/ortho60 - 2aca4dd4234e0dac828f5fa15ae5b3bc3c0605dc

* ChibiOS conf upgrade for cannonkeys/ortho75

 cannonkeys/ortho75 - 4af8aaaded0ff53e9c01473f5968cc169f268647

* ChibiOS conf upgrade for cannonkeys/practice60

 cannonkeys/practice60 - e01df551d9483eeb3f825fcc453317fe65f674b5

* ChibiOS conf upgrade for cannonkeys/practice65

 cannonkeys/practice65 - 156163789d4c96cdd4787895788c1d02a2367f5c

* ChibiOS conf upgrade for cannonkeys/rekt1800

 cannonkeys/rekt1800 - 15882afb6373dea3e5f7ed13c19744ee2463f3bf

* ChibiOS conf upgrade for cannonkeys/sagittarius

 cannonkeys/sagittarius - f49fee611ffcc02cb3dc7f249fc8c83f136907b9

* ChibiOS conf upgrade for cannonkeys/satisfaction75

 cannonkeys/satisfaction75 - 2c9fbbea3a38820774f6ff436ef51017b545475a

* ChibiOS conf upgrade for cannonkeys/savage65

 cannonkeys/savage65 - ddd764be363c46f3e9b1a16151bd02d8f66b2dd4

* ChibiOS conf upgrade for cannonkeys/tmov2

 cannonkeys/tmov2 - 7af36cd2a42015838b77697624e90008ffa72778

* ChibiOS conf upgrade for cannonkeys/tsukuyomi

 cannonkeys/tsukuyomi - a120bea5dacb2cd6f143458cece46d2860ea196d

* ChibiOS conf upgrade for cheshire/curiosity

 cheshire/curiosity - 93d8fe3b7a8e028d4b015941ee71b50afe86bc8a

* ChibiOS conf upgrade for coarse/cordillera

 coarse/cordillera - 7d986d3f534786f302cbf74a5e6b7e51ffe60093

* ChibiOS conf upgrade for converter/siemens_tastatur

 converter/siemens_tastatur - 3f79f1467bbc56f284aceafd76ab5c6a1cbb68f4

* ChibiOS conf upgrade for cutie_club/borsdorf

 cutie_club/borsdorf - f8c6015b7aacfd5edef4f22f719eea30660005e7

* ChibiOS conf upgrade for dekunukem/duckypad

 dekunukem/duckypad - d9c162d0867d3925cca2e653a3a3870eac2d23d2

* ChibiOS conf upgrade for ebastler/isometria_75/rev1

 ebastler/isometria_75/rev1 - 2ecdd00b8c6cc794a7014747185b88374d5766c0

* ChibiOS conf upgrade for ergodox_infinity

 ergodox_infinity - 76736c701db22e890764481c25bd38badf32a1cf

* ChibiOS conf upgrade for ergodox_stm32

 ergodox_stm32 - a7bdb0b7822617ca0f9d316a082874ac0fef5964

* ChibiOS conf upgrade for function96

 function96 - 1b9e394a86dab24b85d160afe9281b5e7652afe2

* ChibiOS conf upgrade for geekboards/macropad_v2

 geekboards/macropad_v2 - de261e46a42cc7b7ff793e26200669f94b1dbb18

* ChibiOS conf upgrade for generic_panda/panda65_01

 generic_panda/panda65_01 - 592d2443033875e0309506aa8cb5212389054458

* ChibiOS conf upgrade for handwired/ck4x4

 handwired/ck4x4 - 9d7d4af7f2d787afd638e976334cd37c490040d7

* ChibiOS conf upgrade for handwired/onekey/blackpill_f401

 handwired/onekey/blackpill_f401 - c9257a30203b3a0e5aa18b35e07281fcd043ab5d

* ChibiOS conf upgrade for handwired/onekey/blackpill_f411

 handwired/onekey/blackpill_f411 - dfccc2c6b245cfb561faba60c9f3fc7af8c3db30

* ChibiOS conf upgrade for handwired/onekey/bluepill

 handwired/onekey/bluepill - 393f4b94e9a0fbc9cd00de1acde346ad72250b4a

* ChibiOS conf upgrade for handwired/onekey/stm32f0_disco

 handwired/onekey/stm32f0_disco - d827881f9bed09fd41c7c4e9d066e96b6643a099

* ChibiOS conf upgrade for handwired/onekey/teensy_32

 handwired/onekey/teensy_32 - dd90f6c823da80ba43afa41249a2bdbbab98b04c

* ChibiOS conf upgrade for handwired/onekey/teensy_lc

 handwired/onekey/teensy_lc - 34596f2eeb62403cce532d20cf893ebd77fe2d05

* ChibiOS conf upgrade for handwired/pill60/blackpill_f401

 handwired/pill60/blackpill_f401 - 20bbccb5058085076357f4fa956eede2c0af86e8

* ChibiOS conf upgrade for handwired/pill60/blackpill_f411

 handwired/pill60/blackpill_f411 - e03a4c3ec3b9ba65b8067126a039a8eb2cd10e51

* ChibiOS conf upgrade for handwired/pill60/bluepill

 handwired/pill60/bluepill - 2fb721fb4376cde2067eed1c0c8acbf3bf5851c3

* ChibiOS conf upgrade for handwired/riblee_f401

 handwired/riblee_f401 - 2823cd98d64c91b146dae343a32176d51772952b

* ChibiOS conf upgrade for handwired/riblee_f411

 handwired/riblee_f411 - 5cf7589c9a11c4ed14e7d28676ac836fbb07d013

* ChibiOS conf upgrade for handwired/sono1

 handwired/sono1 - d972acee03efb4917fc42f7d72c0a416b67ebd4a

* ChibiOS conf upgrade for handwired/t111

 handwired/t111 - f947c1d59025fe04e7d7b999d80e20277be4366c

* ChibiOS conf upgrade for handwired/twadlee/tp69

 handwired/twadlee/tp69 - 48ab62464ba1f2651f4468cbec7c6058e3b8c158

* ChibiOS conf upgrade for handwired/z150

 handwired/z150 - 35e85696845e965d7f2dcdb372ed20c17d42c2bb

* ChibiOS conf upgrade for hub20

 hub20 - f094036a182169b5a73f89f09f2ccaa3e5fc9e7e

* ChibiOS conf upgrade for iron180

 iron180 - 5efb6f21c848b3c964795d9debddceac7628933d

* ChibiOS conf upgrade for jm60

 jm60 - dbbdbe8b27b3c1d0a25981b2f75728d163d5d299

* ChibiOS conf upgrade for keebio/bdn9/rev2

 keebio/bdn9/rev2 - 0031632523dddfc8f7b3a02cf9c5990ebbb3856d

* ChibiOS conf upgrade for keebio/choconum

 keebio/choconum - 4484ef6936a497610ca5ae4d378bc07b2bc1b1c7

* ChibiOS conf upgrade for matrix/m20add

 matrix/m20add - 6068aeff5b14c26de8838180f4397800abe9f1aa

* ChibiOS conf upgrade for matrix/noah

 matrix/noah - fcde175fb1d3f5bf0716ac5a880c2cc9ab4bbf7f

* ChibiOS conf upgrade for misterknife/knife66

 misterknife/knife66 - e7f3ceffb94fb8e680da2af27fa7cb1a0a52b699

* ChibiOS conf upgrade for misterknife/knife66_iso

 misterknife/knife66_iso - ee027db939c098f908f70f02ffa9cc3952139f70

* ChibiOS conf upgrade for nebula12

 nebula12 - 2f3a25b6675dcd0fabe75e7bb63038d3cac19610

* ChibiOS conf upgrade for nemui

 nemui - 4030faa372512f766fd747876cb28176302453f9

* ChibiOS conf upgrade for nibiria/stream15

 nibiria/stream15 - fd7b09affa208403099ef9bff1b756fac0d4f918

* ChibiOS conf upgrade for nightingale_studios/hailey

 nightingale_studios/hailey - 496a44b2f789cc59a6110c7c1c41d57e59c722be

* ChibiOS conf upgrade for planck/rev6

 planck/rev6 - 6fb8f0bc21b4ab774ce3d339fdf6f25d96059f10

* ChibiOS conf upgrade for primekb/meridian

 primekb/meridian - 8021ed99e8bdf92faab806780186cc924dd59e50

* ChibiOS conf upgrade for projectkb/alice

 projectkb/alice - ad7678d475a14c54f28b62d1c1b15f5b4c4448bc

* ChibiOS conf upgrade for projectkb/signature87

 projectkb/signature87 - de61338b0a5c477f39c000df8117dd3017c2643d

* ChibiOS conf upgrade for ramonimbao/squishy65

 ramonimbao/squishy65 - 2ea1a8b18c39d0e193bbbf5836191874d3aafc53

* ChibiOS conf upgrade for ramonimbao/wete

 ramonimbao/wete - a80b3b309f06566adcdf20234d81c1d5aa599b00

* ChibiOS conf upgrade for rart/rartlice

 rart/rartlice - c8c80c302428d62bb8b08e3185509a233a94f5f0

* ChibiOS conf upgrade for retro_75

 retro_75 - 7434e266bba43ded8ca1ff75d77faa506473ca91

* ChibiOS conf upgrade for rocketboard_16

 rocketboard_16 - 1182a8730a84b58eba5a470286b6db6134d36f54

* ChibiOS conf upgrade for satt/vision

 satt/vision - c85a28a8d7e321511a17a7e7084d0a7876d1779a

* ChibiOS conf upgrade for technika

 technika - 7c59de348f0ec5f6ac9e260806a87aaf16fbafa2

* ChibiOS conf upgrade for tkc/godspeed75

 tkc/godspeed75 - e447b39dca393736fbf289049699d5b4748bb8c6

* ChibiOS conf upgrade for tkw/stoutgat/v2/f411

 tkw/stoutgat/v2/f411 - 58e9b909379ad107affbff0508e3923264b75426

* ChibiOS conf upgrade for viktus/styrka

 viktus/styrka - 36bf0921be79a8b037fdc25343584574a312be60

* ChibiOS conf upgrade for westfoxtrot/prophet

 westfoxtrot/prophet - 80036c8f986c8d3261d6b0748d2057eccab6430b

* ChibiOS conf upgrade for whitefox

 whitefox - c9eccac0196c3e2e2ea6c90d3036283a3eabff2c

* ChibiOS conf upgrade for wolfmarkclub/wm1

 wolfmarkclub/wm1 - 0d22a426255b829a7805bd6a3ff927198b1e31b4

* ChibiOS conf upgrade for xelus/kangaroo

 xelus/kangaroo - fdb1ffb66f4841f662e968929f058d4fd403c97e

* ChibiOS conf upgrade for xelus/trinityxttkl

 xelus/trinityxttkl - a9641e5b39b7bb38351b9109f0f381837b2e8e79

* ChibiOS conf upgrade for xelus/valor_frl_tkl

 xelus/valor_frl_tkl - 6c3b577852736a68727ec319c30712b3088e65cd

* ChibiOS conf upgrade for xiaomi/mk02

 xiaomi/mk02 - 4c1406ebfee73551a844ef7ab29fc5788d7e875c

* ChibiOS conf upgrade for zoo/wampus

 zoo/wampus - 930c903e85478e220a235f45593c03512c66bc2a

* ChibiOS conf upgrade for zvecr/split_blackpill

 zvecr/split_blackpill - c0e3e1583262e4cb0ebfe2efa6356ed6c5c957ca
---
 keyboards/acheron/arctic/chconf.h                  | 12 --------
 keyboards/acheron/austin/chconf.h                  | 14 ---------
 keyboards/acheron/keebspcb/chconf.h                | 14 ---------
 keyboards/acheron/lasgweloth/chconf.h              | 12 --------
 keyboards/aeboards/ext65/rev2/chconf.h             | 12 --------
 keyboards/ai03/vega/chconf.h                       | 14 ---------
 keyboards/akegata_denki/device_one/chconf.h        |  4 ---
 keyboards/at_at/660m/chconf.h                      | 14 ---------
 keyboards/box75/chconf.h                           | 12 --------
 keyboards/bt66tech/bt66tech60/chconf.h             | 12 --------
 keyboards/cannonkeys/an_c/chconf.h                 | 14 ---------
 keyboards/cannonkeys/atlas/chconf.h                | 14 ---------
 keyboards/cannonkeys/chimera65/chconf.h            | 14 ---------
 keyboards/cannonkeys/db60/chconf.h                 | 14 ---------
 keyboards/cannonkeys/devastatingtkl/chconf.h       | 14 ---------
 keyboards/cannonkeys/instant60/chconf.h            | 14 ---------
 keyboards/cannonkeys/instant65/chconf.h            | 14 ---------
 keyboards/cannonkeys/iron165/chconf.h              | 14 ---------
 keyboards/cannonkeys/obliterated75/chconf.h        | 14 ---------
 keyboards/cannonkeys/onyx/chconf.h                 |  2 --
 keyboards/cannonkeys/ortho48/chconf.h              | 12 --------
 keyboards/cannonkeys/ortho60/chconf.h              | 12 --------
 keyboards/cannonkeys/ortho75/chconf.h              | 12 --------
 keyboards/cannonkeys/practice60/chconf.h           | 12 --------
 keyboards/cannonkeys/practice65/chconf.h           | 12 --------
 keyboards/cannonkeys/rekt1800/chconf.h             | 14 ---------
 keyboards/cannonkeys/sagittarius/chconf.h          |  2 --
 keyboards/cannonkeys/satisfaction75/chconf.h       | 14 ---------
 keyboards/cannonkeys/savage65/chconf.h             | 14 ---------
 keyboards/cannonkeys/tmov2/chconf.h                | 14 ---------
 keyboards/cannonkeys/tsukuyomi/chconf.h            | 14 ---------
 keyboards/cheshire/curiosity/chconf.h              | 12 --------
 keyboards/coarse/cordillera/chconf.h               | 12 --------
 keyboards/converter/siemens_tastatur/chconf.h      | 12 --------
 keyboards/cutie_club/borsdorf/chconf.h             |  2 --
 keyboards/dekunukem/duckypad/chconf.h              | 12 --------
 keyboards/ebastler/isometria_75/rev1/chconf.h      | 35 +++++++++++++---------
 keyboards/ebastler/isometria_75/rev1/halconf.h     | 31 +++++++++++--------
 keyboards/ergodox_infinity/chconf.h                |  3 +-
 keyboards/ergodox_stm32/chconf.h                   |  4 ---
 keyboards/function96/chconf.h                      | 14 ---------
 keyboards/geekboards/macropad_v2/chconf.h          | 14 ---------
 keyboards/generic_panda/panda65_01/chconf.h        | 14 ---------
 keyboards/handwired/ck4x4/chconf.h                 | 14 ---------
 keyboards/handwired/onekey/blackpill_f401/chconf.h |  4 ---
 .../handwired/onekey/blackpill_f401/halconf.h      | 32 ++++++++++++--------
 keyboards/handwired/onekey/blackpill_f411/chconf.h |  4 ---
 .../handwired/onekey/blackpill_f411/halconf.h      | 32 ++++++++++++--------
 keyboards/handwired/onekey/bluepill/chconf.h       | 12 --------
 keyboards/handwired/onekey/stm32f0_disco/chconf.h  | 14 ---------
 keyboards/handwired/onekey/teensy_32/chconf.h      |  6 ----
 keyboards/handwired/onekey/teensy_lc/chconf.h      |  6 ----
 keyboards/handwired/pill60/blackpill_f401/chconf.h |  4 ---
 .../handwired/pill60/blackpill_f401/halconf.h      | 32 ++++++++++++--------
 keyboards/handwired/pill60/blackpill_f411/chconf.h |  4 ---
 .../handwired/pill60/blackpill_f411/halconf.h      | 32 ++++++++++++--------
 keyboards/handwired/pill60/bluepill/chconf.h       | 12 --------
 keyboards/handwired/riblee_f401/chconf.h           |  4 ---
 keyboards/handwired/riblee_f411/chconf.h           |  4 ---
 keyboards/handwired/riblee_f411/halconf.h          | 31 +++++++++++--------
 keyboards/handwired/sono1/chconf.h                 | 12 --------
 keyboards/handwired/t111/chconf.h                  | 12 --------
 keyboards/handwired/twadlee/tp69/chconf.h          |  6 ----
 keyboards/handwired/z150/chconf.h                  | 12 --------
 keyboards/hub20/chconf.h                           |  2 --
 keyboards/iron180/chconf.h                         | 12 --------
 keyboards/jm60/chconf.h                            |  4 ---
 keyboards/keebio/bdn9/rev2/chconf.h                | 14 ---------
 keyboards/keebio/choconum/chconf.h                 | 14 ---------
 keyboards/matrix/m20add/chconf.h                   |  4 ---
 keyboards/matrix/noah/chconf.h                     |  4 ---
 keyboards/misterknife/knife66/chconf.h             | 14 ---------
 keyboards/misterknife/knife66_iso/chconf.h         | 14 ---------
 keyboards/nebula12/chconf.h                        | 14 ---------
 keyboards/nemui/chconf.h                           | 14 ---------
 keyboards/nibiria/stream15/chconf.h                |  2 --
 keyboards/nightingale_studios/hailey/chconf.h      | 19 ------------
 keyboards/nightingale_studios/hailey/halconf.h     | 26 ----------------
 keyboards/planck/rev6/chconf.h                     | 18 +++++++----
 keyboards/primekb/meridian/chconf.h                | 14 ---------
 keyboards/projectkb/alice/chconf.h                 | 14 ---------
 keyboards/projectkb/signature87/chconf.h           | 14 ---------
 keyboards/ramonimbao/squishy65/chconf.h            | 14 ---------
 keyboards/ramonimbao/wete/chconf.h                 | 14 ---------
 keyboards/rart/rartlice/chconf.h                   | 12 --------
 keyboards/retro_75/chconf.h                        | 12 --------
 keyboards/rocketboard_16/chconf.h                  | 12 --------
 keyboards/satt/vision/chconf.h                     | 14 ---------
 keyboards/technika/chconf.h                        | 12 --------
 keyboards/tkc/godspeed75/chconf.h                  | 14 ---------
 keyboards/tkw/stoutgat/v2/f411/chconf.h            | 25 ----------------
 keyboards/viktus/styrka/chconf.h                   | 14 ---------
 keyboards/westfoxtrot/prophet/chconf.h             | 14 ---------
 keyboards/whitefox/chconf.h                        |  3 +-
 keyboards/wolfmarkclub/wm1/chconf.h                | 12 --------
 keyboards/xelus/kangaroo/chconf.h                  | 14 ---------
 keyboards/xelus/trinityxttkl/chconf.h              | 14 ---------
 keyboards/xelus/valor_frl_tkl/chconf.h             | 14 ---------
 keyboards/xiaomi/mk02/chconf.h                     |  2 --
 keyboards/zoo/wampus/chconf.h                      | 12 --------
 keyboards/zvecr/split_blackpill/chconf.h           | 12 --------
 lib/python/qmk/cli/chibios/confmigrate.py          |  7 +++--
 102 files changed, 158 insertions(+), 1140 deletions(-)
 delete mode 100644 keyboards/nightingale_studios/hailey/chconf.h
 delete mode 100644 keyboards/nightingale_studios/hailey/halconf.h
 delete mode 100644 keyboards/tkw/stoutgat/v2/f411/chconf.h

(limited to 'lib/python/qmk/cli')

diff --git a/keyboards/acheron/arctic/chconf.h b/keyboards/acheron/arctic/chconf.h
index 1be94008b..438ec8ec3 100644
--- a/keyboards/acheron/arctic/chconf.h
+++ b/keyboards/acheron/arctic/chconf.h
@@ -25,19 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/acheron/austin/chconf.h b/keyboards/acheron/austin/chconf.h
index 08567482d..35fb88318 100644
--- a/keyboards/acheron/austin/chconf.h
+++ b/keyboards/acheron/austin/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/acheron/keebspcb/chconf.h b/keyboards/acheron/keebspcb/chconf.h
index c34640ac0..6801ae9a5 100644
--- a/keyboards/acheron/keebspcb/chconf.h
+++ b/keyboards/acheron/keebspcb/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/acheron/lasgweloth/chconf.h b/keyboards/acheron/lasgweloth/chconf.h
index a972edf03..94e724a1f 100644
--- a/keyboards/acheron/lasgweloth/chconf.h
+++ b/keyboards/acheron/lasgweloth/chconf.h
@@ -25,19 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/aeboards/ext65/rev2/chconf.h b/keyboards/aeboards/ext65/rev2/chconf.h
index 472690105..5af0aad34 100644
--- a/keyboards/aeboards/ext65/rev2/chconf.h
+++ b/keyboards/aeboards/ext65/rev2/chconf.h
@@ -25,19 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/ai03/vega/chconf.h b/keyboards/ai03/vega/chconf.h
index 2e0092e3e..822691e22 100644
--- a/keyboards/ai03/vega/chconf.h
+++ b/keyboards/ai03/vega/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/akegata_denki/device_one/chconf.h b/keyboards/akegata_denki/device_one/chconf.h
index d96371e05..f2cad9895 100644
--- a/keyboards/akegata_denki/device_one/chconf.h
+++ b/keyboards/akegata_denki/device_one/chconf.h
@@ -33,8 +33,6 @@
 
 #define CH_CFG_USE_MAILBOXES TRUE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
 #define CH_CFG_USE_HEAP TRUE
 
 #define CH_CFG_USE_MEMPOOLS TRUE
@@ -45,8 +43,6 @@
 
 #define CH_CFG_USE_DYNAMIC TRUE
 
-#define CH_CFG_USE_FACTORY FALSE
-
 #define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
 
 #define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/at_at/660m/chconf.h b/keyboards/at_at/660m/chconf.h
index 672c3e44c..49649adb3 100644
--- a/keyboards/at_at/660m/chconf.h
+++ b/keyboards/at_at/660m/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/box75/chconf.h b/keyboards/box75/chconf.h
index ca99ad8cc..769b29f22 100644
--- a/keyboards/box75/chconf.h
+++ b/keyboards/box75/chconf.h
@@ -25,19 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/bt66tech/bt66tech60/chconf.h b/keyboards/bt66tech/bt66tech60/chconf.h
index b0d978988..93c4ebe40 100644
--- a/keyboards/bt66tech/bt66tech60/chconf.h
+++ b/keyboards/bt66tech/bt66tech60/chconf.h
@@ -23,19 +23,7 @@
 
 #define CH_CFG_ST_TIMEDELTA 0
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/cannonkeys/an_c/chconf.h b/keyboards/cannonkeys/an_c/chconf.h
index 81ebe98fc..0f07a8ba9 100644
--- a/keyboards/cannonkeys/an_c/chconf.h
+++ b/keyboards/cannonkeys/an_c/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/cannonkeys/atlas/chconf.h b/keyboards/cannonkeys/atlas/chconf.h
index e4692d9df..1b3da00c0 100644
--- a/keyboards/cannonkeys/atlas/chconf.h
+++ b/keyboards/cannonkeys/atlas/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/cannonkeys/chimera65/chconf.h b/keyboards/cannonkeys/chimera65/chconf.h
index de89ae272..644ca1c1c 100644
--- a/keyboards/cannonkeys/chimera65/chconf.h
+++ b/keyboards/cannonkeys/chimera65/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/cannonkeys/db60/chconf.h b/keyboards/cannonkeys/db60/chconf.h
index 0df06ecc1..9f541944f 100644
--- a/keyboards/cannonkeys/db60/chconf.h
+++ b/keyboards/cannonkeys/db60/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/cannonkeys/devastatingtkl/chconf.h b/keyboards/cannonkeys/devastatingtkl/chconf.h
index cc63adc45..677ee1388 100644
--- a/keyboards/cannonkeys/devastatingtkl/chconf.h
+++ b/keyboards/cannonkeys/devastatingtkl/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/cannonkeys/instant60/chconf.h b/keyboards/cannonkeys/instant60/chconf.h
index 8c40cd808..ac649b27d 100644
--- a/keyboards/cannonkeys/instant60/chconf.h
+++ b/keyboards/cannonkeys/instant60/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/cannonkeys/instant65/chconf.h b/keyboards/cannonkeys/instant65/chconf.h
index c82db1041..91f1ae9c0 100644
--- a/keyboards/cannonkeys/instant65/chconf.h
+++ b/keyboards/cannonkeys/instant65/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/cannonkeys/iron165/chconf.h b/keyboards/cannonkeys/iron165/chconf.h
index 69a54bbbb..7c6af767f 100644
--- a/keyboards/cannonkeys/iron165/chconf.h
+++ b/keyboards/cannonkeys/iron165/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/cannonkeys/obliterated75/chconf.h b/keyboards/cannonkeys/obliterated75/chconf.h
index 62dc90732..645412d47 100644
--- a/keyboards/cannonkeys/obliterated75/chconf.h
+++ b/keyboards/cannonkeys/obliterated75/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/cannonkeys/onyx/chconf.h b/keyboards/cannonkeys/onyx/chconf.h
index 61e5dcb6a..40aa1fd9b 100644
--- a/keyboards/cannonkeys/onyx/chconf.h
+++ b/keyboards/cannonkeys/onyx/chconf.h
@@ -37,7 +37,5 @@
 
 #define CH_CFG_USE_MAILBOXES TRUE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/cannonkeys/ortho48/chconf.h b/keyboards/cannonkeys/ortho48/chconf.h
index a6d89716c..583eb9feb 100644
--- a/keyboards/cannonkeys/ortho48/chconf.h
+++ b/keyboards/cannonkeys/ortho48/chconf.h
@@ -23,19 +23,7 @@
 
 #define CH_CFG_ST_TIMEDELTA 0
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/cannonkeys/ortho60/chconf.h b/keyboards/cannonkeys/ortho60/chconf.h
index c9bc54b43..ae16c0f74 100644
--- a/keyboards/cannonkeys/ortho60/chconf.h
+++ b/keyboards/cannonkeys/ortho60/chconf.h
@@ -23,19 +23,7 @@
 
 #define CH_CFG_ST_TIMEDELTA 0
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/cannonkeys/ortho75/chconf.h b/keyboards/cannonkeys/ortho75/chconf.h
index 512dd7e5f..2bf13952d 100644
--- a/keyboards/cannonkeys/ortho75/chconf.h
+++ b/keyboards/cannonkeys/ortho75/chconf.h
@@ -23,19 +23,7 @@
 
 #define CH_CFG_ST_TIMEDELTA 0
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/cannonkeys/practice60/chconf.h b/keyboards/cannonkeys/practice60/chconf.h
index 4263e4a41..ddf9c24df 100644
--- a/keyboards/cannonkeys/practice60/chconf.h
+++ b/keyboards/cannonkeys/practice60/chconf.h
@@ -23,19 +23,7 @@
 
 #define CH_CFG_ST_TIMEDELTA 0
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/cannonkeys/practice65/chconf.h b/keyboards/cannonkeys/practice65/chconf.h
index ecf0d0461..0f412cfbf 100644
--- a/keyboards/cannonkeys/practice65/chconf.h
+++ b/keyboards/cannonkeys/practice65/chconf.h
@@ -23,19 +23,7 @@
 
 #define CH_CFG_ST_TIMEDELTA 0
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/cannonkeys/rekt1800/chconf.h b/keyboards/cannonkeys/rekt1800/chconf.h
index 63148d5ce..6df38c652 100644
--- a/keyboards/cannonkeys/rekt1800/chconf.h
+++ b/keyboards/cannonkeys/rekt1800/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/cannonkeys/sagittarius/chconf.h b/keyboards/cannonkeys/sagittarius/chconf.h
index de42fc7db..f94932c6e 100644
--- a/keyboards/cannonkeys/sagittarius/chconf.h
+++ b/keyboards/cannonkeys/sagittarius/chconf.h
@@ -37,7 +37,5 @@
 
 #define CH_CFG_USE_MAILBOXES TRUE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/cannonkeys/satisfaction75/chconf.h b/keyboards/cannonkeys/satisfaction75/chconf.h
index fffb7a905..ca4a976c2 100644
--- a/keyboards/cannonkeys/satisfaction75/chconf.h
+++ b/keyboards/cannonkeys/satisfaction75/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/cannonkeys/savage65/chconf.h b/keyboards/cannonkeys/savage65/chconf.h
index 8329725a7..f3eb1c05e 100644
--- a/keyboards/cannonkeys/savage65/chconf.h
+++ b/keyboards/cannonkeys/savage65/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/cannonkeys/tmov2/chconf.h b/keyboards/cannonkeys/tmov2/chconf.h
index 4830d0b27..6cc4e27c1 100644
--- a/keyboards/cannonkeys/tmov2/chconf.h
+++ b/keyboards/cannonkeys/tmov2/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/cannonkeys/tsukuyomi/chconf.h b/keyboards/cannonkeys/tsukuyomi/chconf.h
index e6cdb8763..7239dcafc 100644
--- a/keyboards/cannonkeys/tsukuyomi/chconf.h
+++ b/keyboards/cannonkeys/tsukuyomi/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/cheshire/curiosity/chconf.h b/keyboards/cheshire/curiosity/chconf.h
index 2782412be..daed31812 100644
--- a/keyboards/cheshire/curiosity/chconf.h
+++ b/keyboards/cheshire/curiosity/chconf.h
@@ -25,20 +25,8 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
 
 #define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/coarse/cordillera/chconf.h b/keyboards/coarse/cordillera/chconf.h
index 60aebdea1..4f9d43325 100644
--- a/keyboards/coarse/cordillera/chconf.h
+++ b/keyboards/coarse/cordillera/chconf.h
@@ -25,19 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/converter/siemens_tastatur/chconf.h b/keyboards/converter/siemens_tastatur/chconf.h
index 2253cfab1..eed5776e7 100644
--- a/keyboards/converter/siemens_tastatur/chconf.h
+++ b/keyboards/converter/siemens_tastatur/chconf.h
@@ -23,19 +23,7 @@
 
 #define CH_CFG_ST_TIMEDELTA 0
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/cutie_club/borsdorf/chconf.h b/keyboards/cutie_club/borsdorf/chconf.h
index c5242220b..7005cf234 100644
--- a/keyboards/cutie_club/borsdorf/chconf.h
+++ b/keyboards/cutie_club/borsdorf/chconf.h
@@ -37,7 +37,5 @@
 
 #define CH_CFG_USE_MAILBOXES TRUE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/dekunukem/duckypad/chconf.h b/keyboards/dekunukem/duckypad/chconf.h
index f23a91114..2d1b7a3bf 100644
--- a/keyboards/dekunukem/duckypad/chconf.h
+++ b/keyboards/dekunukem/duckypad/chconf.h
@@ -25,20 +25,8 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
 
 #define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/ebastler/isometria_75/rev1/chconf.h b/keyboards/ebastler/isometria_75/rev1/chconf.h
index 58a9736f1..1716aa6cc 100644
--- a/keyboards/ebastler/isometria_75/rev1/chconf.h
+++ b/keyboards/ebastler/isometria_75/rev1/chconf.h
@@ -1,22 +1,29 @@
-/* Copyright 2020 Moritz Plattner (ebastler)
+/* Copyright 2020 QMK
  *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/ebastler/isometria_75/rev1/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ */
+
 #pragma once
 
-/* Change system timer resolution, because TIM2 and TIM3 are different */
-#define CH_CFG_ST_RESOLUTION                16
-#define CH_CFG_INTERVALS_SIZE               16
+#define CH_CFG_ST_RESOLUTION 16
+
+#define CH_CFG_INTERVALS_SIZE 16
 
 #include_next <chconf.h>
+
diff --git a/keyboards/ebastler/isometria_75/rev1/halconf.h b/keyboards/ebastler/isometria_75/rev1/halconf.h
index 463f9accb..6fbac77af 100644
--- a/keyboards/ebastler/isometria_75/rev1/halconf.h
+++ b/keyboards/ebastler/isometria_75/rev1/halconf.h
@@ -1,20 +1,27 @@
-/* Copyright 2020 Moritz Plattner (ebastler)
+/* Copyright 2020 QMK
  *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/ebastler/isometria_75/rev1/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
 #pragma once
 
 #define HAL_USE_PWM TRUE
 
-#include_next <halconf.h>
\ No newline at end of file
+#include_next <halconf.h>
+
diff --git a/keyboards/ergodox_infinity/chconf.h b/keyboards/ergodox_infinity/chconf.h
index d3860afbe..710d8aa43 100644
--- a/keyboards/ergodox_infinity/chconf.h
+++ b/keyboards/ergodox_infinity/chconf.h
@@ -29,10 +29,9 @@
 
 #define CH_CFG_USE_WAITEXIT TRUE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
 #define CH_CFG_USE_HEAP TRUE
 
 #define CH_CFG_USE_DYNAMIC TRUE
 
 #include_next <chconf.h>
+
diff --git a/keyboards/ergodox_stm32/chconf.h b/keyboards/ergodox_stm32/chconf.h
index e9f16c880..bc3672f6f 100644
--- a/keyboards/ergodox_stm32/chconf.h
+++ b/keyboards/ergodox_stm32/chconf.h
@@ -35,8 +35,6 @@
 
 #define CH_CFG_USE_MAILBOXES TRUE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
 #define CH_CFG_USE_HEAP TRUE
 
 #define CH_CFG_USE_MEMPOOLS TRUE
@@ -47,8 +45,6 @@
 
 #define CH_CFG_USE_DYNAMIC TRUE
 
-#define CH_CFG_USE_FACTORY FALSE
-
 #define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
 
 #define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/function96/chconf.h b/keyboards/function96/chconf.h
index 521da596f..c8e4b98ad 100644
--- a/keyboards/function96/chconf.h
+++ b/keyboards/function96/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/geekboards/macropad_v2/chconf.h b/keyboards/geekboards/macropad_v2/chconf.h
index aec464019..13cb5645d 100644
--- a/keyboards/geekboards/macropad_v2/chconf.h
+++ b/keyboards/geekboards/macropad_v2/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/generic_panda/panda65_01/chconf.h b/keyboards/generic_panda/panda65_01/chconf.h
index b53557576..847f2cc28 100644
--- a/keyboards/generic_panda/panda65_01/chconf.h
+++ b/keyboards/generic_panda/panda65_01/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/handwired/ck4x4/chconf.h b/keyboards/handwired/ck4x4/chconf.h
index 13281bd76..524edbe8f 100644
--- a/keyboards/handwired/ck4x4/chconf.h
+++ b/keyboards/handwired/ck4x4/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/handwired/onekey/blackpill_f401/chconf.h b/keyboards/handwired/onekey/blackpill_f401/chconf.h
index 69b87423a..de4ab83ec 100644
--- a/keyboards/handwired/onekey/blackpill_f401/chconf.h
+++ b/keyboards/handwired/onekey/blackpill_f401/chconf.h
@@ -23,10 +23,6 @@
 
 #define CH_CFG_ST_FREQUENCY 10000
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_FACTORY FALSE
-
 #define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
 
 #define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/handwired/onekey/blackpill_f401/halconf.h b/keyboards/handwired/onekey/blackpill_f401/halconf.h
index ae08512d4..878879db1 100644
--- a/keyboards/handwired/onekey/blackpill_f401/halconf.h
+++ b/keyboards/handwired/onekey/blackpill_f401/halconf.h
@@ -1,21 +1,29 @@
-/* Copyright 2020 Nick Brassel (tzarc)
+/* Copyright 2020 QMK
  *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/blackpill_f401/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
 #pragma once
 
 #define HAL_USE_I2C TRUE
+
 #define HAL_USE_PWM TRUE
 
-#include_next "halconf.h"
+#include_next <halconf.h>
+
diff --git a/keyboards/handwired/onekey/blackpill_f411/chconf.h b/keyboards/handwired/onekey/blackpill_f411/chconf.h
index aa3372fc3..4ecd0f52a 100644
--- a/keyboards/handwired/onekey/blackpill_f411/chconf.h
+++ b/keyboards/handwired/onekey/blackpill_f411/chconf.h
@@ -23,10 +23,6 @@
 
 #define CH_CFG_ST_FREQUENCY 10000
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_FACTORY FALSE
-
 #define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
 
 #define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/handwired/onekey/blackpill_f411/halconf.h b/keyboards/handwired/onekey/blackpill_f411/halconf.h
index ae08512d4..d54f2a26a 100644
--- a/keyboards/handwired/onekey/blackpill_f411/halconf.h
+++ b/keyboards/handwired/onekey/blackpill_f411/halconf.h
@@ -1,21 +1,29 @@
-/* Copyright 2020 Nick Brassel (tzarc)
+/* Copyright 2020 QMK
  *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/blackpill_f411/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
 #pragma once
 
 #define HAL_USE_I2C TRUE
+
 #define HAL_USE_PWM TRUE
 
-#include_next "halconf.h"
+#include_next <halconf.h>
+
diff --git a/keyboards/handwired/onekey/bluepill/chconf.h b/keyboards/handwired/onekey/bluepill/chconf.h
index 46d8af4a8..c7a982aed 100644
--- a/keyboards/handwired/onekey/bluepill/chconf.h
+++ b/keyboards/handwired/onekey/bluepill/chconf.h
@@ -23,19 +23,7 @@
 
 #define CH_CFG_ST_TIMEDELTA 0
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/handwired/onekey/stm32f0_disco/chconf.h b/keyboards/handwired/onekey/stm32f0_disco/chconf.h
index cfec50b6e..33ceb1431 100644
--- a/keyboards/handwired/onekey/stm32f0_disco/chconf.h
+++ b/keyboards/handwired/onekey/stm32f0_disco/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/handwired/onekey/teensy_32/chconf.h b/keyboards/handwired/onekey/teensy_32/chconf.h
index c80efff69..199e8d05b 100644
--- a/keyboards/handwired/onekey/teensy_32/chconf.h
+++ b/keyboards/handwired/onekey/teensy_32/chconf.h
@@ -27,12 +27,6 @@
 
 #define CH_CFG_TIME_QUANTUM 20
 
-#define CH_CFG_USE_TM FALSE
-
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_FACTORY FALSE
-
 #define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
 
 #define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/handwired/onekey/teensy_lc/chconf.h b/keyboards/handwired/onekey/teensy_lc/chconf.h
index 5be02963c..cfcced3cf 100644
--- a/keyboards/handwired/onekey/teensy_lc/chconf.h
+++ b/keyboards/handwired/onekey/teensy_lc/chconf.h
@@ -27,12 +27,6 @@
 
 #define CH_CFG_TIME_QUANTUM 20
 
-#define CH_CFG_USE_TM FALSE
-
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_FACTORY FALSE
-
 #define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
 
 #define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/handwired/pill60/blackpill_f401/chconf.h b/keyboards/handwired/pill60/blackpill_f401/chconf.h
index 1664f045c..c10f1f287 100644
--- a/keyboards/handwired/pill60/blackpill_f401/chconf.h
+++ b/keyboards/handwired/pill60/blackpill_f401/chconf.h
@@ -23,10 +23,6 @@
 
 #define CH_CFG_ST_FREQUENCY 10000
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_FACTORY FALSE
-
 #define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
 
 #define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/handwired/pill60/blackpill_f401/halconf.h b/keyboards/handwired/pill60/blackpill_f401/halconf.h
index f1230634b..1e126a865 100644
--- a/keyboards/handwired/pill60/blackpill_f401/halconf.h
+++ b/keyboards/handwired/pill60/blackpill_f401/halconf.h
@@ -1,21 +1,29 @@
-/* Copyright 2020 Nick Brassel (tzarc)
+/* Copyright 2020 QMK
  *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/handwired/pill60/blackpill_f401/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
 #pragma once
 
 #define HAL_USE_I2C TRUE
+
 #define HAL_USE_PWM TRUE
 
-#include_next "halconf.h"
\ No newline at end of file
+#include_next <halconf.h>
+
diff --git a/keyboards/handwired/pill60/blackpill_f411/chconf.h b/keyboards/handwired/pill60/blackpill_f411/chconf.h
index 01a052754..fb7536ceb 100644
--- a/keyboards/handwired/pill60/blackpill_f411/chconf.h
+++ b/keyboards/handwired/pill60/blackpill_f411/chconf.h
@@ -23,10 +23,6 @@
 
 #define CH_CFG_ST_FREQUENCY 10000
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_FACTORY FALSE
-
 #define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
 
 #define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/handwired/pill60/blackpill_f411/halconf.h b/keyboards/handwired/pill60/blackpill_f411/halconf.h
index f1230634b..435bf3274 100644
--- a/keyboards/handwired/pill60/blackpill_f411/halconf.h
+++ b/keyboards/handwired/pill60/blackpill_f411/halconf.h
@@ -1,21 +1,29 @@
-/* Copyright 2020 Nick Brassel (tzarc)
+/* Copyright 2020 QMK
  *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/handwired/pill60/blackpill_f411/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
 #pragma once
 
 #define HAL_USE_I2C TRUE
+
 #define HAL_USE_PWM TRUE
 
-#include_next "halconf.h"
\ No newline at end of file
+#include_next <halconf.h>
+
diff --git a/keyboards/handwired/pill60/bluepill/chconf.h b/keyboards/handwired/pill60/bluepill/chconf.h
index 883ab46d1..c92d2a276 100644
--- a/keyboards/handwired/pill60/bluepill/chconf.h
+++ b/keyboards/handwired/pill60/bluepill/chconf.h
@@ -23,19 +23,7 @@
 
 #define CH_CFG_ST_TIMEDELTA 0
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/handwired/riblee_f401/chconf.h b/keyboards/handwired/riblee_f401/chconf.h
index 275f2b876..3b48fc5cd 100644
--- a/keyboards/handwired/riblee_f401/chconf.h
+++ b/keyboards/handwired/riblee_f401/chconf.h
@@ -23,10 +23,6 @@
 
 #define CH_CFG_ST_FREQUENCY 10000
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_FACTORY FALSE
-
 #define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
 
 #define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/handwired/riblee_f411/chconf.h b/keyboards/handwired/riblee_f411/chconf.h
index 7c20b34e7..36199f649 100644
--- a/keyboards/handwired/riblee_f411/chconf.h
+++ b/keyboards/handwired/riblee_f411/chconf.h
@@ -23,10 +23,6 @@
 
 #define CH_CFG_ST_FREQUENCY 10000
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_FACTORY FALSE
-
 #define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
 
 #define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/handwired/riblee_f411/halconf.h b/keyboards/handwired/riblee_f411/halconf.h
index d65408a1b..6084293ff 100644
--- a/keyboards/handwired/riblee_f411/halconf.h
+++ b/keyboards/handwired/riblee_f411/halconf.h
@@ -1,20 +1,27 @@
-/* Copyright 2020 Janos Daniel Reibl <janos.daniel.reibl@protonmail.com> @riblee
+/* Copyright 2020 QMK
  *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/handwired/riblee_f411/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
 #pragma once
 
 #define HAL_USE_I2C TRUE
 
-#include_next "halconf.h"
+#include_next <halconf.h>
+
diff --git a/keyboards/handwired/sono1/chconf.h b/keyboards/handwired/sono1/chconf.h
index 256dd73f9..f2330f083 100644
--- a/keyboards/handwired/sono1/chconf.h
+++ b/keyboards/handwired/sono1/chconf.h
@@ -23,19 +23,7 @@
 
 #define CH_CFG_ST_TIMEDELTA 0
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/handwired/t111/chconf.h b/keyboards/handwired/t111/chconf.h
index 3dae797c7..962653ec4 100644
--- a/keyboards/handwired/t111/chconf.h
+++ b/keyboards/handwired/t111/chconf.h
@@ -23,19 +23,7 @@
 
 #define CH_CFG_ST_TIMEDELTA 0
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/handwired/twadlee/tp69/chconf.h b/keyboards/handwired/twadlee/tp69/chconf.h
index d955082ae..6b35146c7 100644
--- a/keyboards/handwired/twadlee/tp69/chconf.h
+++ b/keyboards/handwired/twadlee/tp69/chconf.h
@@ -27,12 +27,6 @@
 
 #define CH_CFG_TIME_QUANTUM 20
 
-#define CH_CFG_USE_TM FALSE
-
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_FACTORY FALSE
-
 #define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
 
 #define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/handwired/z150/chconf.h b/keyboards/handwired/z150/chconf.h
index 54f9e834f..975667df0 100644
--- a/keyboards/handwired/z150/chconf.h
+++ b/keyboards/handwired/z150/chconf.h
@@ -23,19 +23,7 @@
 
 #define CH_CFG_ST_TIMEDELTA 0
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/hub20/chconf.h b/keyboards/hub20/chconf.h
index 5e08a4a7a..3ac134506 100644
--- a/keyboards/hub20/chconf.h
+++ b/keyboards/hub20/chconf.h
@@ -37,7 +37,5 @@
 
 #define CH_CFG_USE_MAILBOXES TRUE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/iron180/chconf.h b/keyboards/iron180/chconf.h
index 1218c8905..1a57dca36 100644
--- a/keyboards/iron180/chconf.h
+++ b/keyboards/iron180/chconf.h
@@ -25,19 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/jm60/chconf.h b/keyboards/jm60/chconf.h
index 4f28655fc..5bceae30a 100644
--- a/keyboards/jm60/chconf.h
+++ b/keyboards/jm60/chconf.h
@@ -35,8 +35,6 @@
 
 #define CH_CFG_USE_MAILBOXES TRUE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
 #define CH_CFG_USE_HEAP TRUE
 
 #define CH_CFG_USE_MEMPOOLS TRUE
@@ -47,8 +45,6 @@
 
 #define CH_CFG_USE_DYNAMIC TRUE
 
-#define CH_CFG_USE_FACTORY FALSE
-
 #define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
 
 #define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/keebio/bdn9/rev2/chconf.h b/keyboards/keebio/bdn9/rev2/chconf.h
index 98c1cdf54..7b1933eb1 100644
--- a/keyboards/keebio/bdn9/rev2/chconf.h
+++ b/keyboards/keebio/bdn9/rev2/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/keebio/choconum/chconf.h b/keyboards/keebio/choconum/chconf.h
index 262aa5807..350362ccb 100644
--- a/keyboards/keebio/choconum/chconf.h
+++ b/keyboards/keebio/choconum/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/matrix/m20add/chconf.h b/keyboards/matrix/m20add/chconf.h
index e1f154b1e..b2c8dec67 100644
--- a/keyboards/matrix/m20add/chconf.h
+++ b/keyboards/matrix/m20add/chconf.h
@@ -35,8 +35,6 @@
 
 #define CH_CFG_USE_MAILBOXES TRUE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
 #define CH_CFG_USE_HEAP TRUE
 
 #define CH_CFG_USE_MEMPOOLS TRUE
@@ -47,8 +45,6 @@
 
 #define CH_CFG_USE_DYNAMIC TRUE
 
-#define CH_CFG_USE_FACTORY FALSE
-
 #define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
 
 #define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/matrix/noah/chconf.h b/keyboards/matrix/noah/chconf.h
index ccf619fdc..94fe5f197 100644
--- a/keyboards/matrix/noah/chconf.h
+++ b/keyboards/matrix/noah/chconf.h
@@ -35,8 +35,6 @@
 
 #define CH_CFG_USE_MAILBOXES TRUE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
 #define CH_CFG_USE_HEAP TRUE
 
 #define CH_CFG_USE_MEMPOOLS TRUE
@@ -47,8 +45,6 @@
 
 #define CH_CFG_USE_DYNAMIC TRUE
 
-#define CH_CFG_USE_FACTORY FALSE
-
 #define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
 
 #define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/misterknife/knife66/chconf.h b/keyboards/misterknife/knife66/chconf.h
index b19c80a7b..58f2142ae 100644
--- a/keyboards/misterknife/knife66/chconf.h
+++ b/keyboards/misterknife/knife66/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/misterknife/knife66_iso/chconf.h b/keyboards/misterknife/knife66_iso/chconf.h
index 1d83a6712..d1fc8e153 100644
--- a/keyboards/misterknife/knife66_iso/chconf.h
+++ b/keyboards/misterknife/knife66_iso/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/nebula12/chconf.h b/keyboards/nebula12/chconf.h
index e34e007fe..51c2e7571 100644
--- a/keyboards/nebula12/chconf.h
+++ b/keyboards/nebula12/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/nemui/chconf.h b/keyboards/nemui/chconf.h
index 2e6e17f1a..4ee403413 100644
--- a/keyboards/nemui/chconf.h
+++ b/keyboards/nemui/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/nibiria/stream15/chconf.h b/keyboards/nibiria/stream15/chconf.h
index 257bb696a..44b49fc39 100644
--- a/keyboards/nibiria/stream15/chconf.h
+++ b/keyboards/nibiria/stream15/chconf.h
@@ -37,7 +37,5 @@
 
 #define CH_CFG_USE_MAILBOXES TRUE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/nightingale_studios/hailey/chconf.h b/keyboards/nightingale_studios/hailey/chconf.h
deleted file mode 100644
index 6d2fa9734..000000000
--- a/keyboards/nightingale_studios/hailey/chconf.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2020 zvecr<git@zvecr.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#define CH_CFG_USE_TM FALSE
-#include_next "chconf.h"
\ No newline at end of file
diff --git a/keyboards/nightingale_studios/hailey/halconf.h b/keyboards/nightingale_studios/hailey/halconf.h
deleted file mode 100644
index 8e3818ea2..000000000
--- a/keyboards/nightingale_studios/hailey/halconf.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2020 zvecr<git@zvecr.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#define HAL_USE_I2C FALSE
-#define HAL_USE_PWM FALSE
-#define HAL_USE_SPI FALSE
-#define HAL_USE_GPT FALSE
-#define HAL_USE_PWM FALSE
-#define HAL_USE_DAC FALSE
-
-#include_next "halconf.h"
diff --git a/keyboards/planck/rev6/chconf.h b/keyboards/planck/rev6/chconf.h
index 0298c11c4..e1243f23e 100644
--- a/keyboards/planck/rev6/chconf.h
+++ b/keyboards/planck/rev6/chconf.h
@@ -1,8 +1,8 @@
-/* Copyright 2020 QMK Contributors
+/* Copyright 2020 QMK
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation, either version 2 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -14,8 +14,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// Need to override the SysTick timer to use TIM3 -- this is a 16-bit timer on F303
-// so we need to change resolution and frequency to match.
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/planck/rev6/chconf.h -r platforms/chibios/QMK_PROTON_C/configs/chconf.h`
+ */
+
+#pragma once
+
 #define CH_CFG_ST_RESOLUTION 16
+
 #define CH_CFG_ST_FREQUENCY 10000
-#include_next "chconf.h"
+
+#include_next <chconf.h>
+
diff --git a/keyboards/primekb/meridian/chconf.h b/keyboards/primekb/meridian/chconf.h
index 44182595b..c5beb2df1 100644
--- a/keyboards/primekb/meridian/chconf.h
+++ b/keyboards/primekb/meridian/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/projectkb/alice/chconf.h b/keyboards/projectkb/alice/chconf.h
index 72266cbbb..2dfe6f0be 100644
--- a/keyboards/projectkb/alice/chconf.h
+++ b/keyboards/projectkb/alice/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/projectkb/signature87/chconf.h b/keyboards/projectkb/signature87/chconf.h
index 2b6da6c97..2de08dea3 100644
--- a/keyboards/projectkb/signature87/chconf.h
+++ b/keyboards/projectkb/signature87/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/ramonimbao/squishy65/chconf.h b/keyboards/ramonimbao/squishy65/chconf.h
index f9146fe52..144f324bc 100644
--- a/keyboards/ramonimbao/squishy65/chconf.h
+++ b/keyboards/ramonimbao/squishy65/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/ramonimbao/wete/chconf.h b/keyboards/ramonimbao/wete/chconf.h
index 523ffe460..18befdb8e 100644
--- a/keyboards/ramonimbao/wete/chconf.h
+++ b/keyboards/ramonimbao/wete/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/rart/rartlice/chconf.h b/keyboards/rart/rartlice/chconf.h
index 5c06b72c8..0a89eb248 100644
--- a/keyboards/rart/rartlice/chconf.h
+++ b/keyboards/rart/rartlice/chconf.h
@@ -23,19 +23,7 @@
 
 #define CH_CFG_ST_TIMEDELTA 0
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/retro_75/chconf.h b/keyboards/retro_75/chconf.h
index 2245de22d..b42ecdbb0 100644
--- a/keyboards/retro_75/chconf.h
+++ b/keyboards/retro_75/chconf.h
@@ -25,20 +25,8 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
 
 #define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
diff --git a/keyboards/rocketboard_16/chconf.h b/keyboards/rocketboard_16/chconf.h
index 6b6a8526c..4fbe44bd1 100644
--- a/keyboards/rocketboard_16/chconf.h
+++ b/keyboards/rocketboard_16/chconf.h
@@ -23,19 +23,7 @@
 
 #define CH_CFG_ST_TIMEDELTA 0
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/satt/vision/chconf.h b/keyboards/satt/vision/chconf.h
index 8ea62c976..21cc2cee6 100644
--- a/keyboards/satt/vision/chconf.h
+++ b/keyboards/satt/vision/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/technika/chconf.h b/keyboards/technika/chconf.h
index eabb44a1f..4cab3f93f 100644
--- a/keyboards/technika/chconf.h
+++ b/keyboards/technika/chconf.h
@@ -25,19 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/tkc/godspeed75/chconf.h b/keyboards/tkc/godspeed75/chconf.h
index 1c2fed228..c341c6fba 100644
--- a/keyboards/tkc/godspeed75/chconf.h
+++ b/keyboards/tkc/godspeed75/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/tkw/stoutgat/v2/f411/chconf.h b/keyboards/tkw/stoutgat/v2/f411/chconf.h
deleted file mode 100644
index be287db09..000000000
--- a/keyboards/tkw/stoutgat/v2/f411/chconf.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2020 QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/tkw/stoutgat/v2/f411/chconf.h -r platforms/chibios/common/configs/chconf.h`
- */
-
-#pragma once
-
-#include_next <chconf.h>
-
diff --git a/keyboards/viktus/styrka/chconf.h b/keyboards/viktus/styrka/chconf.h
index 76d16808a..0f68479a0 100644
--- a/keyboards/viktus/styrka/chconf.h
+++ b/keyboards/viktus/styrka/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/westfoxtrot/prophet/chconf.h b/keyboards/westfoxtrot/prophet/chconf.h
index 6a1f54a27..d2cc7a7c4 100644
--- a/keyboards/westfoxtrot/prophet/chconf.h
+++ b/keyboards/westfoxtrot/prophet/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/whitefox/chconf.h b/keyboards/whitefox/chconf.h
index 1860897bb..d220eec49 100644
--- a/keyboards/whitefox/chconf.h
+++ b/keyboards/whitefox/chconf.h
@@ -29,10 +29,9 @@
 
 #define CH_CFG_USE_WAITEXIT TRUE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
 #define CH_CFG_USE_HEAP TRUE
 
 #define CH_CFG_USE_DYNAMIC TRUE
 
 #include_next <chconf.h>
+
diff --git a/keyboards/wolfmarkclub/wm1/chconf.h b/keyboards/wolfmarkclub/wm1/chconf.h
index d4d8b46ae..41c38c33e 100644
--- a/keyboards/wolfmarkclub/wm1/chconf.h
+++ b/keyboards/wolfmarkclub/wm1/chconf.h
@@ -23,19 +23,7 @@
 
 #define CH_CFG_ST_TIMEDELTA 0
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/xelus/kangaroo/chconf.h b/keyboards/xelus/kangaroo/chconf.h
index 886a89679..71b34b059 100644
--- a/keyboards/xelus/kangaroo/chconf.h
+++ b/keyboards/xelus/kangaroo/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/xelus/trinityxttkl/chconf.h b/keyboards/xelus/trinityxttkl/chconf.h
index 1d1191ca1..6dec71d66 100644
--- a/keyboards/xelus/trinityxttkl/chconf.h
+++ b/keyboards/xelus/trinityxttkl/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/xelus/valor_frl_tkl/chconf.h b/keyboards/xelus/valor_frl_tkl/chconf.h
index d30ea0bfe..5b1d65cb7 100644
--- a/keyboards/xelus/valor_frl_tkl/chconf.h
+++ b/keyboards/xelus/valor_frl_tkl/chconf.h
@@ -25,21 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/xiaomi/mk02/chconf.h b/keyboards/xiaomi/mk02/chconf.h
index 28defbc87..54f9eb7c2 100644
--- a/keyboards/xiaomi/mk02/chconf.h
+++ b/keyboards/xiaomi/mk02/chconf.h
@@ -37,8 +37,6 @@
 
 #define CH_CFG_USE_MAILBOXES TRUE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
 #define CH_CFG_USE_PIPES TRUE
 
 #define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
diff --git a/keyboards/zoo/wampus/chconf.h b/keyboards/zoo/wampus/chconf.h
index 3f64f006f..9d163f5f0 100644
--- a/keyboards/zoo/wampus/chconf.h
+++ b/keyboards/zoo/wampus/chconf.h
@@ -25,19 +25,7 @@
 
 #define CH_CFG_OPTIMIZE_SPEED FALSE
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_HEAP FALSE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/keyboards/zvecr/split_blackpill/chconf.h b/keyboards/zvecr/split_blackpill/chconf.h
index 7b09e5cb8..e98ee9d79 100644
--- a/keyboards/zvecr/split_blackpill/chconf.h
+++ b/keyboards/zvecr/split_blackpill/chconf.h
@@ -23,19 +23,7 @@
 
 #define CH_CFG_ST_TIMEDELTA 0
 
-#define CH_CFG_USE_TM FALSE
-
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#define CH_CFG_USE_MEMCORE TRUE
-
-#define CH_CFG_USE_MEMPOOLS FALSE
-
-#define CH_CFG_USE_OBJ_FIFOS FALSE
-
-#define CH_CFG_USE_PIPES FALSE
-
-#define CH_CFG_USE_DYNAMIC FALSE
-
 #include_next <chconf.h>
 
diff --git a/lib/python/qmk/cli/chibios/confmigrate.py b/lib/python/qmk/cli/chibios/confmigrate.py
index 9d2548858..3e348b2b0 100644
--- a/lib/python/qmk/cli/chibios/confmigrate.py
+++ b/lib/python/qmk/cli/chibios/confmigrate.py
@@ -111,6 +111,7 @@ def migrate_mcuconf_h(to_override, outfile):
 @cli.argument('-r', '--reference', type=normpath, arg_only=True, help='Specify the reference file to compare against')
 @cli.argument('-o', '--overwrite', arg_only=True, action='store_true', help='Overwrites the input file during migration.')
 @cli.argument('-d', '--delete', arg_only=True, action='store_true', help='If the file has no overrides, migration will delete the input file.')
+@cli.argument('-f', '--force', arg_only=True, action='store_true', help='Re-migrates an already migrated file, even if it doesn\'t detect a full ChibiOS config.')
 @cli.subcommand('Generates a migrated ChibiOS configuration file, as a result of comparing the input against a reference')
 def chibios_confmigrate(cli):
     """Generates a usable ChibiOS replacement configuration file, based on a fully-defined conf and a reference config.
@@ -142,19 +143,19 @@ def chibios_confmigrate(cli):
 
         eprint('--------------------------------------')
 
-        if "CHCONF_H" in input_defs["dict"] or "_CHCONF_H_" in input_defs["dict"]:
+        if cli.args.input.name == "chconf.h" and ("CHCONF_H" in input_defs["dict"] or "_CHCONF_H_" in input_defs["dict"] or cli.args.force):
             migrate_chconf_h(to_override, outfile=sys.stdout)
             if cli.args.overwrite:
                 with open(cli.args.input, "w") as out_file:
                     migrate_chconf_h(to_override, outfile=out_file)
 
-        elif "HALCONF_H" in input_defs["dict"] or "_HALCONF_H_" in input_defs["dict"]:
+        elif cli.args.input.name == "halconf.h" and ("HALCONF_H" in input_defs["dict"] or "_HALCONF_H_" in input_defs["dict"] or cli.args.force):
             migrate_halconf_h(to_override, outfile=sys.stdout)
             if cli.args.overwrite:
                 with open(cli.args.input, "w") as out_file:
                     migrate_halconf_h(to_override, outfile=out_file)
 
-        elif "MCUCONF_H" in input_defs["dict"] or "_MCUCONF_H_" in input_defs["dict"]:
+        elif cli.args.input.name == "mcuconf.h" and ("MCUCONF_H" in input_defs["dict"] or "_MCUCONF_H_" in input_defs["dict"] or cli.args.force):
             migrate_mcuconf_h(to_override, outfile=sys.stdout)
             if cli.args.overwrite:
                 with open(cli.args.input, "w") as out_file:
-- 
cgit v1.3.1


From ef6329af7c7be77b537fbfc5a5cc7105acc679f7 Mon Sep 17 00:00:00 2001
From: Zach White <skullydazed@gmail.com>
Date: Sun, 31 Jan 2021 12:46:00 -0800
Subject: Create a system to map between info.json and config.h/rules.mk
 (#11548)

* generate rules.mk from a json mapping

* generate rules.mk from a json mapping

* support for config.h from json maps

* improve the mapping system

* document the mapping system

* move data/maps to data/mappings

* fix flake8 errors

* fixup LED_MATRIX_DRIVER

* remove product and description from the vision_division keymap level

* reduce the complexity of generate-rules-mk

* add tests for the generate commands

* fix qmk doctor when submodules are not clean
---
 bin/qmk                                            |   3 +-
 data/mappings/info_config.json                     |  42 +++
 data/mappings/info_rules.json                      |  15 +
 docs/data_driven_config.md                         |  44 ++-
 keyboards/handwired/pytest/basic/info.json         |  10 +
 keyboards/vision_division/keymaps/default/config.h |   1 -
 lib/python/qmk/cli/doctor.py                       |   4 +-
 lib/python/qmk/cli/generate/config_h.py            | 245 ++++-----------
 lib/python/qmk/cli/generate/rules_mk.py            |  61 ++--
 lib/python/qmk/constants.py                        |   2 +-
 lib/python/qmk/info.py                             | 343 ++++++---------------
 lib/python/qmk/tests/test_cli_commands.py          |  29 ++
 requirements.txt                                   |   1 +
 13 files changed, 339 insertions(+), 461 deletions(-)
 create mode 100644 data/mappings/info_config.json
 create mode 100644 data/mappings/info_rules.json
 create mode 100644 keyboards/handwired/pytest/basic/info.json

(limited to 'lib/python/qmk/cli')

diff --git a/bin/qmk b/bin/qmk
index 801852d4e..a3c1be328 100755
--- a/bin/qmk
+++ b/bin/qmk
@@ -27,7 +27,8 @@ def _check_modules(requirements):
                 line = line.split('#')[0]
 
             module = dict()
-            module['name'] = module['import'] = line.split('=')[0] if '=' in line else line
+            module['name'] = line.split('=')[0] if '=' in line else line
+            module['import'] = module['name'].replace('-', '_')
 
             # Not every module is importable by its own name.
             if module['name'] == "pep8-naming":
diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json
new file mode 100644
index 000000000..885e6d025
--- /dev/null
+++ b/data/mappings/info_config.json
@@ -0,0 +1,42 @@
+# This file maps keys between `config.h` and `info.json`. It is used by QMK 
+# to correctly and consistently map back and forth between the two systems.
+{
+    # Format:
+    # <config.h key>: {"info_key": <info.json key>, ["value_type": <value_type>], ["to_json": <true/false>], ["to_c": <true/false>]}
+    # value_type: one of "array", "array.int", "int", "hex", "list", "mapping"
+    # to_json: Default `true`. Set to `false` to exclude this mapping from info.json
+    # to_c: Default `true`. Set to `false` to exclude this mapping from config.h
+    # warn_duplicate: Default `true`. Set to `false` to turn off warning when a value exists in both places
+    "DEBOUNCE": {"info_key": "debounce", "value_type": "int"}
+    "DEVICE_VER": {"info_key": "usb.device_ver", "value_type": "hex"},
+    "DESCRIPTION": {"info_key": "keyboard_folder", "to_json": false},
+    "DIODE_DIRECTION": {"info_key": "diode_direction"},
+    "LAYOUTS": {"info_key": "layout_aliases", "value_type": "mapping"},
+    "LED_CAPS_LOCK_PIN": {"info_key": "indicators.caps_lock"},
+    "LED_NUM_LOCK_PIN": {"info_key": "indicators.num_lock"},
+    "LED_SCROLL_LOCK_PIN": {"info_key": "indicators.scroll_lock"},
+    "MANUFACTURER": {"info_key": "manufacturer"},
+    "RGB_DI_PIN": {"info_key": "rgblight.pin"},
+    "RGBLED_NUM": {"info_key": "rgblight.led_count", "value_type": "int"},
+    "RGBLED_SPLIT": {"info_key": "rgblight.split_count", "value_type": "array.int"},
+    "RGBLIGHT_ANIMATIONS": {"info_key": "rgblight.animations.all", "value_type": "bool"},
+    "RGBLIGHT_EFFECT_ALTERNATING": {"info_key": "rgblight.animations.alternating", "value_type": "bool"},
+    "RGBLIGHT_EFFECT_BREATHING": {"info_key": "rgblight.animations.breathing", "value_type": "bool"},
+    "RGBLIGHT_EFFECT_CHRISTMAS": {"info_key": "rgblight.animations.christmas", "value_type": "bool"},
+    "RGBLIGHT_EFFECT_KNIGHT": {"info_key": "rgblight.animations.knight", "value_type": "bool"},
+    "RGBLIGHT_EFFECT_RAINBOW_MOOD": {"info_key": "rgblight.animations.rainbow_mood", "value_type": "bool"},
+    "RGBLIGHT_EFFECT_RAINBOW_SWIRL": {"info_key": "rgblight.animations.rainbow_swirl", "value_type": "bool"},
+    "RGBLIGHT_EFFECT_RGB_TEST": {"info_key": "rgblight.animations.rgb_test", "value_type": "bool"},
+    "RGBLIGHT_EFFECT_SNAKE": {"info_key": "rgblight.animations.snake", "value_type": "bool"},
+    "RGBLIGHT_EFFECT_STATIC_GRADIENT": {"info_key": "rgblight.animations.static_gradient", "value_type": "bool"},
+    "RGBLIGHT_EFFECT_TWINKLE": {"info_key": "rgblight.animations.twinkle"},
+    "RGBLIGHT_LIMIT_VAL": {"info_key": "rgblight.max_brightness", "value_type": "int"},
+    "RGBLIGHT_HUE_STEP": {"info_key": "rgblight.hue_steps", "value_type": "int"},
+    "RGBLIGHT_SAT_STEP": {"info_key": "rgblight.saturation_steps", "value_type": "int"},
+    "RGBLIGHT_VAL_STEP": {"info_key": "rgblight.brightness_steps", "value_type": "int"},
+    "RGBLIGHT_SLEEP": {"info_key": "rgblight.sleep", "value_type": "bool"},
+    "RGBLIGHT_SPLIT": {"info_key": "rgblight.split", "value_type": "bool"},
+    "PRODUCT": {"info_key": "keyboard_folder", "to_json": false},
+    "PRODUCT_ID": {"info_key": "usb.pid", "value_type": "hex"},
+    "VENDOR_ID": {"info_key": "usb.vid", "value_type": "hex"}
+}
diff --git a/data/mappings/info_rules.json b/data/mappings/info_rules.json
new file mode 100644
index 000000000..97f772c4d
--- /dev/null
+++ b/data/mappings/info_rules.json
@@ -0,0 +1,15 @@
+# This file maps keys between `rules.mk` and `info.json`. It is used by QMK 
+# to correctly and consistently map back and forth between the two systems.
+{
+    # Format:
+    # <rules.mk key>: {"info_key": <info.json key>, ["value_type": <value_type>], ["to_json": <true/false>], ["to_c": <true/false>]}
+    # value_type: one of "array", "array.int", "int", "list", "hex", "mapping"
+    # to_json: Default `true`. Set to `false` to exclude this mapping from info.json
+    # to_c: Default `true`. Set to `false` to exclude this mapping from rules.mk
+    # warn_duplicate: Default `true`. Set to `false` to turn off warning when a value exists in both places
+    "BOARD": {"info_key": "board"},
+    "BOOTLOADER": {"info_key": "bootloader", "warn_duplicate": false},
+    "LAYOUTS": {"info_key": "community_layouts", "value_type": "list"},
+    "LED_MATRIX_DRIVER": {"info_key": "led_matrix.driver"},
+    "MCU": {"info_key": "processor", "warn_duplicate": false},
+}
diff --git a/docs/data_driven_config.md b/docs/data_driven_config.md
index 7e4f23284..c2ad4fed8 100644
--- a/docs/data_driven_config.md
+++ b/docs/data_driven_config.md
@@ -12,17 +12,18 @@ Now we have support for generating `rules.mk` and `config.h` values from `info.j
 
 ## Overview
 
-On the C side of things nothing really changes. When you need to create a new rule or define you follow the same process:
+On the C side of things nothing changes. When you need to create a new rule or define you follow the same process:
 
 1. Add it to `docs/config_options.md`
 1. Set a default in the appropriate core file
-1. Add your `ifdef` and/or `#ifdef` statements as needed
+1. Add your ifdef statements as needed
 
 You will then need to add support for your new configuration to `info.json`. The basic process is:
 
 1. Add it to the schema in `data/schemas/keyboards.jsonschema`
-1. Add code to extract it from `config.h`/`rules.mk` to `lib/python/qmk/info.py`
-1. Add code to generate it to one of:
+1. Add a mapping in `data/maps`
+1. (optional and discoraged) Add code to extract/generate it to:
+  * `lib/python/qmk/info.py`
   * `lib/python/qmk/cli/generate/config_h.py`
   * `lib/python/qmk/cli/generate/rules_mk.py`
 
@@ -32,12 +33,43 @@ This section describes adding support for a `config.h`/`rules.mk` value to info.
 
 ### Add it to the schema
 
-QMK maintains schema files in `data/schemas`. The values that go into keyboard-specific `info.json` files are kept in `keyboard.jsonschema`. Any value you want to make available to end users to edit must go in here.
+QMK maintains [jsonschema](https://json-schema.org/) files in `data/schemas`. The values that go into keyboard-specific `info.json` files are kept in `keyboard.jsonschema`. Any value you want to make available to end users to edit must go in here.
 
-In some cases you can simply add a new top-level key. Some examples to follow are `keyboard_name`, `maintainer`, `processor`, and `url`. This is appropriate when your option is self-contained and not directly related to other options. In other cases you should group like options together in an `object`. This is particularly true when adding support for a feature. Some examples to follow for this are `indicators`, `matrix_pins`, and `rgblight`. If you are not sure how to integrate your new option(s) [open an issue](https://github.com/qmk/qmk_firmware/issues/new?assignees=&labels=cli%2C+python&template=other_issues.md&title=) or [join #cli on Discord](https://discord.gg/heQPAgy) and start a conversation there.
+In some cases you can simply add a new top-level key. Some examples to follow are `keyboard_name`, `maintainer`, `processor`, and `url`. This is appropriate when your option is self-contained and not directly related to other options.
+
+In other cases you should group like options together in an `object`. This is particularly true when adding support for a feature. Some examples to follow for this are `indicators`, `matrix_pins`, and `rgblight`. If you are not sure how to integrate your new option(s) [open an issue](https://github.com/qmk/qmk_firmware/issues/new?assignees=&labels=cli%2C+python&template=other_issues.md&title=) or [join #cli on Discord](https://discord.gg/heQPAgy) and start a conversation there.
+
+### Add a mapping
+
+In most cases you can add a simple mapping. These are maintained as JSON files in `data/mappings/info_config.json` and `data/mappings/info_rules.json`, and control mapping for `config.h` and `rules.mk`, respectively. Each mapping is keyed by the `config.h` or `rules.mk` variable, and the value is a hash with the following keys:
+
+* `info_key`: (required) The location within `info.json` for this value. See below.
+* `value_type`: (optional) Default `str`. The format for this variable's value. See below.
+* `to_json`: (optional) Default `true`. Set to `false` to exclude this mapping from info.json
+* `to_c`: (optional) Default `true`. Set to `false` to exclude this mapping from config.h
+* `warn_duplicate`: (optional) Default `true`. Set to `false` to turn off warning when a value exists in both places
+
+#### Info Key
+
+We use JSON dot notation to address variables within info.json. For example, to access `info_json["rgblight"]["split_count"]` I would specify `rgblight.split_count`. This allows you to address deeply nested keys with a simple string.
+
+Under the hood we use [Dotty Dict](https://dotty-dict.readthedocs.io/en/latest/), you can refer to that documentation for how these strings are converted to object access.
+
+#### Value Types
+
+By default we treat all values as simple strings. If your value is more complex you can use one of these types to intelligently parse the data:
+
+* `array`: A comma separated array of strings
+* `array.int`: A comma separated array of integers
+* `int`: An integer
+* `hex`: A number formatted as hex
+* `list`: A space separate array of strings
+* `mapping`: A hash of key/value pairs
 
 ### Add code to extract it
 
+Most use cases can be solved by the mapping files described above. If yours can't you can instead write code to extract your config values.
+
 Whenever QMK generates a complete `info.json` it extracts information from `config.h` and `rules.mk`. You will need to add code for your new config value to `lib/python/qmk/info.py`. Typically this means adding a new `_extract_<feature>()` function and then calling your function in either `_extract_config_h()` or `_extract_rules_mk()`.
 
 If you are not sure how to edit this file or are not comfortable with Python [open an issue](https://github.com/qmk/qmk_firmware/issues/new?assignees=&labels=cli%2C+python&template=other_issues.md&title=) or [join #cli on Discord](https://discord.gg/heQPAgy) and someone can help you with this part.
diff --git a/keyboards/handwired/pytest/basic/info.json b/keyboards/handwired/pytest/basic/info.json
new file mode 100644
index 000000000..ed052a14a
--- /dev/null
+++ b/keyboards/handwired/pytest/basic/info.json
@@ -0,0 +1,10 @@
+{
+  "maintainer": "qmk",
+  "layouts": {
+    "LAYOUT_custom": {
+      "layout": [
+        { "label": "KC_Q", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }
+      ]
+    }
+  }
+}
diff --git a/keyboards/vision_division/keymaps/default/config.h b/keyboards/vision_division/keymaps/default/config.h
index b8f22a3b5..aa8fc62aa 100644
--- a/keyboards/vision_division/keymaps/default/config.h
+++ b/keyboards/vision_division/keymaps/default/config.h
@@ -8,7 +8,6 @@
 #define VENDOR_ID       0xFEED
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    IBNobody
-#define PRODUCT         Vision Division
 
 #define MATRIX_ROWS     6
 #define MATRIX_ROW_PINS { C2, C3, F4, F5, F6, F7 }
diff --git a/lib/python/qmk/cli/doctor.py b/lib/python/qmk/cli/doctor.py
index 70f32911a..28d480707 100755
--- a/lib/python/qmk/cli/doctor.py
+++ b/lib/python/qmk/cli/doctor.py
@@ -107,9 +107,9 @@ def doctor(cli):
             submodules.update()
             sub_ok = check_submodules()
 
-        if CheckStatus.ERROR in sub_ok:
+        if sub_ok == CheckStatus.ERROR:
             status = CheckStatus.ERROR
-        elif CheckStatus.WARNING in sub_ok and status == CheckStatus.OK:
+        elif sub_ok == CheckStatus.WARNING and status == CheckStatus.OK:
             status = CheckStatus.WARNING
 
     # Report a summary of our findings to the user
diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py
index 1de84de7a..7ddad745d 100755
--- a/lib/python/qmk/cli/generate/config_h.py
+++ b/lib/python/qmk/cli/generate/config_h.py
@@ -1,62 +1,14 @@
 """Used by the make system to generate info_config.h from info.json.
 """
+from pathlib import Path
+
+from dotty_dict import dotty
 from milc import cli
 
-from qmk.constants import LED_INDICATORS
 from qmk.decorators import automagic_keyboard, automagic_keymap
-from qmk.info import info_json, rgblight_animations, rgblight_properties, rgblight_toggles
+from qmk.info import _json_load, info_json
 from qmk.path import is_keyboard, normpath
 
-usb_prop_map = {
-    'vid': 'VENDOR_ID',
-    'pid': 'PRODUCT_ID',
-    'device_ver': 'DEVICE_VER',
-}
-
-
-def debounce(debounce):
-    """Return the config.h lines that set debounce
-    """
-    return """
-#ifndef DEBOUNCE
-#   define DEBOUNCE %s
-#endif // DEBOUNCE
-""" % debounce
-
-
-def diode_direction(diode_direction):
-    """Return the config.h lines that set diode direction
-    """
-    return """
-#ifndef DIODE_DIRECTION
-#   define DIODE_DIRECTION %s
-#endif // DIODE_DIRECTION
-""" % diode_direction
-
-
-def keyboard_name(keyboard_name):
-    """Return the config.h lines that set the keyboard's name.
-    """
-    return """
-#ifndef DESCRIPTION
-#    define DESCRIPTION %s
-#endif // DESCRIPTION
-
-#ifndef PRODUCT
-#    define PRODUCT %s
-#endif // PRODUCT
-""" % (keyboard_name.replace("'", ""), keyboard_name.replace("'", ""))
-
-
-def manufacturer(manufacturer):
-    """Return the config.h lines that set the manufacturer.
-    """
-    return """
-#ifndef MANUFACTURER
-#    define MANUFACTURER %s
-#endif // MANUFACTURER
-""" % (manufacturer.replace("'", ""))
-
 
 def direct_pins(direct_pins):
     """Return the config.h lines that set the direct pins.
@@ -72,80 +24,34 @@ def direct_pins(direct_pins):
 
     return """
 #ifndef MATRIX_COLS
-#    define MATRIX_COLS %s
+#   define MATRIX_COLS %s
 #endif // MATRIX_COLS
 
 #ifndef MATRIX_ROWS
-#    define MATRIX_ROWS %s
+#   define MATRIX_ROWS %s
 #endif // MATRIX_ROWS
 
 #ifndef DIRECT_PINS
-#    define DIRECT_PINS {%s}
+#   define DIRECT_PINS {%s}
 #endif // DIRECT_PINS
 """ % (col_count, row_count, ','.join(rows))
 
 
-def col_pins(col_pins):
-    """Return the config.h lines that set the column pins.
-    """
-    cols = ','.join(map(str, [pin or 'NO_PIN' for pin in col_pins]))
-    col_num = len(col_pins)
-
-    return """
-#ifndef MATRIX_COLS
-#    define MATRIX_COLS %s
-#endif // MATRIX_COLS
-
-#ifndef MATRIX_COL_PINS
-#    define MATRIX_COL_PINS {%s}
-#endif // MATRIX_COL_PINS
-""" % (col_num, cols)
-
-
-def row_pins(row_pins):
-    """Return the config.h lines that set the row pins.
-    """
-    rows = ','.join(map(str, [pin or 'NO_PIN' for pin in row_pins]))
-    row_num = len(row_pins)
-
-    return """
-#ifndef MATRIX_ROWS
-#    define MATRIX_ROWS %s
-#endif // MATRIX_ROWS
-
-#ifndef MATRIX_ROW_PINS
-#    define MATRIX_ROW_PINS {%s}
-#endif // MATRIX_ROW_PINS
-""" % (row_num, rows)
-
-
-def indicators(config):
-    """Return the config.h lines that setup LED indicators.
+def pin_array(define, pins):
+    """Return the config.h lines that set a pin array.
     """
-    defines = []
+    pin_num = len(pins)
+    pin_array = ', '.join(map(str, [pin or 'NO_PIN' for pin in pins]))
 
-    for led, define in LED_INDICATORS.items():
-        if led in config:
-            defines.append('')
-            defines.append('#ifndef %s' % (define,))
-            defines.append('#   define %s %s' % (define, config[led]))
-            defines.append('#endif // %s' % (define,))
+    return f"""
+#ifndef {define}S
+#   define {define}S {pin_num}
+#endif // {define}S
 
-    return '\n'.join(defines)
-
-
-def layout_aliases(layout_aliases):
-    """Return the config.h lines that setup layout aliases.
-    """
-    defines = []
-
-    for alias, layout in layout_aliases.items():
-        defines.append('')
-        defines.append('#ifndef %s' % (alias,))
-        defines.append('#   define %s %s' % (alias, layout))
-        defines.append('#endif // %s' % (alias,))
-
-    return '\n'.join(defines)
+#ifndef {define}_PINS
+#   define {define}_PINS {{ {pin_array} }}
+#endif // {define}_PINS
+"""
 
 
 def matrix_pins(matrix_pins):
@@ -157,58 +63,14 @@ def matrix_pins(matrix_pins):
         pins.append(direct_pins(matrix_pins['direct']))
 
     if 'cols' in matrix_pins:
-        pins.append(col_pins(matrix_pins['cols']))
+        pins.append(pin_array('MATRIX_COL', matrix_pins['cols']))
 
     if 'rows' in matrix_pins:
-        pins.append(row_pins(matrix_pins['rows']))
+        pins.append(pin_array('MATRIX_ROW', matrix_pins['rows']))
 
     return '\n'.join(pins)
 
 
-def rgblight(config):
-    """Return the config.h lines that setup rgblight.
-    """
-    rgblight_config = []
-
-    for json_key, config_key in rgblight_properties.items():
-        if json_key in config:
-            rgblight_config.append('')
-            rgblight_config.append('#ifndef %s' % (config_key[0],))
-            rgblight_config.append('#   define %s %s' % (config_key[0], config[json_key]))
-            rgblight_config.append('#endif // %s' % (config_key[0],))
-
-    for json_key, config_key in rgblight_toggles.items():
-        if config.get(json_key):
-            rgblight_config.append('')
-            rgblight_config.append('#ifndef %s' % (config_key,))
-            rgblight_config.append('#   define %s' % (config_key,))
-            rgblight_config.append('#endif // %s' % (config_key,))
-
-    for json_key, config_key in rgblight_animations.items():
-        if 'animations' in config and config['animations'].get(json_key):
-            rgblight_config.append('')
-            rgblight_config.append('#ifndef %s' % (config_key,))
-            rgblight_config.append('#   define %s' % (config_key,))
-            rgblight_config.append('#endif // %s' % (config_key,))
-
-    return '\n'.join(rgblight_config)
-
-
-def usb_properties(usb_props):
-    """Return the config.h lines that setup USB params.
-    """
-    usb_lines = []
-
-    for info_name, config_name in usb_prop_map.items():
-        if info_name in usb_props:
-            usb_lines.append('')
-            usb_lines.append('#ifndef ' + config_name)
-            usb_lines.append('#    define %s %s' % (config_name, usb_props[info_name]))
-            usb_lines.append('#endif // ' + config_name)
-
-    return '\n'.join(usb_lines)
-
-
 @cli.argument('-o', '--output', arg_only=True, type=normpath, help='File to write to')
 @cli.argument('-q', '--quiet', arg_only=True, action='store_true', help="Quiet mode, only output error messages")
 @cli.argument('-kb', '--keyboard', help='Keyboard to generate config.h for.')
@@ -228,39 +90,52 @@ def generate_config_h(cli):
         cli.log.error('Invalid keyboard: "%s"', cli.config.generate_config_h.keyboard)
         return False
 
-    # Build the info.json file
-    kb_info_json = info_json(cli.config.generate_config_h.keyboard)
-
     # Build the info_config.h file.
-    config_h_lines = ['/* This file was generated by `qmk generate-config-h`. Do not edit or copy.' ' */', '', '#pragma once']
+    kb_info_json = dotty(info_json(cli.config.generate_config_h.keyboard))
+    info_config_map = _json_load(Path('data/mappings/info_config.json'))
 
-    if 'debounce' in kb_info_json:
-        config_h_lines.append(debounce(kb_info_json['debounce']))
-
-    if 'diode_direction' in kb_info_json:
-        config_h_lines.append(diode_direction(kb_info_json['diode_direction']))
-
-    if 'indicators' in kb_info_json:
-        config_h_lines.append(indicators(kb_info_json['indicators']))
-
-    if 'keyboard_name' in kb_info_json:
-        config_h_lines.append(keyboard_name(kb_info_json['keyboard_name']))
-
-    if 'layout_aliases' in kb_info_json:
-        config_h_lines.append(layout_aliases(kb_info_json['layout_aliases']))
-
-    if 'manufacturer' in kb_info_json:
-        config_h_lines.append(manufacturer(kb_info_json['manufacturer']))
+    config_h_lines = ['/* This file was generated by `qmk generate-config-h`. Do not edit or copy.' ' */', '', '#pragma once']
 
-    if 'rgblight' in kb_info_json:
-        config_h_lines.append(rgblight(kb_info_json['rgblight']))
+    # Iterate through the info_config map to generate basic things
+    for config_key, info_dict in info_config_map.items():
+        info_key = info_dict['info_key']
+        key_type = info_dict.get('value_type', 'str')
+        to_config = info_dict.get('to_config', True)
+
+        if not to_config:
+            continue
+
+        try:
+            config_value = kb_info_json[info_key]
+        except KeyError:
+            continue
+
+        if key_type.startswith('array'):
+            config_h_lines.append('')
+            config_h_lines.append(f'#ifndef {config_key}')
+            config_h_lines.append(f'#   define {config_key} {{ {", ".join(map(str, config_value))} }}')
+            config_h_lines.append(f'#endif // {config_key}')
+        elif key_type == 'bool':
+            if config_value:
+                config_h_lines.append('')
+                config_h_lines.append(f'#ifndef {config_key}')
+                config_h_lines.append(f'#   define {config_key}')
+                config_h_lines.append(f'#endif // {config_key}')
+        elif key_type == 'mapping':
+            for key, value in config_value.items():
+                config_h_lines.append('')
+                config_h_lines.append(f'#ifndef {key}')
+                config_h_lines.append(f'#   define {key} {value}')
+                config_h_lines.append(f'#endif // {key}')
+        else:
+            config_h_lines.append('')
+            config_h_lines.append(f'#ifndef {config_key}')
+            config_h_lines.append(f'#   define {config_key} {config_value}')
+            config_h_lines.append(f'#endif // {config_key}')
 
     if 'matrix_pins' in kb_info_json:
         config_h_lines.append(matrix_pins(kb_info_json['matrix_pins']))
 
-    if 'usb' in kb_info_json:
-        config_h_lines.append(usb_properties(kb_info_json['usb']))
-
     # Show the results
     config_h = '\n'.join(config_h_lines)
 
diff --git a/lib/python/qmk/cli/generate/rules_mk.py b/lib/python/qmk/cli/generate/rules_mk.py
index b262e3c66..af740f341 100755
--- a/lib/python/qmk/cli/generate/rules_mk.py
+++ b/lib/python/qmk/cli/generate/rules_mk.py
@@ -1,16 +1,37 @@
 """Used by the make system to generate a rules.mk
 """
+from pathlib import Path
+
+from dotty_dict import dotty
 from milc import cli
 
 from qmk.decorators import automagic_keyboard, automagic_keymap
-from qmk.info import info_json
+from qmk.info import _json_load, info_json
 from qmk.path import is_keyboard, normpath
 
-info_to_rules = {
-    'board': 'BOARD',
-    'bootloader': 'BOOTLOADER',
-    'processor': 'MCU',
-}
+
+def process_mapping_rule(kb_info_json, rules_key, info_dict):
+    """Return the rules.mk line(s) for a mapping rule.
+    """
+    if not info_dict.get('to_c', True):
+        return None
+
+    info_key = info_dict['info_key']
+    key_type = info_dict.get('value_type', 'str')
+
+    try:
+        rules_value = kb_info_json[info_key]
+    except KeyError:
+        return None
+
+    if key_type == 'array':
+        return f'{rules_key} ?= {" ".join(rules_value)}'
+    elif key_type == 'bool':
+        return f'{rules_key} ?= {"on" if rules_value else "off"}'
+    elif key_type == 'mapping':
+        return '\n'.join([f'{key} ?= {value}' for key, value in rules_value.items()])
+
+    return f'{rules_key} ?= {rules_value}'
 
 
 @cli.argument('-o', '--output', arg_only=True, type=normpath, help='File to write to')
@@ -22,7 +43,6 @@ info_to_rules = {
 def generate_rules_mk(cli):
     """Generates a rules.mk file from info.json.
     """
-    # Determine our keyboard(s)
     if not cli.config.generate_rules_mk.keyboard:
         cli.log.error('Missing paramater: --keyboard')
         cli.subcommands['info'].print_help()
@@ -32,16 +52,18 @@ def generate_rules_mk(cli):
         cli.log.error('Invalid keyboard: "%s"', cli.config.generate_rules_mk.keyboard)
         return False
 
-    # Build the info.json file
-    kb_info_json = info_json(cli.config.generate_rules_mk.keyboard)
+    kb_info_json = dotty(info_json(cli.config.generate_rules_mk.keyboard))
+    info_rules_map = _json_load(Path('data/mappings/info_rules.json'))
     rules_mk_lines = ['# This file was generated by `qmk generate-rules-mk`. Do not edit or copy.', '']
 
-    # Bring in settings
-    for info_key, rule_key in info_to_rules.items():
-        if info_key in kb_info_json:
-            rules_mk_lines.append(f'{rule_key} ?= {kb_info_json[info_key]}')
+    # Iterate through the info_rules map to generate basic rules
+    for rules_key, info_dict in info_rules_map.items():
+        new_entry = process_mapping_rule(kb_info_json, rules_key, info_dict)
+
+        if new_entry:
+            rules_mk_lines.append(new_entry)
 
-    # Find features that should be enabled
+    # Iterate through features to enable/disable them
     if 'features' in kb_info_json:
         for feature, enabled in kb_info_json['features'].items():
             if feature == 'bootmagic_lite' and enabled:
@@ -51,15 +73,6 @@ def generate_rules_mk(cli):
                 enabled = 'yes' if enabled else 'no'
                 rules_mk_lines.append(f'{feature}_ENABLE ?= {enabled}')
 
-    # Set the LED driver
-    if 'led_matrix' in kb_info_json and 'driver' in kb_info_json['led_matrix']:
-        driver = kb_info_json['led_matrix']['driver']
-        rules_mk_lines.append(f'LED_MATRIX_DRIVER ?= {driver}')
-
-    # Add community layouts
-    if 'community_layouts' in kb_info_json:
-        rules_mk_lines.append(f'LAYOUTS ?= {" ".join(kb_info_json["community_layouts"])}')
-
     # Show the results
     rules_mk = '\n'.join(rules_mk_lines) + '\n'
 
@@ -72,7 +85,7 @@ def generate_rules_mk(cli):
         if cli.args.quiet:
             print(cli.args.output)
         else:
-            cli.log.info('Wrote info_config.h to %s.', cli.args.output)
+            cli.log.info('Wrote rules.mk to %s.', cli.args.output)
 
     else:
         print(rules_mk)
diff --git a/lib/python/qmk/constants.py b/lib/python/qmk/constants.py
index cb9461356..8a177eb6b 100644
--- a/lib/python/qmk/constants.py
+++ b/lib/python/qmk/constants.py
@@ -27,7 +27,7 @@ ROW_LETTERS = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnop'
 LED_INDICATORS = {
     'caps_lock': 'LED_CAPS_LOCK_PIN',
     'num_lock': 'LED_NUM_LOCK_PIN',
-    'scrol_lock': 'LED_SCROLL_LOCK_PIN',
+    'scroll_lock': 'LED_SCROLL_LOCK_PIN',
 }
 
 # Constants that should match their counterparts in make
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index cc81f7a08..2accaba9e 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -5,57 +5,18 @@ from collections.abc import Mapping
 from glob import glob
 from pathlib import Path
 
+import hjson
 import jsonschema
+from dotty_dict import dotty
 from milc import cli
 
-from qmk.constants import CHIBIOS_PROCESSORS, LUFA_PROCESSORS, VUSB_PROCESSORS, LED_INDICATORS
+from qmk.constants import CHIBIOS_PROCESSORS, LUFA_PROCESSORS, VUSB_PROCESSORS
 from qmk.c_parse import find_layouts
 from qmk.keyboard import config_h, rules_mk
 from qmk.keymap import list_keymaps
 from qmk.makefile import parse_rules_mk_file
 from qmk.math import compute
 
-led_matrix_properties = {
-    'driver_count': 'LED_DRIVER_COUNT',
-    'driver_addr1': 'LED_DRIVER_ADDR_1',
-    'driver_addr2': 'LED_DRIVER_ADDR_2',
-    'driver_addr3': 'LED_DRIVER_ADDR_3',
-    'driver_addr4': 'LED_DRIVER_ADDR_4',
-    'led_count': 'LED_DRIVER_LED_COUNT',
-    'timeout': 'ISSI_TIMEOUT',
-    'persistence': 'ISSI_PERSISTENCE'
-}
-
-rgblight_properties = {
-    'led_count': ('RGBLED_NUM', int),
-    'pin': ('RGB_DI_PIN', str),
-    'max_brightness': ('RGBLIGHT_LIMIT_VAL', int),
-    'hue_steps': ('RGBLIGHT_HUE_STEP', int),
-    'saturation_steps': ('RGBLIGHT_SAT_STEP', int),
-    'brightness_steps': ('RGBLIGHT_VAL_STEP', int)
-}
-
-rgblight_toggles = {
-    'sleep': 'RGBLIGHT_SLEEP',
-    'split': 'RGBLIGHT_SPLIT',
-}
-
-rgblight_animations = {
-    'all': 'RGBLIGHT_ANIMATIONS',
-    'alternating': 'RGBLIGHT_EFFECT_ALTERNATING',
-    'breathing': 'RGBLIGHT_EFFECT_BREATHING',
-    'christmas': 'RGBLIGHT_EFFECT_CHRISTMAS',
-    'knight': 'RGBLIGHT_EFFECT_KNIGHT',
-    'rainbow_mood': 'RGBLIGHT_EFFECT_RAINBOW_MOOD',
-    'rainbow_swirl': 'RGBLIGHT_EFFECT_RAINBOW_SWIRL',
-    'rgb_test': 'RGBLIGHT_EFFECT_RGB_TEST',
-    'snake': 'RGBLIGHT_EFFECT_SNAKE',
-    'static_gradient': 'RGBLIGHT_EFFECT_STATIC_GRADIENT',
-    'twinkle': 'RGBLIGHT_EFFECT_TWINKLE'
-}
-
-usb_properties = {'vid': 'VENDOR_ID', 'pid': 'PRODUCT_ID', 'device_ver': 'DEVICE_VER'}
-
 true_values = ['1', 'on', 'yes']
 false_values = ['0', 'off', 'no']
 
@@ -101,7 +62,6 @@ def info_json(keyboard):
     except jsonschema.ValidationError as e:
         json_path = '.'.join([str(p) for p in e.absolute_path])
         cli.log.error('Invalid API data: %s: %s: %s', keyboard, json_path, e.message)
-        print(dir(e))
         exit()
 
     # Make sure we have at least one layout
@@ -132,7 +92,7 @@ def _json_load(json_file):
     Note: file must be a Path object.
     """
     try:
-        return json.load(json_file.open())
+        return hjson.load(json_file.open())
 
     except json.decoder.JSONDecodeError as e:
         cli.log.error('Invalid JSON encountered attempting to load {fg_cyan}%s{fg_reset}:\n\t{fg_red}%s', json_file, e)
@@ -172,65 +132,6 @@ def keyboard_api_validate(data):
     return validator(data)
 
 
-def _extract_debounce(info_data, config_c):
-    """Handle debounce.
-    """
-    if 'debounce' in info_data and 'DEBOUNCE' in config_c:
-        _log_warning(info_data, 'Debounce is specified in both info.json and config.h, the config.h value wins.')
-
-    if 'DEBOUNCE' in config_c:
-        info_data['debounce'] = int(config_c['DEBOUNCE'])
-
-    return info_data
-
-
-def _extract_diode_direction(info_data, config_c):
-    """Handle the diode direction.
-    """
-    if 'diode_direction' in info_data and 'DIODE_DIRECTION' in config_c:
-        _log_warning(info_data, 'Diode direction is specified in both info.json and config.h, the config.h value wins.')
-
-    if 'DIODE_DIRECTION' in config_c:
-        info_data['diode_direction'] = config_c.get('DIODE_DIRECTION')
-
-    return info_data
-
-
-def _extract_indicators(info_data, config_c):
-    """Find the LED indicator information.
-    """
-    for json_key, config_key in LED_INDICATORS.items():
-        if json_key in info_data.get('indicators', []) and config_key in config_c:
-            _log_warning(info_data, f'Indicator {json_key} is specified in both info.json and config.h, the config.h value wins.')
-
-        if 'indicators' not in info_data:
-            info_data['indicators'] = {}
-
-        if config_key in config_c:
-            if 'indicators' not in info_data:
-                info_data['indicators'] = {}
-
-            info_data['indicators'][json_key] = config_c.get(config_key)
-
-    return info_data
-
-
-def _extract_community_layouts(info_data, rules):
-    """Find the community layouts in rules.mk.
-    """
-    community_layouts = rules['LAYOUTS'].split() if 'LAYOUTS' in rules else []
-
-    if 'community_layouts' in info_data:
-        for layout in community_layouts:
-            if layout not in info_data['community_layouts']:
-                community_layouts.append(layout)
-
-    else:
-        info_data['community_layouts'] = community_layouts
-
-    return info_data
-
-
 def _extract_features(info_data, rules):
     """Find all the features enabled in rules.mk.
     """
@@ -267,78 +168,6 @@ def _extract_features(info_data, rules):
     return info_data
 
 
-def _extract_led_drivers(info_data, rules):
-    """Find all the LED drivers set in rules.mk.
-    """
-    if 'LED_MATRIX_DRIVER' in rules:
-        if 'led_matrix' not in info_data:
-            info_data['led_matrix'] = {}
-
-        if info_data['led_matrix'].get('driver'):
-            _log_warning(info_data, 'LED Matrix driver is specified in both info.json and rules.mk, the rules.mk value wins.')
-
-        info_data['led_matrix']['driver'] = rules['LED_MATRIX_DRIVER']
-
-    return info_data
-
-
-def _extract_led_matrix(info_data, config_c):
-    """Handle the led_matrix configuration.
-    """
-    led_matrix = info_data.get('led_matrix', {})
-
-    for json_key, config_key in led_matrix_properties.items():
-        if config_key in config_c:
-            if json_key in led_matrix:
-                _log_warning(info_data, 'LED Matrix: %s is specified in both info.json and config.h, the config.h value wins.' % (json_key,))
-
-            led_matrix[json_key] = config_c[config_key]
-
-
-def _extract_rgblight(info_data, config_c):
-    """Handle the rgblight configuration.
-    """
-    rgblight = info_data.get('rgblight', {})
-    animations = rgblight.get('animations', {})
-
-    if 'RGBLED_SPLIT' in config_c:
-        raw_split = config_c.get('RGBLED_SPLIT', '').replace('{', '').replace('}', '').strip()
-        rgblight['split_count'] = [int(i) for i in raw_split.split(',')]
-
-    for json_key, config_key_type in rgblight_properties.items():
-        config_key, config_type = config_key_type
-
-        if config_key in config_c:
-            if json_key in rgblight:
-                _log_warning(info_data, 'RGB Light: %s is specified in both info.json and config.h, the config.h value wins.' % (json_key,))
-
-            try:
-                rgblight[json_key] = config_type(config_c[config_key])
-            except ValueError as e:
-                cli.log.error('%s: config.h: Could not convert "%s" to %s: %s', info_data['keyboard_folder'], config_c[config_key], config_type.__name__, e)
-
-    for json_key, config_key in rgblight_toggles.items():
-        if config_key in config_c and json_key in rgblight:
-            _log_warning(info_data, 'RGB Light: %s is specified in both info.json and config.h, the config.h value wins.', json_key)
-
-        rgblight[json_key] = config_key in config_c
-
-    for json_key, config_key in rgblight_animations.items():
-        if config_key in config_c:
-            if json_key in animations:
-                _log_warning(info_data, 'RGB Light: animations: %s is specified in both info.json and config.h, the config.h value wins.' % (json_key,))
-
-            animations[json_key] = config_c[config_key]
-
-    if animations:
-        rgblight['animations'] = animations
-
-    if rgblight:
-        info_data['rgblight'] = rgblight
-
-    return info_data
-
-
 def _pin_name(pin):
     """Returns the proper representation for a pin.
     """
@@ -426,34 +255,59 @@ def _extract_matrix_info(info_data, config_c):
     return info_data
 
 
-def _extract_usb_info(info_data, config_c):
-    """Populate the USB information.
+def _extract_config_h(info_data):
+    """Pull some keyboard information from existing config.h files
     """
-    if 'usb' not in info_data:
-        info_data['usb'] = {}
+    config_c = config_h(info_data['keyboard_folder'])
 
-    for info_name, config_name in usb_properties.items():
-        if config_name in config_c:
-            if info_name in info_data['usb']:
-                _log_warning(info_data, '%s in config.h is overwriting usb.%s in info.json' % (config_name, info_name))
+    # Pull in data from the json map
+    dotty_info = dotty(info_data)
+    info_config_map = _json_load(Path('data/mappings/info_config.json'))
 
-            info_data['usb'][info_name] = '0x' + config_c[config_name][2:].upper()
+    for config_key, info_dict in info_config_map.items():
+        info_key = info_dict['info_key']
+        key_type = info_dict.get('value_type', 'str')
 
-    return info_data
+        try:
+            if config_key in config_c and info_dict.get('to_json', True):
+                if dotty_info.get(info_key) and info_dict.get('warn_duplicate', True):
+                    _log_warning(info_data, '%s in config.h is overwriting %s in info.json' % (config_key, info_key))
 
+                if key_type.startswith('array'):
+                    if '.' in key_type:
+                        key_type, array_type = key_type.split('.', 1)
+                    else:
+                        array_type = None
 
-def _extract_config_h(info_data):
-    """Pull some keyboard information from existing config.h files
-    """
-    config_c = config_h(info_data['keyboard_folder'])
+                    config_value = config_c[config_key].replace('{', '').replace('}', '').strip()
+
+                    if array_type == 'int':
+                        dotty_info[info_key] = list(map(int, config_value.split(',')))
+                    else:
+                        dotty_info[info_key] = config_value.split(',')
+
+                elif key_type == 'bool':
+                    dotty_info[info_key] = config_c[config_key] in true_values
+
+                elif key_type == 'hex':
+                    dotty_info[info_key] = '0x' + config_c[config_key][2:].upper()
 
-    _extract_debounce(info_data, config_c)
-    _extract_diode_direction(info_data, config_c)
-    _extract_indicators(info_data, config_c)
+                elif key_type == 'list':
+                    dotty_info[info_key] = config_c[config_key].split()
+
+                elif key_type == 'int':
+                    dotty_info[info_key] = int(config_c[config_key])
+
+                else:
+                    dotty_info[info_key] = config_c[config_key]
+
+        except Exception as e:
+            _log_warning(info_data, f'{config_key}->{info_key}: {e}')
+
+    info_data.update(dotty_info)
+
+    # Pull data that easily can't be mapped in json
     _extract_matrix_info(info_data, config_c)
-    _extract_usb_info(info_data, config_c)
-    _extract_led_matrix(info_data, config_c)
-    _extract_rgblight(info_data, config_c)
 
     return info_data
 
@@ -462,21 +316,66 @@ def _extract_rules_mk(info_data):
     """Pull some keyboard information from existing rules.mk files
     """
     rules = rules_mk(info_data['keyboard_folder'])
-    mcu = rules.get('MCU', info_data.get('processor'))
+    info_data['processor'] = rules.get('MCU', info_data.get('processor', 'atmega32u4'))
 
-    if mcu in CHIBIOS_PROCESSORS:
+    if info_data['processor'] in CHIBIOS_PROCESSORS:
         arm_processor_rules(info_data, rules)
 
-    elif mcu in LUFA_PROCESSORS + VUSB_PROCESSORS:
+    elif info_data['processor'] in LUFA_PROCESSORS + VUSB_PROCESSORS:
         avr_processor_rules(info_data, rules)
 
     else:
-        cli.log.warning("%s: Unknown MCU: %s" % (info_data['keyboard_folder'], mcu))
+        cli.log.warning("%s: Unknown MCU: %s" % (info_data['keyboard_folder'], info_data['processor']))
         unknown_processor_rules(info_data, rules)
 
-    _extract_community_layouts(info_data, rules)
+    # Pull in data from the json map
+    dotty_info = dotty(info_data)
+    info_rules_map = _json_load(Path('data/mappings/info_rules.json'))
+
+    for rules_key, info_dict in info_rules_map.items():
+        info_key = info_dict['info_key']
+        key_type = info_dict.get('value_type', 'str')
+
+        try:
+            if rules_key in rules and info_dict.get('to_json', True):
+                if dotty_info.get(info_key) and info_dict.get('warn_duplicate', True):
+                    _log_warning(info_data, '%s in rules.mk is overwriting %s in info.json' % (rules_key, info_key))
+
+                if key_type.startswith('array'):
+                    if '.' in key_type:
+                        key_type, array_type = key_type.split('.', 1)
+                    else:
+                        array_type = None
+
+                    rules_value = rules[rules_key].replace('{', '').replace('}', '').strip()
+
+                    if array_type == 'int':
+                        dotty_info[info_key] = list(map(int, rules_value.split(',')))
+                    else:
+                        dotty_info[info_key] = rules_value.split(',')
+
+                elif key_type == 'list':
+                    dotty_info[info_key] = rules[rules_key].split()
+
+                elif key_type == 'bool':
+                    dotty_info[info_key] = rules[rules_key] in true_values
+
+                elif key_type == 'hex':
+                    dotty_info[info_key] = '0x' + rules[rules_key][2:].upper()
+
+                elif key_type == 'int':
+                    dotty_info[info_key] = int(rules[rules_key])
+
+                else:
+                    dotty_info[info_key] = rules[rules_key]
+
+        except Exception as e:
+            _log_warning(info_data, f'{rules_key}->{info_key}: {e}')
+
+    info_data.update(dotty_info)
+
+    # Merge in config values that can't be easily mapped
     _extract_features(info_data, rules)
-    _extract_led_drivers(info_data, rules)
 
     return info_data
 
@@ -565,23 +464,7 @@ def arm_processor_rules(info_data, rules):
     info_data['processor_type'] = 'arm'
     info_data['protocol'] = 'ChibiOS'
 
-    if 'MCU' in rules:
-        if 'processor' in info_data:
-            _log_warning(info_data, 'Processor/MCU is specified in both info.json and rules.mk, the rules.mk value wins.')
-
-        info_data['processor'] = rules['MCU']
-
-    elif 'processor' not in info_data:
-        info_data['processor'] = 'unknown'
-
-    if 'BOOTLOADER' in rules:
-        # FIXME(skullydazed/anyone): need to remove the massive amounts of duplication first
-        # if 'bootloader' in info_data:
-        #     _log_warning(info_data, 'Bootloader is specified in both info.json and rules.mk, the rules.mk value wins.')
-
-        info_data['bootloader'] = rules['BOOTLOADER']
-
-    else:
+    if 'bootloader' not in info_data:
         if 'STM32' in info_data['processor']:
             info_data['bootloader'] = 'stm32-dfu'
         else:
@@ -594,12 +477,6 @@ def arm_processor_rules(info_data, rules):
     elif 'ARM_ATSAM' in rules:
         info_data['platform'] = 'ARM_ATSAM'
 
-    if 'BOARD' in rules:
-        if 'board' in info_data:
-            _log_warning(info_data, 'Board is specified in both info.json and rules.mk, the rules.mk value wins.')
-
-        info_data['board'] = rules['BOARD']
-
     return info_data
 
 
@@ -607,26 +484,10 @@ def avr_processor_rules(info_data, rules):
     """Setup the default info for an AVR board.
     """
     info_data['processor_type'] = 'avr'
-    info_data['bootloader'] = rules['BOOTLOADER'] if 'BOOTLOADER' in rules else 'atmel-dfu'
     info_data['platform'] = rules['ARCH'] if 'ARCH' in rules else 'unknown'
     info_data['protocol'] = 'V-USB' if rules.get('MCU') in VUSB_PROCESSORS else 'LUFA'
 
-    if 'MCU' in rules:
-        if 'processor' in info_data:
-            _log_warning(info_data, 'Processor/MCU is specified in both info.json and rules.mk, the rules.mk value wins.')
-
-        info_data['processor'] = rules['MCU']
-
-    elif 'processor' not in info_data:
-        info_data['processor'] = 'unknown'
-
-    if 'BOOTLOADER' in rules:
-        # FIXME(skullydazed/anyone): need to remove the massive amounts of duplication first
-        # if 'bootloader' in info_data:
-        #     _log_warning(info_data, 'Bootloader is specified in both info.json and rules.mk, the rules.mk value wins.')
-
-        info_data['bootloader'] = rules['BOOTLOADER']
-    else:
+    if 'bootloader' not in info_data:
         info_data['bootloader'] = 'atmel-dfu'
 
     # FIXME(fauxpark/anyone): Eventually we should detect the protocol by looking at PROTOCOL inherited from mcu_selection.mk:
diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py
index f889833d0..3efeddb85 100644
--- a/lib/python/qmk/tests/test_cli_commands.py
+++ b/lib/python/qmk/tests/test_cli_commands.py
@@ -230,3 +230,32 @@ def test_generate_rgb_breathe_table():
     check_returncode(result)
     assert 'Breathing center: 1.2' in result.stdout
     assert 'Breathing max:    127' in result.stdout
+
+
+def test_generate_config_h():
+    result = check_subcommand('generate-config-h', '-kb', 'handwired/pytest/basic')
+    check_returncode(result)
+    assert '#   define DEVICE_VER 0x0001' in result.stdout
+    assert '#   define DESCRIPTION handwired/pytest/basic' in result.stdout
+    assert '#   define DIODE_DIRECTION COL2ROW' in result.stdout
+    assert '#   define MANUFACTURER none' in result.stdout
+    assert '#   define PRODUCT handwired/pytest/basic' in result.stdout
+    assert '#   define PRODUCT_ID 0x6465' in result.stdout
+    assert '#   define VENDOR_ID 0xFEED' in result.stdout
+    assert '#   define MATRIX_COLS 1' in result.stdout
+    assert '#   define MATRIX_COL_PINS { F4 }' in result.stdout
+    assert '#   define MATRIX_ROWS 1' in result.stdout
+    assert '#   define MATRIX_ROW_PINS { F5 }' in result.stdout
+
+
+def test_generate_rules_mk():
+    result = check_subcommand('generate-rules-mk', '-kb', 'handwired/pytest/basic')
+    check_returncode(result)
+    assert 'BOOTLOADER ?= atmel-dfu' in result.stdout
+    assert 'MCU ?= atmega32u4' in result.stdout
+
+
+def test_generate_layouts():
+    result = check_subcommand('generate-layouts', '-kb', 'handwired/pytest/basic')
+    check_returncode(result)
+    assert '#define LAYOUT_custom(k0A) {' in result.stdout
diff --git a/requirements.txt b/requirements.txt
index f4d43da8d..27a6baed9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,6 +2,7 @@
 appdirs
 argcomplete
 colorama
+dotty-dict
 hjson
 jsonschema
 milc
-- 
cgit v1.3.1


From 448cc1acd5f107f9679a48c605861654523432e7 Mon Sep 17 00:00:00 2001
From: Zach White <skullydazed@gmail.com>
Date: Mon, 8 Feb 2021 03:03:08 -0800
Subject: remove deprecated qmk json-keymap (#11823)

---
 lib/python/qmk/cli/__init__.py      |  1 -
 lib/python/qmk/cli/json/__init__.py |  5 -----
 lib/python/qmk/cli/json/keymap.py   | 16 ----------------
 3 files changed, 22 deletions(-)
 delete mode 100644 lib/python/qmk/cli/json/__init__.py
 delete mode 100755 lib/python/qmk/cli/json/keymap.py

(limited to 'lib/python/qmk/cli')

diff --git a/lib/python/qmk/cli/__init__.py b/lib/python/qmk/cli/__init__.py
index 372c40921..1732287da 100644
--- a/lib/python/qmk/cli/__init__.py
+++ b/lib/python/qmk/cli/__init__.py
@@ -19,7 +19,6 @@ from . import flash
 from . import generate
 from . import hello
 from . import info
-from . import json
 from . import json2c
 from . import lint
 from . import list
diff --git a/lib/python/qmk/cli/json/__init__.py b/lib/python/qmk/cli/json/__init__.py
deleted file mode 100644
index f4ebfc45b..000000000
--- a/lib/python/qmk/cli/json/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-"""QMK CLI JSON Subcommands
-
-We list each subcommand here explicitly because all the reliable ways of searching for modules are slow and delay startup.
-"""
-from . import keymap
diff --git a/lib/python/qmk/cli/json/keymap.py b/lib/python/qmk/cli/json/keymap.py
deleted file mode 100755
index 2af9faaa7..000000000
--- a/lib/python/qmk/cli/json/keymap.py
+++ /dev/null
@@ -1,16 +0,0 @@
-"""Generate a keymap.c from a configurator export.
-"""
-from pathlib import Path
-
-from milc import cli
-
-
-@cli.argument('-o', '--output', arg_only=True, type=Path, help='File to write to')
-@cli.argument('-q', '--quiet', arg_only=True, action='store_true', help="Quiet mode, only output error messages")
-@cli.argument('filename', arg_only=True, help='Configurator JSON file')
-@cli.subcommand('Creates a keymap.c from a QMK Configurator export.', hidden=True)
-def json_keymap(cli):
-    """Renamed to `qmk json2c`.
-    """
-    cli.log.error('This command has been renamed to `qmk json2c`.')
-    return False
-- 
cgit v1.3.1


From cd336b2b545798269405e8ffef0fe8958d4d27d4 Mon Sep 17 00:00:00 2001
From: Zach White <skullydazed@gmail.com>
Date: Sat, 13 Feb 2021 10:26:45 -0800
Subject: bump to python 3.7 (#11408)

---
 lib/python/qmk/cli/__init__.py | 22 ++++++++++++++++++++--
 util/install/gentoo.sh         |  2 +-
 util/install/opensuse.sh       | 31 -------------------------------
 util/install/sabayon.sh        | 15 ---------------
 util/qmk_install.sh            |  8 ++------
 5 files changed, 23 insertions(+), 55 deletions(-)
 delete mode 100755 util/install/opensuse.sh
 delete mode 100755 util/install/sabayon.sh

(limited to 'lib/python/qmk/cli')

diff --git a/lib/python/qmk/cli/__init__.py b/lib/python/qmk/cli/__init__.py
index 1732287da..a5f1f4767 100644
--- a/lib/python/qmk/cli/__init__.py
+++ b/lib/python/qmk/cli/__init__.py
@@ -27,6 +27,24 @@ from . import new
 from . import pyformat
 from . import pytest
 
-if sys.version_info[0] != 3 or sys.version_info[1] < 6:
-    cli.log.error('Your Python is too old! Please upgrade to Python 3.6 or later.')
+# Supported version information
+#
+# Based on the OSes we support these are the minimum python version available by default.
+# Last update: 2021 Jan 02
+#
+# Arch: 3.9
+# Debian: 3.7
+# Fedora 31: 3.7
+# Fedora 32: 3.8
+# Fedora 33: 3.9
+# FreeBSD: 3.7
+# Gentoo: 3.7
+# macOS: 3.9 (from homebrew)
+# msys2: 3.8
+# Slackware: 3.7
+# solus: 3.7
+# void: 3.9
+
+if sys.version_info[0] != 3 or sys.version_info[1] < 7:
+    cli.log.error('Your Python is too old! Please upgrade to Python 3.7 or later.')
     exit(127)
diff --git a/util/install/gentoo.sh b/util/install/gentoo.sh
index d4284e9a9..97eb5df07 100755
--- a/util/install/gentoo.sh
+++ b/util/install/gentoo.sh
@@ -23,7 +23,7 @@ _qmk_install() {
     sudo emerge -auN sys-devel/gcc
     sudo emerge -au --noreplace \
         app-arch/unzip app-arch/zip net-misc/wget sys-devel/clang sys-devel/crossdev \
-        \>=dev-lang/python-3.6 \
+        \>=dev-lang/python-3.7 \
         dev-embedded/avrdude dev-embedded/dfu-programmer app-mobilephone/dfu-util
 
     sudo crossdev -s4 --stable --g \<9 --portage --verbose --target avr
diff --git a/util/install/opensuse.sh b/util/install/opensuse.sh
deleted file mode 100755
index 47b44ae36..000000000
--- a/util/install/opensuse.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-_qmk_install_prepare() {
-    case $(grep ID /etc/os-release) in
-        *15.1*)
-            REPO_RELEASE=Leap_15.1;;
-        *15.2*)
-            REPO_RELEASE=Leap_15.2;;
-        *)
-            #REPO_RELEASE=Tumbleweed;;
-            echo "ERROR: Tumbleweed is currently not supported."
-            exit 1
-    esac
-
-    sudo zypper addrepo https://download.opensuse.org/repositories/devel:gcc/openSUSE_$REPO_RELEASE/devel:gcc.repo
-    sudo zypper addrepo https://download.opensuse.org/repositories/hardware/openSUSE_$REPO_RELEASE/hardware.repo
-    sudo zypper --gpg-auto-import-keys refresh
-}
-
-_qmk_install() {
-    echo "Installing dependencies"
-
-    sudo zypper install -y \
-        make clang gcc unzip wget zip \
-        python3-pip \
-        cross-avr-binutils cross-avr-gcc8 avr-libc \
-        cross-arm-binutils cross-arm-none-gcc8 cross-arm-none-newlib-devel \
-        avrdude dfu-programmer dfu-util
-
-    python3 -m pip install --user -r $QMK_FIRMWARE_DIR/requirements.txt
-}
diff --git a/util/install/sabayon.sh b/util/install/sabayon.sh
deleted file mode 100755
index fd4f4d8df..000000000
--- a/util/install/sabayon.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-_qmk_install() {
-    echo "Installing dependencies"
-
-    sudo equo install \
-        app-arch/unzip app-arch/zip net-misc/wget dev-vcs/git sys-devel/clang sys-devel/gcc sys-devel/crossdev \
-        dev-python/pip \
-        dev-embedded/avrdude dev-embedded/dfu-programmer app-mobilephone/dfu-util
-
-    sudo crossdev -s4 --stable --g \<9 --portage --verbose --target avr
-    sudo crossdev -s4 --stable --g \<9 --portage --verbose --target arm-none-eabi
-
-    python3 -m pip install --user -r $QMK_FIRMWARE_DIR/requirements.txt
-}
diff --git a/util/qmk_install.sh b/util/qmk_install.sh
index 5076e980a..421a91a99 100755
--- a/util/qmk_install.sh
+++ b/util/qmk_install.sh
@@ -25,10 +25,6 @@ case $(uname -a) in
                 . "$QMK_FIRMWARE_UTIL_DIR/install/fedora.sh";;
             *gentoo*)
                 . "$QMK_FIRMWARE_UTIL_DIR/install/gentoo.sh";;
-            *opensuse*|*tumbleweed*)
-                . "$QMK_FIRMWARE_UTIL_DIR/install/opensuse.sh";;
-            *sabayon*)
-                . "$QMK_FIRMWARE_UTIL_DIR/install/sabayon.sh";;
             *slackware*)
                 . "$QMK_FIRMWARE_UTIL_DIR/install/slackware.sh";;
             *solus*)
@@ -36,9 +32,9 @@ case $(uname -a) in
             *void*)
                 . "$QMK_FIRMWARE_UTIL_DIR/install/void.sh";;
             *)
-                echo "Sorry, we don't recognize your distribution. Help us by contributing support!"
+                echo "Sorry, we don't recognize your distribution. Try using the docker image instead:"
                 echo
-                echo "https://docs.qmk.fm/#/contributing"
+                echo "https://docs.qmk.fm/#/getting_started_docker"
                 exit 1;;
         esac
 
-- 
cgit v1.3.1


From 1581ea48dcd48d0d3f42cc09b388c468aedec45d Mon Sep 17 00:00:00 2001
From: Zach White <skullydazed@gmail.com>
Date: Sat, 27 Feb 2021 12:00:50 -0800
Subject: Fix develop (#12039)

Fixes file encoding errors on Windows, and layouts not correctly merging into info.json.

* force utf8 encoding

* correctly merge layouts and layout aliases

* show what aliases point to
---
 data/schemas/keyboard.jsonschema            | 12 ++++++--
 lib/python/qmk/c_parse.py                   | 11 ++------
 lib/python/qmk/cli/chibios/confmigrate.py   |  8 +++---
 lib/python/qmk/cli/generate/layouts.py      |  4 +++
 lib/python/qmk/cli/info.py                  |  7 +++--
 lib/python/qmk/cli/kle2json.py              |  2 +-
 lib/python/qmk/info.py                      | 44 ++++++++++++++++++++++-------
 lib/python/qmk/keymap.py                    |  6 ++--
 lib/python/qmk/os_helpers/linux/__init__.py |  2 +-
 lib/python/qmk/tests/test_cli_commands.py   |  2 +-
 10 files changed, 66 insertions(+), 32 deletions(-)

(limited to 'lib/python/qmk/cli')

diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 967b5f990..f5fb611bd 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -85,8 +85,16 @@
         "layout_aliases": {
             "type": "object",
             "additionalProperties": {
-                "type": "string",
-                "pattern": "^LAYOUT_[0-9a-z_]*$"
+                "oneOf": [
+                    {
+                        "type": "string",
+                        "enum": ["LAYOUT"]
+                    },
+                    {
+                        "type": "string",
+                        "pattern": "^LAYOUT_[0-9a-z_]*$"
+                    }
+                ]
             }
         },
         "layouts": {
diff --git a/lib/python/qmk/c_parse.py b/lib/python/qmk/c_parse.py
index 89dd278b7..d4f39c883 100644
--- a/lib/python/qmk/c_parse.py
+++ b/lib/python/qmk/c_parse.py
@@ -46,7 +46,7 @@ def find_layouts(file):
     parsed_layouts = {}
 
     # Search the file for LAYOUT macros and aliases
-    file_contents = file.read_text()
+    file_contents = file.read_text(encoding='utf-8')
     file_contents = comment_remover(file_contents)
     file_contents = file_contents.replace('\\\n', '')
 
@@ -87,12 +87,7 @@ def find_layouts(file):
             except ValueError:
                 continue
 
-    # Populate our aliases
-    for alias, text in aliases.items():
-        if text in parsed_layouts and 'KEYMAP' not in alias:
-            parsed_layouts[alias] = parsed_layouts[text]
-
-    return parsed_layouts
+    return parsed_layouts, aliases
 
 
 def parse_config_h_file(config_h_file, config_h=None):
@@ -104,7 +99,7 @@ def parse_config_h_file(config_h_file, config_h=None):
     config_h_file = Path(config_h_file)
 
     if config_h_file.exists():
-        config_h_text = config_h_file.read_text()
+        config_h_text = config_h_file.read_text(encoding='utf-8')
         config_h_text = config_h_text.replace('\\\n', '')
         config_h_text = strip_multiline_comment(config_h_text)
 
diff --git a/lib/python/qmk/cli/chibios/confmigrate.py b/lib/python/qmk/cli/chibios/confmigrate.py
index 3e348b2b0..89995931a 100644
--- a/lib/python/qmk/cli/chibios/confmigrate.py
+++ b/lib/python/qmk/cli/chibios/confmigrate.py
@@ -40,7 +40,7 @@ file_header = """\
 
 
 def collect_defines(filepath):
-    with open(filepath, 'r') as f:
+    with open(filepath, 'r', encoding='utf-8') as f:
         content = f.read()
         define_search = re.compile(r'(?m)^#\s*define\s+(?:.*\\\r?\n)*.*$', re.MULTILINE)
         value_search = re.compile(r'^#\s*define\s+(?P<name>[a-zA-Z0-9_]+(\([^\)]*\))?)\s*(?P<value>.*)', re.DOTALL)
@@ -146,17 +146,17 @@ def chibios_confmigrate(cli):
         if cli.args.input.name == "chconf.h" and ("CHCONF_H" in input_defs["dict"] or "_CHCONF_H_" in input_defs["dict"] or cli.args.force):
             migrate_chconf_h(to_override, outfile=sys.stdout)
             if cli.args.overwrite:
-                with open(cli.args.input, "w") as out_file:
+                with open(cli.args.input, "w", encoding='utf-8') as out_file:
                     migrate_chconf_h(to_override, outfile=out_file)
 
         elif cli.args.input.name == "halconf.h" and ("HALCONF_H" in input_defs["dict"] or "_HALCONF_H_" in input_defs["dict"] or cli.args.force):
             migrate_halconf_h(to_override, outfile=sys.stdout)
             if cli.args.overwrite:
-                with open(cli.args.input, "w") as out_file:
+                with open(cli.args.input, "w", encoding='utf-8') as out_file:
                     migrate_halconf_h(to_override, outfile=out_file)
 
         elif cli.args.input.name == "mcuconf.h" and ("MCUCONF_H" in input_defs["dict"] or "_MCUCONF_H_" in input_defs["dict"] or cli.args.force):
             migrate_mcuconf_h(to_override, outfile=sys.stdout)
             if cli.args.overwrite:
-                with open(cli.args.input, "w") as out_file:
+                with open(cli.args.input, "w", encoding='utf-8') as out_file:
                     migrate_mcuconf_h(to_override, outfile=out_file)
diff --git a/lib/python/qmk/cli/generate/layouts.py b/lib/python/qmk/cli/generate/layouts.py
index b7baae065..15b289522 100755
--- a/lib/python/qmk/cli/generate/layouts.py
+++ b/lib/python/qmk/cli/generate/layouts.py
@@ -82,6 +82,10 @@ def generate_layouts(cli):
         layouts_h_lines.append(rows)
         layouts_h_lines.append('}')
 
+    for alias, target in kb_info_json.get('layout_aliases', {}).items():
+        layouts_h_lines.append('')
+        layouts_h_lines.append('#define %s %s' % (alias, target))
+
     # Show the results
     layouts_h = '\n'.join(layouts_h_lines) + '\n'
 
diff --git a/lib/python/qmk/cli/info.py b/lib/python/qmk/cli/info.py
index 87d7253d4..a7ce8abf0 100755
--- a/lib/python/qmk/cli/info.py
+++ b/lib/python/qmk/cli/info.py
@@ -29,7 +29,7 @@ def show_keymap(kb_info_json, title_caps=True):
         else:
             cli.echo('{fg_blue}keymap_%s{fg_reset}:', cli.config.info.keymap)
 
-        keymap_data = json.load(keymap_path.open())
+        keymap_data = json.load(keymap_path.open(encoding='utf-8'))
         layout_name = keymap_data['layout']
 
         for layer_num, layer in enumerate(keymap_data['layers']):
@@ -57,7 +57,7 @@ def show_matrix(kb_info_json, title_caps=True):
         # Build our label list
         labels = []
         for key in layout['layout']:
-            if key['matrix']:
+            if 'matrix' in key:
                 row = ROW_LETTERS[key['matrix'][0]]
                 col = COL_LETTERS[key['matrix'][1]]
 
@@ -91,6 +91,9 @@ def print_friendly_output(kb_info_json):
         cli.echo('{fg_blue}Size{fg_reset}: %s x %s' % (kb_info_json['width'], kb_info_json['height']))
     cli.echo('{fg_blue}Processor{fg_reset}: %s', kb_info_json.get('processor', 'Unknown'))
     cli.echo('{fg_blue}Bootloader{fg_reset}: %s', kb_info_json.get('bootloader', 'Unknown'))
+    if 'layout_aliases' in kb_info_json:
+        aliases = [f'{key}={value}' for key, value in kb_info_json['layout_aliases'].items()]
+        cli.echo('{fg_blue}Layout aliases:{fg_reset} %s' % (', '.join(aliases),))
 
     if cli.config.info.layouts:
         show_layouts(kb_info_json, True)
diff --git a/lib/python/qmk/cli/kle2json.py b/lib/python/qmk/cli/kle2json.py
index 66d504bfc..3bb744358 100755
--- a/lib/python/qmk/cli/kle2json.py
+++ b/lib/python/qmk/cli/kle2json.py
@@ -27,7 +27,7 @@ def kle2json(cli):
         cli.log.error('File {fg_cyan}%s{style_reset_all} was not found.', file_path)
         return False
     out_path = file_path.parent
-    raw_code = file_path.open().read()
+    raw_code = file_path.read_text(encoding='utf-8')
     # Check if info.json exists, allow overwrite with force
     if Path(out_path, "info.json").exists() and not cli.args.force:
         cli.log.error('File {fg_cyan}%s/info.json{style_reset_all} already exists, use -f or --force to overwrite.', out_path)
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 2accaba9e..cf5dc6640 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -45,7 +45,12 @@ def info_json(keyboard):
         info_data['keymaps'][keymap.name] = {'url': f'https://raw.githubusercontent.com/qmk/qmk_firmware/master/{keymap}/keymap.json'}
 
     # Populate layout data
-    for layout_name, layout_json in _find_all_layouts(info_data, keyboard).items():
+    layouts, aliases = _find_all_layouts(info_data, keyboard)
+
+    if aliases:
+        info_data['layout_aliases'] = aliases
+
+    for layout_name, layout_json in layouts.items():
         if not layout_name.startswith('LAYOUT_kc'):
             layout_json['c_macro'] = True
             info_data['layouts'][layout_name] = layout_json
@@ -92,7 +97,7 @@ def _json_load(json_file):
     Note: file must be a Path object.
     """
     try:
-        return hjson.load(json_file.open())
+        return hjson.load(json_file.open(encoding='utf-8'))
 
     except json.decoder.JSONDecodeError as e:
         cli.log.error('Invalid JSON encountered attempting to load {fg_cyan}%s{fg_reset}:\n\t{fg_red}%s', json_file, e)
@@ -415,21 +420,28 @@ def _merge_layouts(info_data, new_info_data):
 
 def _search_keyboard_h(path):
     current_path = Path('keyboards/')
+    aliases = {}
     layouts = {}
+
     for directory in path.parts:
         current_path = current_path / directory
         keyboard_h = '%s.h' % (directory,)
         keyboard_h_path = current_path / keyboard_h
         if keyboard_h_path.exists():
-            layouts.update(find_layouts(keyboard_h_path))
+            new_layouts, new_aliases = find_layouts(keyboard_h_path)
+            layouts.update(new_layouts)
+
+            for alias, alias_text in new_aliases.items():
+                if alias_text in layouts:
+                    aliases[alias] = alias_text
 
-    return layouts
+    return layouts, aliases
 
 
 def _find_all_layouts(info_data, keyboard):
     """Looks for layout macros associated with this keyboard.
     """
-    layouts = _search_keyboard_h(Path(keyboard))
+    layouts, aliases = _search_keyboard_h(Path(keyboard))
 
     if not layouts:
         # If we don't find any layouts from info.json or keyboard.h we widen our search. This is error prone which is why we want to encourage people to follow the standard above.
@@ -437,11 +449,15 @@ def _find_all_layouts(info_data, keyboard):
 
         for file in glob('keyboards/%s/*.h' % keyboard):
             if file.endswith('.h'):
-                these_layouts = find_layouts(file)
+                these_layouts, these_aliases = find_layouts(file)
+
                 if these_layouts:
                     layouts.update(these_layouts)
 
-    return layouts
+                if these_aliases:
+                    aliases.update(these_aliases)
+
+    return layouts, aliases
 
 
 def _log_error(info_data, message):
@@ -540,11 +556,19 @@ def merge_info_jsons(keyboard, info_data):
             cli.log.error('\t%s: %s', json_path, e.message)
             continue
 
-        # Mark the layouts as coming from json
-        for layout in new_info_data.get('layouts', {}).values():
-            layout['c_macro'] = False
+        # Merge layout data in
+        for layout_name, layout in new_info_data.get('layouts', {}).items():
+            if layout_name in info_data['layouts']:
+                for new_key, existing_key in zip(layout['layout'], info_data['layouts'][layout_name]['layout']):
+                    existing_key.update(new_key)
+            else:
+                layout['c_macro'] = False
+                info_data['layouts'][layout_name] = layout
 
         # Update info_data with the new data
+        if 'layouts' in new_info_data:
+            del (new_info_data['layouts'])
+
         deep_update(info_data, new_info_data)
 
     return info_data
diff --git a/lib/python/qmk/keymap.py b/lib/python/qmk/keymap.py
index 266532f50..d8495c38b 100644
--- a/lib/python/qmk/keymap.py
+++ b/lib/python/qmk/keymap.py
@@ -42,7 +42,7 @@ def template_json(keyboard):
     template_file = Path('keyboards/%s/templates/keymap.json' % keyboard)
     template = {'keyboard': keyboard}
     if template_file.exists():
-        template.update(json.loads(template_file.read_text()))
+        template.update(json.load(template_file.open(encoding='utf-8')))
 
     return template
 
@@ -58,7 +58,7 @@ def template_c(keyboard):
     """
     template_file = Path('keyboards/%s/templates/keymap.c' % keyboard)
     if template_file.exists():
-        template = template_file.read_text()
+        template = template_file.read_text(encoding='utf-8')
     else:
         template = DEFAULT_KEYMAP_C
 
@@ -469,7 +469,7 @@ def parse_keymap_c(keymap_file, use_cpp=True):
         if use_cpp:
             keymap_file = _c_preprocess(keymap_file)
         else:
-            keymap_file = keymap_file.read_text()
+            keymap_file = keymap_file.read_text(encoding='utf-8')
 
     keymap = dict()
     keymap['layers'] = _get_layers(keymap_file)
diff --git a/lib/python/qmk/os_helpers/linux/__init__.py b/lib/python/qmk/os_helpers/linux/__init__.py
index a04ac4f8a..9e73964e4 100644
--- a/lib/python/qmk/os_helpers/linux/__init__.py
+++ b/lib/python/qmk/os_helpers/linux/__init__.py
@@ -95,7 +95,7 @@ def check_udev_rules():
 
         # Collect all rules from the config files
         for rule_file in udev_rules:
-            for line in rule_file.read_text().split('\n'):
+            for line in rule_file.read_text(encoding='utf-8').split('\n'):
                 line = line.strip()
                 if not line.startswith("#") and len(line):
                     current_rules.add(line)
diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py
index 3efeddb85..82c42a20e 100644
--- a/lib/python/qmk/tests/test_cli_commands.py
+++ b/lib/python/qmk/tests/test_cli_commands.py
@@ -16,7 +16,7 @@ def check_subcommand(command, *args):
 def check_subcommand_stdin(file_to_read, command, *args):
     """Pipe content of a file to a command and return output.
     """
-    with open(file_to_read) as my_file:
+    with open(file_to_read, encoding='utf-8') as my_file:
         cmd = ['bin/qmk', command, *args]
         result = run(cmd, stdin=my_file, stdout=PIPE, stderr=STDOUT, universal_newlines=True)
     return result
-- 
cgit v1.3.1