diff options
author | Zach White <skullydazed@gmail.com> | 2021-01-09 20:18:47 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-09 20:18:47 -0800 |
commit | eaa9106ec74591593e638ac015a5c90d17b30612 (patch) | |
tree | 086c66b1ad3353c28a35489b6d17be32298b7bdd /lib/python/qmk/info.py | |
parent | 54a8262dfe3b3bf5e27024e1fdb18448bac53408 (diff) | |
download | qmk_firmware-eaa9106ec74591593e638ac015a5c90d17b30612.tar.gz qmk_firmware-eaa9106ec74591593e638ac015a5c90d17b30612.zip |
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
Diffstat (limited to 'lib/python/qmk/info.py')
-rw-r--r-- | lib/python/qmk/info.py | 8 |
1 files changed, 7 insertions, 1 deletions
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): | |||
462 | """Pull some keyboard information from existing rules.mk files | 462 | """Pull some keyboard information from existing rules.mk files |
463 | """ | 463 | """ |
464 | rules = rules_mk(info_data['keyboard_folder']) | 464 | rules = rules_mk(info_data['keyboard_folder']) |
465 | mcu = rules.get('MCU') | 465 | mcu = rules.get('MCU', info_data.get('processor')) |
466 | 466 | ||
467 | if mcu in CHIBIOS_PROCESSORS: | 467 | if mcu in CHIBIOS_PROCESSORS: |
468 | arm_processor_rules(info_data, rules) | 468 | arm_processor_rules(info_data, rules) |
@@ -594,6 +594,12 @@ def arm_processor_rules(info_data, rules): | |||
594 | elif 'ARM_ATSAM' in rules: | 594 | elif 'ARM_ATSAM' in rules: |
595 | info_data['platform'] = 'ARM_ATSAM' | 595 | info_data['platform'] = 'ARM_ATSAM' |
596 | 596 | ||
597 | if 'BOARD' in rules: | ||
598 | if 'board' in info_data: | ||
599 | _log_warning(info_data, 'Board is specified in both info.json and rules.mk, the rules.mk value wins.') | ||
600 | |||
601 | info_data['board'] = rules['BOARD'] | ||
602 | |||
597 | return info_data | 603 | return info_data |
598 | 604 | ||
599 | 605 | ||