diff options
| author | Ryan <fauxpark@gmail.com> | 2022-09-01 00:17:24 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-31 07:17:24 -0700 |
| commit | bb6f02883363b815de8e2510964787634f86d635 (patch) | |
| tree | 41dff68762a7ec94bbfabea6a8cea1527f652b42 /lib | |
| parent | 0237ff0c62d4278df3c0c93f5f85f84c1a0ed519 (diff) | |
Move bootloader.mk to platforms (#18228)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/python/qmk/info.py | 6 | ||||
| -rw-r--r-- | lib/python/qmk/keymap.py | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index e0a46e7ed1..637a27b764 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -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' diff --git a/lib/python/qmk/keymap.py b/lib/python/qmk/keymap.py index f317f4d11e..fc1421962f 100644 --- a/lib/python/qmk/keymap.py +++ b/lib/python/qmk/keymap.py @@ -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 |