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 support for Digilent Genesys 2 #1961

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

kaolpr
Copy link
Contributor

@kaolpr kaolpr commented Sep 1, 2022

ARTIQ Pull Request

Description of Changes

Adds support for Digilent Genesys 2 target.

Related PRs:

Related Issue

Type of Changes

Type
✨ New feature

Steps (Choose relevant, delete irrelevant before submitting)

All Pull Requests

  • Use correct spelling and grammar.
  • Update RELEASE_NOTES.rst if there are noteworthy changes, especially if there are changes to existing APIs.
  • Check the copyright situation of your changes and sign off your patches (git commit --signoff, see copyright).

Code Changes

  • Run flake8 to check code style (follow PEP-8 style). flake8 has issues with parsing Migen/gateware code, ignore as necessary.
  • Test your changes or have someone test them. Mention what was tested and how.
    • Built and run on hardware, used TestVariant to blink user_led from ARTIQ experiment.

Documentation Changes

Git Logistics

  • Split your contribution into logically separate changes (git rebase --interactive). Merge/squash/fixup commits that just fix or amend previous commits. Remove unintended changes & cleanup. See tutorial.
  • Write short & meaningful commit messages. Review each commit for messages (git show). Format:
    topic: description. < 50 characters total.
    
    Longer description. < 70 characters per line
    

Licensing

See copyright & licensing for more info.
ARTIQ files that do not contain a license header are copyrighted by M-Labs Limited and are licensed under LGPLv3+.

@sbourdeauducq
Copy link
Member

Will you keep maintaining this, including porting the clocking changes #1939 / m-labs/misoc#129 ?

@kaolpr
Copy link
Contributor Author

kaolpr commented Sep 28, 2022

I believe we can support it both in TechnoSystem and on WUT (both sites have boards).

We can wait with this merge until both #1939 and m-labs/misoc#129 are approved and merged so I can port changes.

@sbourdeauducq
Copy link
Member

@kaolpr Sync RTIO is merged now. Is this PR ready?

@kaolpr
Copy link
Contributor Author

kaolpr commented Feb 8, 2023

I'll update to latest master and will be ready tomorrow.

@sbourdeauducq
Copy link
Member

Great. Corresponding MiSoC PR is also OK?

@kaolpr
Copy link
Contributor Author

kaolpr commented Feb 12, 2023

@sbourdeauducq Sorry, I didn't manage to test it on hardware before my winter vacation. I'll verify operation for this PR and m-labs/misoc#130 just after coming back on Feb 21st.

@kaolpr
Copy link
Contributor Author

kaolpr commented Mar 24, 2023

@sbourdeauducq I've made updates to both to this PR and MiSoC. Please take a look at rtio_clocking.rs modifications. As there is no Si5324 available, most of the contents are disabled via #[cfg(si5324_as_synthesizer)].

And sorry that it took so long.

@sbourdeauducq
Copy link
Member

As there is no Si5324 available, most of the contents are disabled via #[cfg(si5324_as_synthesizer)].

We don't have this anymore since synchronous RTIO clocking. Your change breaks Kasli and KC705.

@kaolpr
Copy link
Contributor Author

kaolpr commented Mar 24, 2023

Can I use has_rtio_crg for that purpose? Genesys2 will only have _SysCRG?

@sbourdeauducq
Copy link
Member

Probably has_si5324. And please test on Kasli and KC705.

@kaolpr
Copy link
Contributor Author

kaolpr commented Mar 24, 2023

Modified to use has_si5324. Checked Kasli with hardware, but don't have KC705 around. However firmware builds fine for all 3 target platforms.

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.

2 participants