drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Move bootloader.mk to platforms (#18228)

Browse source
This commit is contained in:
Ryan 2022-09-01 00:17:24 +10:00 • committed by GitHub
parent 0237ff0c62
commit bb6f028833
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 180 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/python/qmk/info.py
View file

@ -755,9 +755,6 @@ def arm_processor_rules(info_data, rules):
info_data['processor_type'] = 'arm'
info_data['protocol'] = 'ChibiOS'
if 'bootloader' not in info_data:
info_data['bootloader'] = 'unknown'
if 'STM32' in info_data['processor']:
info_data['platform'] = 'STM32'
elif 'MCU_SERIES' in rules:
@ -775,9 +772,6 @@ def avr_processor_rules(info_data, rules):
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 '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:
# info_data['protocol'] = 'V-USB' if rules.get('PROTOCOL') == 'VUSB' else 'LUFA'

2
lib/python/qmk/keymap.py
View file

@ -412,7 +412,7 @@ def list_keymaps(keyboard, c=True, json=True, additional_files=None, fullpath=Fa
rules = rules_mk(keyboard)
names = set()
if rules:
if rules is not None:
keyboards_dir = Path('keyboards')
kb_path = keyboards_dir / keyboard