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

Extend gateware ident for zynq #346

Merged
sb10q merged 2 commits from mwojcik/artiq-zynq:gateware_ident into master 2024-12-11 11:43:52 +08:00
Conversation 1 Commits 2 Files Changed 5 +37 -23
mwojcik commented 2024-12-05 14:54:29 +08:00
Owner
Copy Link

Would close #227

Gateware/Firmware version is displayed in format {artiq version};{zynq revision};{variant name}
artiq version would be the one from the flake lock, used to build the most of the gateware
e.g. 9.9102+270a417.beta;1eb39aef;master

would make finding issues in customers' SoCs a little bit easier (rather than saying "please update" regardless of the situation)

probably could be backported to release-7 and 8

Would close #227 Gateware/Firmware version is displayed in format ``{artiq version};{zynq revision};{variant name}`` artiq version would be the one from the flake lock, used to build the most of the gateware e.g. ``9.9102+270a417.beta;1eb39aef;master`` would make finding issues in customers' SoCs a little bit easier (rather than saying "please update" regardless of the situation) probably could be backported to release-7 and 8
mwojcik added 2 commits 2024-12-05 14:54:29 +08:00
mwojcik force-pushed gateware_ident from 4488cc75e9 to acc8581cb0 2024-12-05 14:59:40 +08:00 Compare
sb10q commented 2024-12-05 17:07:07 +08:00
Owner
Copy Link

We can do that as an interim solution, but eventually we should just merge this repos into artiq and run the same firmware on all devices.

We can do that as an interim solution, but eventually we should just merge this repos into ``artiq`` and run the same firmware on all devices.
sb10q reviewed 2024-12-05 17:07:59 +08:00
flake.nix Outdated
@ -386,6 +389,7 @@
binutils-arm
pre-commit
];
VERSIONEER_ZYNQ_REV="${zynqRev}";
sb10q commented 2024-12-05 17:07:59 +08:00
Owner
Copy Link

VERSIONEER_ is historical. Just call it ZYNQ_REV.

``VERSIONEER_`` is historical. Just call it ``ZYNQ_REV``.
sb10q reviewed 2024-12-05 17:08:40 +08:00
src/gateware/ebaz4205.py Outdated
@ -127,2 +127,3 @@
ident = self.__class__.__name__
ident = "{};{};{}".format(
get_version(),
sb10q commented 2024-12-05 17:08:40 +08:00
Owner
Copy Link

I don't think we need the ARTIQ version? It is defined by the flake.lock of the Zynq revision.

I don't think we need the ARTIQ version? It is defined by the flake.lock of the Zynq revision.
mwojcik commented 2024-12-05 17:44:29 +08:00
Author
Owner
Copy Link

Exact revision maybe not, but I think it would be valuable to at least have the major number to check at a glance.

Exact revision maybe not, but I think it would be valuable to at least have the major number to check at a glance.
mwojcik force-pushed gateware_ident from acc8581cb0 to 716a5924d1 2024-12-10 13:03:53 +08:00 Compare
sb10q merged commit 716a5924d1 into master 2024-12-11 11:43:52 +08:00
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
2 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#346
No description provided.
Delete Branch "mwojcik/artiq-zynq:gateware_ident"

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?