Merge remote-tracking branch 'origin/master' into develop

Author: qmk-bot

lib/python/qmk/cli/flash.py

@@ -76,9 +76,9 @@ def flash(cli):
 
     if cli.args.filename:
         # Handle compiling a configurator JSON
-        user_keymap = parse_configurator_json(cli.args.filename, parallel=cli.config.flash.parallel)
+        user_keymap = parse_configurator_json(cli.args.filename)
         keymap_path = qmk.path.keymap(user_keymap['keyboard'])
-        command = compile_configurator_json(user_keymap, cli.args.bootloader, **envs)
+        command = compile_configurator_json(user_keymap, cli.args.bootloader, parallel=cli.config.flash.parallel, **envs)
 
         cli.log.info('Wrote keymap to {fg_cyan}%s/%s/keymap.c', keymap_path, user_keymap['keymap'])
 

lib/python/qmk/commands.py

@@ -98,7 +98,7 @@ def write_version_h(git_version, build_date, chibios_version, chibios_contrib_ve
     version_h_file.write_text('\n'.join(version_h))
 
 
-def compile_configurator_json(user_keymap, parallel=1, **env_vars):
+def compile_configurator_json(user_keymap, bootloader=None, parallel=1, **env_vars):
     """Convert a configurator export JSON file into a C file and then compile it.
 
     Args:
@@ -153,6 +153,9 @@ def compile_configurator_json(user_keymap, parallel=1, **env_vars):
         'build_keyboard.mk',
     ])
 
+    if bootloader:
+        make_command.append(bootloader)
+
     for key, value in env_vars.items():
         make_command.append(f'{key}={value}')