M-Labs/artiq-zynq
14
1
Fork 29
Code Issues 16 Pull Requests 2 Releases Wiki Activity

DRTIO port - satman firmware #136

Merged
sb10q merged 6 commits from mwojcik/artiq-zynq:drtio_satman into master 2021-10-08 16:04:50 +08:00
Conversation 5 Commits 6 Files Changed 8 +969 -42
mwojcik commented 2021-10-05 16:14:15 +08:00
Owner
Copy Link

This is a part of few pull requests for DRTIO functionality. They have been broken up to allow easier code review overall. They're identical in contents to drtio_port branch.

This PR includes satman firmware ported from mainline ARTIQ, stripped down because most of the peripherals are currently not available on Zynq.

Any feedback and suggestions are welcome.

This is a part of few pull requests for DRTIO functionality. They have been broken up to allow easier code review overall. They're identical in contents to drtio_port branch. This PR includes satman firmware ported from mainline ARTIQ, stripped down because most of the peripherals are currently not available on Zynq. Any feedback and suggestions are welcome.
mwojcik added 1 commit 2021-10-05 16:14:16 +08:00
added satman firmware from drtio port 3ce5737086
sb10q reviewed 2021-10-07 08:22:45 +08:00
src/satman/src/jdac_common.rs Outdated
@@ -0,0 +34,4 @@
pub const RAW_DDMTD_N: i32 = 1 << RAW_DDMTD_N_SHIFT;
pub const DDMTD_DITHER_BITS: i32 = 1;
pub const DDMTD_N_SHIFT: i32 = RAW_DDMTD_N_SHIFT + DDMTD_DITHER_BITS;
pub const DDMTD_N: i32 = 1 << DDMTD_N_SHIFT;
sb10q commented 2021-10-07 08:22:45 +08:00
Owner
Copy Link

Remove this entire file, we don't support Sayma stuff on Zynq.

Remove this entire file, we don't support Sayma stuff on Zynq.
sb10q reviewed 2021-10-07 08:23:07 +08:00
src/satman/link.x Outdated
@@ -0,0 +83,4 @@
. += 0x100;
__irq_stack0_start = .;
} > SDRAM
}
sb10q commented 2021-10-07 08:23:07 +08:00
Owner
Copy Link

Can this file be shared with runtime?

Can this file be shared with runtime?
mwojcik commented 2021-10-07 14:34:02 +08:00
Author
Owner
Copy Link

Turns out it can, it's pulled from runtime now.

Turns out it can, it's pulled from runtime now.
sb10q reviewed 2021-10-07 08:23:14 +08:00
src/satman/satman.ld Outdated
@@ -0,0 +52,4 @@
. += 0x10000;
_fstack = . - 4;
} > main_ram
}
sb10q commented 2021-10-07 08:23:14 +08:00
Owner
Copy Link

Can this file be shared with runtime?

Can this file be shared with runtime?
sb10q reviewed 2021-10-07 08:25:05 +08:00
src/satman/src/main.rs
@@ -0,0 +311,4 @@
&drtioaux::Packet::SpiReadReply { succeeded: false, data: 0 })
}
drtioaux::Packet::JdacBasicRequest { destination: _destination, dacno: _dacno,
sb10q commented 2021-10-07 08:25:04 +08:00
Owner
Copy Link

Remove

Remove
sb10q commented 2021-10-07 08:25:52 +08:00
Owner
Copy Link

You can also remove Packet::Jdac* from drtioaux.

You can also remove ``Packet::Jdac*`` from ``drtioaux``.
mwojcik commented 2021-10-07 14:02:14 +08:00
Author
Owner
Copy Link

Is Jdac stuff then unsupported on all platforms? I imagine that it could be forwarded to a mainline artiq-based satellite that does have ad9154. Or is mixing satellites not supported?

Is Jdac stuff then unsupported on all platforms? I imagine that it could be forwarded to a mainline artiq-based satellite that does have ad9154. Or is mixing satellites not supported?
sb10q commented 2021-10-07 20:48:42 +08:00
Owner
Copy Link

Not supported.

Not supported.
mwojcik added 1 commit 2021-10-07 13:47:49 +08:00
removed unnecessary files d874115f29
mwojcik added 1 commit 2021-10-07 14:33:59 +08:00
sharing link.x with runtime a3a6156db1
mwojcik added 1 commit 2021-10-07 20:49:00 +08:00
Merge branch 'master' into drtio_satman dcd2aef483
sb10q reviewed 2021-10-07 20:50:15 +08:00
src/satman/build.rs Outdated
@@ -0,0 +10,4 @@
let out = &PathBuf::from(env::var_os("OUT_DIR").unwrap());
File::create(out.join("link.x"))
.unwrap()
.write_all(include_bytes!("../runtime/link.x"))
sb10q commented 2021-10-07 20:50:15 +08:00
Owner
Copy Link

These files do not belong specifically to the runtime. Put them in their own folder?

These files do not belong specifically to the runtime. Put them in their own folder?
mwojcik commented 2021-10-07 20:56:01 +08:00
Author
Owner
Copy Link

libbuild_zynq seems a proper candidate with shared build code, maybe? Or a linker folder, with just the linker script inside?

``libbuild_zynq`` seems a proper candidate with shared build code, maybe? Or a ``linker`` folder, with just the linker script inside?
sb10q commented 2021-10-07 22:07:39 +08:00
Owner
Copy Link

libbuild_zynq would be ok I think.

``libbuild_zynq`` would be ok I think.
mwojcik added 1 commit 2021-10-07 20:52:26 +08:00
Removed jdac packet support eb2921a59c
mwojcik added 1 commit 2021-10-08 13:55:06 +08:00
sharing link.x through libbuild_zynq 1f883ecb6f
sb10q merged commit 8d2bb09149 into master 2021-10-08 16:04:50 +08:00
sb10q referenced this issue from a commit 2021-10-08 16:04:50 +08:00
add satman firmware (#136)
Sign in to join this conversation.
Reviewers
No Reviewers
sb10q
Labels
Clear labels
priority:critical
priority:high
priority:low
priority:medium
No Label
Milestone
No items
No Milestone
Assignees
Clear assignees
architeuthis atse bukehu derppening dly fsagbuya jordens linuswck morgan mwojcik occheung saeed.r sb10q srenblad therobs12
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: M-Labs/artiq-zynq#136
Delete Branch "mwojcik/artiq-zynq:drtio_satman"

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?