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

starfive visionfive2: use upstream u-boot v2024.01-rc5 #819

Merged
merged 5 commits into from
Jan 3, 2024

Conversation

NickCao
Copy link
Member

@NickCao NickCao commented Jan 1, 2024

Description of changes
Things done
  • Tested the changes in your own NixOS Configuration
  • Tested the changes end-to-end by using your fork of nixos-hardware and
    importing it via <nixos-hardware> or Flake input

@NickCao
Copy link
Member Author

NickCao commented Jan 1, 2024

cc @leifhelm, please test.

@NickCao
Copy link
Member Author

NickCao commented Jan 1, 2024

Also @colemickens and @6543

@NickCao NickCao force-pushed the visionfive2-uboot branch from dedcfa0 to 8575cd7 Compare January 1, 2024 03:58
@NickCao NickCao marked this pull request as ready for review January 1, 2024 04:18
@NickCao
Copy link
Member Author

NickCao commented Jan 1, 2024

Tested booting. visionfive2-firmware-update-flash fails due to u-boot.itb too big to fit into mtd1.

@6543
Copy link
Member

6543 commented Jan 1, 2024

Uh let me try that patch out :)

@leifhelm
Copy link
Contributor

leifhelm commented Jan 1, 2024

I can boot. However I cannot ssh into it. (can’t even ping it). I guess this is a problem of either my config or the kernel.

@Mic92
Copy link
Member

Mic92 commented Jan 1, 2024

Tested booting. visionfive2-firmware-update-flash fails due to u-boot.itb too big to fit into mtd1.

Is this a blocker of this pull request?

@NickCao
Copy link
Member Author

NickCao commented Jan 1, 2024

Is this a blocker of this pull request?

Kind of, we need a fix like #646

@leifhelm
Copy link
Contributor

leifhelm commented Jan 1, 2024

According to jh7110-starfive-visionfive-2.dtsi there should be 3 MiB space and u-boot.itb is only 869 KiB. However I notice that there are 2 further partitions. Maybe we have to switch to mtd2 if it exists?

@NickCao
Copy link
Member Author

NickCao commented Jan 1, 2024

According to jh7110-starfive-visionfive-2.dtsi there should be 3 MiB space and u-boot.itb is only 869 KiB. However I notice that there are 2 further partitions. Maybe we have to switch to mtd2 if it exists?

Reasonable, the partition is also named uboot in stead of uboot-env, seemingly more appropriate for our usage.

Copy link
Member

@Mic92 Mic92 left a comment

Choose a reason for hiding this comment

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

Please run the merge queue command (mergify) when you think this is ready.

@NickCao
Copy link
Member Author

NickCao commented Jan 3, 2024

According to jh7110-starfive-visionfive-2.dtsi there should be 3 MiB space and u-boot.itb is only 869 KiB. However I notice that there are 2 further partitions. Maybe we have to switch to mtd2 if it exists?

Reasonable, the partition is also named uboot in stead of uboot-env, seemingly more appropriate for our usage.

Confirmed by vendor documentation: https://doc-en.rvspace.org/VisionFive2/Quick_Start_Guide/VisionFive2_SDK_QSG/spl_new.html

@NickCao
Copy link
Member Author

NickCao commented Jan 3, 2024

@mergify queue

Copy link
Contributor

mergify bot commented Jan 3, 2024

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at 8e34f33

@mergify mergify bot merged commit 8e34f33 into NixOS:master Jan 3, 2024
3 checks passed
@NickCao NickCao deleted the visionfive2-uboot branch January 3, 2024 14:19
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.

4 participants