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

Added top_defines_gen template and made top_defines non-templated #101

Merged
merged 3 commits into from
Feb 23, 2023

Conversation

adhowell
Copy link

No description provided.

@@ -1,7 +1,11 @@
-- AUTOGENERATED
Copy link
Contributor

Choose a reason for hiding this comment

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

Probably should remove the autogenerated header, as this file no longer is. I think this file should be moved to the defines directory as well?

@@ -301,8 +301,8 @@ def generate_soft_blocks(self):
"soft_blocks.vhd")
self.expand_template("addr_defines.vhd.jinja2", context, hdl_dir,
"addr_defines.vhd")
self.expand_template("top_defines.vhd.jinja2", context, hdl_dir,
"top_defines.vhd")
self.expand_template("top_defines_gen.vhd.jinja2", context, hdl_dir,
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you also make sure this file gets generated for the testbenches. Maybe at the same time as the module.tcl? You may need to generate some dummy parameters for total_pos_bus_length

@adhowell
Copy link
Author

Seeing as the makefile always generates the app I have just added the generated top_defines_gen.vhd path to both the tcl scripts. I'm not 100% sure this is a good idea though as this won't work in an instance where the test scripts are ever completely separated from the app generation...

@tomtrafford
Copy link
Contributor

This will resolve #82

@tomtrafford tomtrafford linked an issue Feb 13, 2023 that may be closed by this pull request
@tomtrafford tomtrafford merged commit f3c9b42 into master Feb 23, 2023
@tomtrafford tomtrafford deleted the feature/top_defines_gen branch February 23, 2023 08:37
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.

Move Jinja defs out of top_defines
2 participants