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

Cleanup to grapefruit-seq in preparation for Cosmo #1990

Merged
merged 3 commits into from
Jan 23, 2025

Conversation

mkeeter
Copy link
Collaborator

@mkeeter mkeeter commented Jan 22, 2025

Three relatively standalone commits:

  • Add a helper function AuxFlash::get_compressed_blob_streaming to do streaming decompression of a blob in auxflash. We'll use this for both FPGAs on Cosmo.
  • Move Spartan7 initialization to a separate crate, since we need to do it on both Grapefruit and Cosmo. This is mostly modeled after drv-ice40-spi-program.
  • Remove fmc peripheral from the fmc_demo task, because it's now initialized pre-Hubris.

@mkeeter mkeeter force-pushed the mkeeter/grapefruit-seq-cleanup branch 2 times, most recently from 765dd64 to 480bbfb Compare January 22, 2025 15:41
Copy link
Member

@hawkw hawkw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is pretty straightforward and seems good to me! I had one suggestion about the API for the spartan7-spi-program crate, which could make things a bit nicer but is also completely ignorable. :)

drv/auxflash-api/src/lib.rs Outdated Show resolved Hide resolved
drv/auxflash-api/src/lib.rs Outdated Show resolved Hide resolved
drv/spartan7-spi-program/src/lib.rs Show resolved Hide resolved
}
}

// Send 64 bonus clocks to complete the startup sequence (see "Clocking
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I love the naming "bonus clocks" :D

@mkeeter mkeeter force-pushed the mkeeter/grapefruit-seq-cleanup branch from 480bbfb to 7aaaa49 Compare January 23, 2025 19:54
@mkeeter mkeeter force-pushed the mkeeter/grapefruit-seq-cleanup branch from 7aaaa49 to dfd0d5e Compare January 23, 2025 21:12
@mkeeter mkeeter force-pushed the mkeeter/grapefruit-seq-cleanup branch from dfd0d5e to 207302e Compare January 23, 2025 21:22
@mkeeter
Copy link
Collaborator Author

mkeeter commented Jan 23, 2025

I applied @hawkw 's comments, here's the inter-diff

@mkeeter mkeeter merged commit 9c63d4c into master Jan 23, 2025
125 checks passed
@mkeeter mkeeter deleted the mkeeter/grapefruit-seq-cleanup branch January 23, 2025 22:02
@hawkw
Copy link
Member

hawkw commented Jan 23, 2025

I applied @hawkw 's comments, here's the inter-diff

Lovely!

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