DRTIO port - satman firmware #136

Merged
sb10q merged 6 commits from mwojcik/artiq-zynq:drtio_satman into master 1 year ago
mwojcik commented 1 year ago
Owner

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 1 year ago
sb10q reviewed 1 year ago
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 1 year ago
Owner

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 1 year ago
. += 0x100;
__irq_stack0_start = .;
} > SDRAM
}
sb10q commented 1 year ago
Owner

Can this file be shared with runtime?

Can this file be shared with runtime?
mwojcik commented 1 year ago
Poster
Owner

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

Turns out it can, it's pulled from runtime now.
sb10q reviewed 1 year ago
. += 0x10000;
_fstack = . - 4;
} > main_ram
}
sb10q commented 1 year ago
Owner

Can this file be shared with runtime?

Can this file be shared with runtime?
sb10q reviewed 1 year ago
&drtioaux::Packet::SpiReadReply { succeeded: false, data: 0 })
}
drtioaux::Packet::JdacBasicRequest { destination: _destination, dacno: _dacno,
sb10q commented 1 year ago
Owner

Remove

Remove
sb10q commented 1 year ago
Owner

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

You can also remove ``Packet::Jdac*`` from ``drtioaux``.
mwojcik commented 1 year ago
Poster
Owner

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 1 year ago
Owner

Not supported.

Not supported.
mwojcik added 1 commit 1 year ago
mwojcik added 1 commit 1 year ago
mwojcik added 1 commit 1 year ago
sb10q reviewed 1 year ago
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 1 year ago
Owner

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 1 year ago
Poster
Owner

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 1 year ago
Owner

libbuild_zynq would be ok I think.

``libbuild_zynq`` would be ok I think.
mwojcik added 1 commit 1 year ago
mwojcik added 1 commit 1 year ago
sb10q merged commit 8d2bb09149 into master 1 year ago
sb10q referenced this issue from a commit 1 year ago
The pull request has been merged as 8d2bb09149.
Sign in to join this conversation.
No reviewers
No Milestone
No Assignees
2 Participants
Notifications
Due Date

No due date set.

Dependencies

This pull request currently doesn't have any dependencies.

Loading…
There is no content yet.