Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dts schema compliance #1973

Merged

Conversation

AndrewD
Copy link
Collaborator

@AndrewD AndrewD commented May 30, 2024

This fixes several linux schema validation issues. Closes #1905, see #1960

This branch is on top of the branch for #1972 but that is not a dependency.

Andrew Dennison added 3 commits May 30, 2024 16:18
Adds clocks for a downstream iclink soc, for example
when builder.add_json() has imported soc clocks.

Node names are as per devicetree fixed-clock.yaml bindings.
This is also relevant to vexriscv_smp, not rocket specific.

Fixes these dt-schema validation errors:

cpus: cpu@0: 'tlb-split' is a dependency of 'd-tlb-size'
	from schema : http://devicetree.org/schemas/cpus.yaml#
cpus: cpu@0: 'tlb-split' is a dependency of 'd-tlb-sets'
	from schema : http://devicetree.org/schemas/cpus.yaml#
cpus: cpu@0: 'tlb-split' is a dependency of 'i-tlb-size'
	from schema : http://devicetree.org/schemas/cpus.yaml#
cpus: cpu@0: 'tlb-split' is a dependency of 'i-tlb-sets'
	from schema : http://devicetree.org/schemas/cpus.yaml#
Fixes these dt-schema validation errors:
/: 'compatible' is a required property
	from schema $id: http://devicetree.org/schemas/root-node.yaml#
/: 'model' is a required property
	from schema $id: http://devicetree.org/schemas/root-node.yaml#
Copy link
Owner

@enjoy-digital enjoy-digital left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @AndrewD, this looks fine. I'll do at least a minor adjustment (move adding the identifier constant to add_identifier method) and we'll also test the updated generated .dts on the LiteX HW CI.

@enjoy-digital enjoy-digital merged commit d9332da into enjoy-digital:master May 30, 2024
1 check passed
@enjoy-digital
Copy link
Owner

This is merged with two minor modifications on top of it:

Thanks!

@AndrewD
Copy link
Collaborator Author

AndrewD commented May 30, 2024

@enjoy-digital with the change in cc1a37e this line probably needs to change to platform_name too: litex_json2dts_linux.py#L58

Related to #1960

@AndrewD
Copy link
Collaborator Author

AndrewD commented May 30, 2024

we'll also test the updated generated .dts on the LiteX HW CI.

The ci failure is because I used a python 3.10 feature in the type hints. Can we bump the minimum python version, or is there a desire to maintain support for 3.9?

@enjoy-digital
Copy link
Owner

If possible, it would be nice to not use python 3.10 specific features for now. We could bump the requirement, but that's maybe not the right time.

@AndrewD
Copy link
Collaborator Author

AndrewD commented May 30, 2024

If possible, it would be nice to not use python 3.10 specific features for now. We could bump the requirement, but that's maybe not the right time.

Would pushing a rebase that addresses this help? It looks minor.

@enjoy-digital
Copy link
Owner

If you can just provide the change, I could integrate.

@AndrewD AndrewD deleted the dts_schema_compliance branch June 13, 2024 00:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Generated DTS lacks root compatible and model properties
2 participants