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/cli/generate | |
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/cli/generate')
-rwxr-xr-x | lib/python/qmk/cli/generate/rules_mk.py | 4 |
1 files changed, 3 insertions, 1 deletions
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 | |||
7 | from qmk.path import is_keyboard, normpath | 7 | from qmk.path import is_keyboard, normpath |
8 | 8 | ||
9 | info_to_rules = { | 9 | info_to_rules = { |
10 | 'board': 'BOARD', | ||
10 | 'bootloader': 'BOOTLOADER', | 11 | 'bootloader': 'BOOTLOADER', |
11 | 'processor': 'MCU', | 12 | 'processor': 'MCU', |
12 | } | 13 | } |
@@ -37,7 +38,8 @@ def generate_rules_mk(cli): | |||
37 | 38 | ||
38 | # Bring in settings | 39 | # Bring in settings |
39 | for info_key, rule_key in info_to_rules.items(): | 40 | for info_key, rule_key in info_to_rules.items(): |
40 | rules_mk_lines.append(f'{rule_key} ?= {kb_info_json[info_key]}') | 41 | if info_key in kb_info_json: |
42 | rules_mk_lines.append(f'{rule_key} ?= {kb_info_json[info_key]}') | ||
41 | 43 | ||
42 | # Find features that should be enabled | 44 | # Find features that should be enabled |
43 | if 'features' in kb_info_json: | 45 | if 'features' in kb_info_json: |