M-Labs/artiq-zynq
10
1
Fork 19
Code Issues 12 Pull Requests Releases Wiki Activity

kasli_soc.py: change write_rustc_cfg_file() to follow artiq repo on release-7 #254

Merged
sb10q merged 1 commits from morgan/artiq-zynq:refactor_cfg into release-7 2023-08-31 12:33:13 +08:00
Conversation 2 Commits 1 Files Changed 1 +28 -30
morgan commented 2023-08-31 12:20:08 +08:00
Owner
Copy Link

  • write_rustc_cfg_file(soc, filename) at kasli_soc.py now auto generate all has_CSR_cores in rustc-cfg file

  • following artiq repo, all self.rustc_cfg are replaced with self.config

  • rustc-cfg file check

    • run python src/gateware/kasli_soc.py -c build/rustc-cfg <variant>.json for master, satellite & standalone
    • vertified new rustc-cfg contains all the cfgs that the old cfg files has

  • compilation check

    • run nix build <variant> -L for kasli-soc master, satellite & standalone and all built successfully

Related PR

Checklist of backporting SFP0..3 LED indication

  • change write_rustc_cfg_file(soc, filename) to follow artiq repo (This PR)
  • change io_expander not to borrow i2c indefinitely and create io_expander0..1 to store out_current data (PR #255)
  • update io_expander due to pin swap on Kasli-soc v1.1 #228 (PR #257)
  • implement SFP0..3 LED indication (PR #258)
- `write_rustc_cfg_file(soc, filename)` at `kasli_soc.py` now auto generate all `has_CSR_cores` in rustc-cfg file - following artiq repo, all `self.rustc_cfg` are replaced with `self.config` - rustc-cfg file check - run `python src/gateware/kasli_soc.py -c build/rustc-cfg <variant>.json` for master, satellite & standalone - vertified new rustc-cfg contains all the cfgs that the old cfg files has - compilation check - run `nix build <variant> -L` for kasli-soc master, satellite & standalone and all built successfully ## Related PR - #252 ## Checklist of backporting SFP0..3 LED indication - [X] change write_rustc_cfg_file(soc, filename) to follow artiq repo (This PR) - [X] change io_expander not to borrow i2c indefinitely and create io_expander0..1 to store out_current data (PR #255) - [X] update io_expander due to pin swap on Kasli-soc v1.1 #228 (PR #257) - [x] implement SFP0..3 LED indication (PR #258)
morgan added 1 commit 2023-08-31 12:20:09 +08:00
sb10q merged commit d019021ff5 into release-7 2023-08-31 12:33:13 +08:00
mwojcik commented 2023-09-07 15:40:07 +08:00
Owner
Copy Link

Shouldn't this be applied to zc706 as well?

Shouldn't this be applied to zc706 as well?
sb10q commented 2023-09-07 18:14:14 +08:00
Owner
Copy Link

Yes. @morgan

Yes. @morgan
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
priority:critical

   
priority:high

   
priority:low

   
priority:medium
No Label
priority:critical
priority:high
priority:low
priority:medium
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: M-Labs/artiq-zynq#254
No description provided.
Delete Branch "morgan/artiq-zynq:refactor_cfg"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?