[tlgen] Allow some keys that are generated by topgen
These keys appear when loading the xbar data from a generated
top-level json file.
clock_group and clock_srcs come from the original top-level and are
used to calculate clock_connections. Ideally, we'd not pass them
through, but that's a bigger change to quite gnarly code, so I'm
leaving them be for now.
domain is added to every object in topgen's check_power_domains
function, so needs to be allowed here too.
Signed-off-by: Rupert Swarbrick <rswarbrick@lowrisc.org>
diff --git a/util/tlgen/validate.py b/util/tlgen/validate.py
index 95f6a95..fb4472a 100644
--- a/util/tlgen/validate.py
+++ b/util/tlgen/validate.py
@@ -91,13 +91,18 @@
' If not specified, it is assumed to be in main clock domain'
],
'reset': ['s', 'Main reset'],
- 'connections':
- ['g', "List of edge. Key is host, entry in value list is device"],
+ 'connections': [
+ 'g',
+ "List of edge. Key is host, entry in value list is device"
+ ],
'clock_connections': ['g', 'list of clocks'],
'nodes': ['lg', node]
},
'optional': {
'type': ['s', 'Indicate Hjson type. "xbar" always if exist'],
+ 'clock_group': ['s', "Remnant from auto-generation scripts. Ignore."],
+ 'clock_srcs': ['g', "Remnant from auto-generation scripts. Ignore."],
+ 'domain': ['s', 'Power domain for the crossbar']
},
'added': {
'reset_connections': [
@@ -138,11 +143,13 @@
continue
# Type and value check
- if not checker[0] in val_types:
+ if checker[0] is not None and checker[0] not in val_types:
log.error(prefix +
" field {} is undefined type. Check val_types {}".format(
k, checker[0]))
- if checker[0] == 'lg':
+ if checker[0] is None:
+ pass
+ elif checker[0] == 'lg':
# List of subgroup
error += sum(
map(
