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

Revert "starfive visionfive2: use mainline kernel" #961

Merged
merged 2 commits into from
May 29, 2024

Conversation

NickCao
Copy link
Member

@NickCao NickCao commented May 28, 2024

Reverts #958

@NickCao NickCao force-pushed the revert-958-visionfive2-mainline branch from c8eb399 to 9e06031 Compare May 28, 2024 22:19
@NickCao
Copy link
Member Author

NickCao commented May 28, 2024

In absence of a quick fix, let's do a revert. 71a9c38 is kept though, please test.

@NickCao
Copy link
Member Author

NickCao commented May 28, 2024

cc @malteneuss @0x4A6F

@Mic92 Mic92 merged commit 8251761 into master May 29, 2024
2 checks passed
@Mic92 Mic92 deleted the revert-958-visionfive2-mainline branch May 29, 2024 12:52
@malteneuss
Copy link
Contributor

Seems to work without the qspi patch. I tried booting in QSPI and SDIO mode afterwards. Both worked:

$ nix flake lock --update-input nixos-hardware
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/806e9d4a933dd1e75592e88894d4bd2f296f5bbf' (2024-05-28)
  → 'github:NixOS/nixos-hardware/8251761f93d6f5b91cee45ac09edb6e382641009' (2024-05-29)
....
$ uname -a
Linux visionfive2 6.6.0 #1-NixOS SMP Tue Jan  1 00:00:00 UTC 1980 riscv64 GNU/Linux

$ sudo visionfive2-firmware-update-flash
Erasing blocks: 35/35 (100%)
Writing data: 137k/137k (100%)
Verifying data: 137k/137k (100%)
Erasing blocks: 249/249 (100%)
Writing data: 994k/994k (100%)
Verifying data: 994k/994k (100%)

@malteneuss
Copy link
Contributor

@NickCao Do you know when you will get another Visionfive2 board? Would probably be a lot faster to fix Nix issues. And would you know who to ask for all potentially missing upstream kernel patches?

@NickCao
Copy link
Member Author

NickCao commented May 29, 2024

@NickCao Do you know when you will get another Visionfive2 board? Would probably be a lot faster to fix Nix issues.

Should be within a few days.

And would you know who to ask for all potentially missing upstream kernel patches?

https://rvspace.org/en/project/JH7110_Upstream_Plan is my source to go. I think it's more about the kernel config than missing patches though.

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.

3 participants