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

Update Tock to latest master. #19895

Merged
merged 1 commit into from
Oct 25, 2023
Merged

Update Tock to latest master. #19895

merged 1 commit into from
Oct 25, 2023

Conversation

jrvanwhy
Copy link
Contributor

@jrvanwhy jrvanwhy commented Oct 5, 2023

This PR makes use of the new configuration mechanism introduced in tock/tock#3640 to handle the new cw310 frequencies (changed in #19479). This change fixes the basic Tock test.

I also updated our board definition to work with the changes in tock/tock#3551.

@jrvanwhy jrvanwhy requested review from cfrantz and a team as code owners October 5, 2023 17:41
@jrvanwhy
Copy link
Contributor Author

jrvanwhy commented Oct 5, 2023

After sending this PR for review, I discovered that we need an additional change to support running with an upstream kernel. In particular, we need to specify the fpga_cw310 feature on the earlgrey crate. I'll try to figure out how to do that later today.

@jrvanwhy
Copy link
Contributor Author

jrvanwhy commented Oct 5, 2023

Okay, fpga_cw310 is in place. I've confirmed this works with an external Tock repository, provided you manually adjust the clock frequencies in the Tock repository. I'll send the frequency changes upstream.

This sets the clock frequencies to match earlgrey on cw310, allowing us to re-enable our Tock test.

Signed-off-by: Johnathan Van Why <jrvanwhy@google.com>
@cfrantz cfrantz merged commit 36fe175 into lowRISC:master Oct 25, 2023
30 checks passed
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.

None yet

3 participants